From db168d7a76685f327cdd622d27e840a9c7b19f7a Mon Sep 17 00:00:00 2001 From: Martell Malone Date: Wed, 20 Jun 2018 17:09:36 -0700 Subject: [PATCH 1/6] feat(builtins): load min versions if available --- src/packagers/JSConcatPackager.js | 25 ++++++++++--------------- src/packagers/JSPackager.js | 15 +++++---------- src/utils/getExisting.js | 16 ++++++++++++++++ 3 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 src/utils/getExisting.js diff --git a/src/packagers/JSConcatPackager.js b/src/packagers/JSConcatPackager.js index 89fe42d0889..52f69393947 100644 --- a/src/packagers/JSConcatPackager.js +++ b/src/packagers/JSConcatPackager.js @@ -1,27 +1,22 @@ const Packager = require('./Packager'); const path = require('path'); -const fs = require('fs'); const concat = require('../scope-hoisting/concat'); const urlJoin = require('../utils/urlJoin'); +const getExisting = require('../utils/getExisting'); const walk = require('babylon-walk'); const babylon = require('babylon'); const t = require('babel-types'); const {getName, getIdentifier} = require('../scope-hoisting/utils'); -const prelude = { - source: fs - .readFileSync(path.join(__dirname, '../builtins/prelude2.js'), 'utf8') - .trim(), - minified: fs - .readFileSync(path.join(__dirname, '../builtins/prelude2.min.js'), 'utf8') - .trim() - .replace(/;$/, '') -}; - -const helpers = - fs - .readFileSync(path.join(__dirname, '../builtins/helpers.js'), 'utf8') - .trim() + '\n'; +const prelude = getExisting( + path.join(__dirname, '../builtins/prelude2.min.js'), + path.join(__dirname, '../builtins/prelude2.js') +); + +const helpers = getExisting( + path.join(__dirname, '../builtins/helpers.min.js'), + path.join(__dirname, '../builtins/helpers.js') +); class JSConcatPackager extends Packager { async start() { diff --git a/src/packagers/JSPackager.js b/src/packagers/JSPackager.js index ed72b808f8a..ed2f8c17a74 100644 --- a/src/packagers/JSPackager.js +++ b/src/packagers/JSPackager.js @@ -1,19 +1,14 @@ -const fs = require('fs'); const path = require('path'); const Packager = require('./Packager'); +const getExisting = require('../utils/getExisting'); const urlJoin = require('../utils/urlJoin'); const lineCounter = require('../utils/lineCounter'); const objectHash = require('../utils/objectHash'); -const prelude = { - source: fs - .readFileSync(path.join(__dirname, '../builtins/prelude.js'), 'utf8') - .trim(), - minified: fs - .readFileSync(path.join(__dirname, '../builtins/prelude.min.js'), 'utf8') - .trim() - .replace(/;$/, '') -}; +const prelude = getExisting( + path.join(__dirname, '../builtins/prelude.min.js'), + path.join(__dirname, '../builtins/prelude.js') +); class JSPackager extends Packager { async start() { diff --git a/src/utils/getExisting.js b/src/utils/getExisting.js new file mode 100644 index 00000000000..6d6dcfc8e32 --- /dev/null +++ b/src/utils/getExisting.js @@ -0,0 +1,16 @@ +const fs = require('fs'); +/** + * Creates an object that contains both source and minified + * source (using the source as a fallback). + * e.g. builtins.min.js and builtins.js. + */ +module.exports = function(minified, source) { + var sourceFile = fs.readFileSync(source, 'utf8').trim(); + return { + source: sourceFile, + minified: fs.existsSync(minified) ? fs + .readFileSync(minified, 'utf8') + .trim() + .replace(/;$/, '') : sourceFile + } +}; From e6c39b3f2008944613abb126a20d2e7514d05718 Mon Sep 17 00:00:00 2001 From: Jasper De Moor Date: Tue, 17 Jul 2018 15:21:37 -0700 Subject: [PATCH 2/6] Update JSConcatPackager.js --- src/packagers/JSConcatPackager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packagers/JSConcatPackager.js b/src/packagers/JSConcatPackager.js index 52f69393947..b7ce037f1f5 100644 --- a/src/packagers/JSConcatPackager.js +++ b/src/packagers/JSConcatPackager.js @@ -72,7 +72,7 @@ class JSConcatPackager extends Packager { } } - this.write(helpers); + this.write(helpers.minified); } write(string) { From 707808538b397858e8a33fff075fe1e218e1cb98 Mon Sep 17 00:00:00 2001 From: Jasper De Moor Date: Tue, 17 Jul 2018 15:21:56 -0700 Subject: [PATCH 3/6] Update getExisting.js --- src/utils/getExisting.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/utils/getExisting.js b/src/utils/getExisting.js index 6d6dcfc8e32..e388269cdbe 100644 --- a/src/utils/getExisting.js +++ b/src/utils/getExisting.js @@ -4,13 +4,13 @@ const fs = require('fs'); * source (using the source as a fallback). * e.g. builtins.min.js and builtins.js. */ -module.exports = function(minified, source) { - var sourceFile = fs.readFileSync(source, 'utf8').trim(); +module.exports = (minifiedPath, sourcePath) => { + let source = fs.readFileSync(sourcePath, 'utf8').trim(); return { - source: sourceFile, - minified: fs.existsSync(minified) ? fs - .readFileSync(minified, 'utf8') + source, + minified: fs.existsSync(minifiedPath) ? fs + .readFileSync(minifiedPath, 'utf8') .trim() - .replace(/;$/, '') : sourceFile - } + .replace(/;$/, '') : source + }; }; From 8402c4e9cb5b932d120e78d1a853042fdce76e95 Mon Sep 17 00:00:00 2001 From: Jasper De Moor Date: Tue, 17 Jul 2018 15:22:24 -0700 Subject: [PATCH 4/6] Update getExisting.js --- src/utils/getExisting.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/utils/getExisting.js b/src/utils/getExisting.js index e388269cdbe..4c357f2ea1f 100644 --- a/src/utils/getExisting.js +++ b/src/utils/getExisting.js @@ -1,7 +1,6 @@ const fs = require('fs'); /** - * Creates an object that contains both source and minified - * source (using the source as a fallback). + * Creates an object that contains both source and minified (using the source as a fallback). * e.g. builtins.min.js and builtins.js. */ module.exports = (minifiedPath, sourcePath) => { From 568e39eb47d3512955f76d96017d01b99d632c3f Mon Sep 17 00:00:00 2001 From: Jasper De Moor Date: Tue, 17 Jul 2018 15:32:36 -0700 Subject: [PATCH 5/6] Update getExisting.js --- src/utils/getExisting.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/getExisting.js b/src/utils/getExisting.js index 4c357f2ea1f..54f242b0ed3 100644 --- a/src/utils/getExisting.js +++ b/src/utils/getExisting.js @@ -1,6 +1,7 @@ const fs = require('fs'); /** - * Creates an object that contains both source and minified (using the source as a fallback). + * Creates an object that contains both source + * and minified (using the source as a fallback). * e.g. builtins.min.js and builtins.js. */ module.exports = (minifiedPath, sourcePath) => { From a65eaa73188e85030f9392a1710a1cd2a8b09da6 Mon Sep 17 00:00:00 2001 From: DeMoorJasper Date: Tue, 17 Jul 2018 17:31:56 -0700 Subject: [PATCH 6/6] fix linting --- src/utils/getExisting.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/utils/getExisting.js b/src/utils/getExisting.js index 54f242b0ed3..6cebd3b5b71 100644 --- a/src/utils/getExisting.js +++ b/src/utils/getExisting.js @@ -1,16 +1,17 @@ const fs = require('fs'); /** - * Creates an object that contains both source - * and minified (using the source as a fallback). + * Creates an object that contains both source and minified (using the source as a fallback). * e.g. builtins.min.js and builtins.js. */ module.exports = (minifiedPath, sourcePath) => { let source = fs.readFileSync(sourcePath, 'utf8').trim(); return { source, - minified: fs.existsSync(minifiedPath) ? fs - .readFileSync(minifiedPath, 'utf8') - .trim() - .replace(/;$/, '') : source + minified: fs.existsSync(minifiedPath) + ? fs + .readFileSync(minifiedPath, 'utf8') + .trim() + .replace(/;$/, '') + : source }; };