Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load minified version if available #1749

Merged
merged 7 commits into from Jul 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 11 additions & 16 deletions 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() {
Expand Down Expand Up @@ -77,7 +72,7 @@ class JSConcatPackager extends Packager {
}
}

this.write(helpers);
this.write(helpers.minified);
}

write(string) {
Expand Down
15 changes: 5 additions & 10 deletions 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() {
Expand Down
17 changes: 17 additions & 0 deletions src/utils/getExisting.js
@@ -0,0 +1,17 @@
const fs = require('fs');
/**
* 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
};
};