diff --git a/.idea/wordRotator.iml b/.idea/wordRotator.iml index 1cb9668..d89d15e 100755 --- a/.idea/wordRotator.iml +++ b/.idea/wordRotator.iml @@ -3,7 +3,6 @@ - diff --git a/bin/build.js b/bin/build.js index fb38ca5..7bef0ec 100755 --- a/bin/build.js +++ b/bin/build.js @@ -1,6 +1,11 @@ -const shouldMangleAndTranspile = (process.argv.length >= 3 && process.argv[2] === "1"); +const shouldIncludeSourcemap = (process.argv.length >= 3 && process.argv[2] === "2"); + +const shouldMangleAndTranspile = shouldIncludeSourcemap || (process.argv.length >= 3 && process.argv[2] === "1"); // const shouldMangleAndTranspile = (process.argv.wordLength >= 3 && process.argv[2] === "1"); || true; + + + const rollup = require('rollup'); const fs = require('fs'); @@ -13,7 +18,7 @@ if (shouldMangleAndTranspile) { babel = require('babel-core'); regenerator = require('regenerator'); } -const uglifyOptions = { +let uglifyOptions = { ecma: "es6", mangle: { // ecma:"es6", @@ -40,7 +45,18 @@ const uglifyOptions = { } }; -const babelOptions = { +let uglifyOptions2 = { + mangle: {toplevel: true}, compress: { + keep_fargs: false, + toplevel: true, + dead_code: true, + unused: true, + passes: 1, + + }, +}; + +let babelOptions = { compact: true, minified: true, presets: ['env'], @@ -48,11 +64,18 @@ const babelOptions = { // plugins: ["regenerator-runtime"] }; -const regeneratorOptions = { +let regeneratorOptions = { includeRuntime: true, // sourceMaps:"inline", }; +if (shouldIncludeSourcemap){ + // uglifyOptions["sourceMap"] = {url: "inline"}; + uglifyOptions2["sourceMap"] = {url: "inline"}; + // babelOptions["sourceMaps"] = "inline"; + // regeneratorOptions["sourceMaps"] = "inline"; +} + const options = require('../rollup.config'); const outputOptions = options.output; options.output = null; @@ -64,8 +87,7 @@ async function build() { let {code, map} = await bundle.generate(outputOptions[i]); if (shouldMangleAndTranspile) { - let names = {}; - const uglifyRes = uglifyJs.minify(code, {...uglifyOptions, ...{nameCache:names}}); + const uglifyRes = uglifyJs.minify(code, uglifyOptions); code = uglifyRes.code; // fs.writeFileSync('transpiled.js', code); const babelRes = babel.transform(code, babelOptions); @@ -73,19 +95,8 @@ async function build() { code = regenerator.compile(code, regeneratorOptions).code; - const uglifyRes2 = uglifyJs.minify(code, { - mangle: {toplevel: true}, compress: { - keep_fargs: false, - toplevel: true, - dead_code: true, - unused: true, - passes: 1, - - }, - nameCache: names, - }); + const uglifyRes2 = uglifyJs.minify(code, uglifyOptions2); code = uglifyRes2.code; - fs.writeFileSync(outputOptions[i].nameFile, JSON.stringify(names)); } fs.writeFileSync(outputOptions[i].file, code); } diff --git a/bin/build.sh b/bin/build.sh index 2fe7c32..8e0740b 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -npm run build \ No newline at end of file +npm run build 2 \ No newline at end of file diff --git a/public/index.html b/public/index.html index 37597ff..98e2add 100755 --- a/public/index.html +++ b/public/index.html @@ -44,8 +44,8 @@