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.

Sign up for GitHub

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

Jump to bottom

expose ESM browser build - fixes #2436 #2437

Merged
merged 5 commits into from Sep 10, 2018
Merged

expose ESM browser build - fixes #2436 #2437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52ecaa4
expose ESM browser build - fixes #2436
Rich-Harris Sep 2, 2018
a906686
Minify browser build, change extension name
lukastaegert Sep 5, 2018
6bb2aa3
Update rollup.config.js
Rich-Harris Sep 7, 2018
c6d07ba
use Terser's module option (saves 6.6%, doesn't break UMD build)
Rich-Harris Sep 7, 2018
d8716e3
Merge branch 'master' into gh-2436
lukastaegert Sep 10, 2018
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
100 changes: 79 additions & 21 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -93,13 +93,14 @@
"pretty-ms": "^3.2.0",
"remap-istanbul": "^0.11.1",
"require-relative": "^0.8.7",
"rollup": "^0.63.5",
"rollup": "^0.65.1",
"rollup-plugin-buble": "^0.19.2",
"rollup-plugin-commonjs": "^9.1.4",
"rollup-plugin-json": "^3.0.0",
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-string": "^2.0.2",
"rollup-plugin-terser": "^2.0.2",
"rollup-plugin-typescript": "^0.8.1",
"rollup-pluginutils": "^2.3.0",
"sander": "^0.6.0",
Expand All @@ -108,10 +109,10 @@
"source-map": "^0.6.1",
"source-map-support": "^0.5.6",
"sourcemap-codec": "^1.4.1",
"terser": "^3.8.2",
"tslint": "^5.11.0",
"turbocolor": "^2.4.1",
"typescript": "^3.0.1",
"uglify-js": "^3.4.6",
"url-parse": "^1.4.3"
},
"files": [
Expand Down
16 changes: 7 additions & 9 deletions rollup.config.js
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@ import commonjs from 'rollup-plugin-commonjs';
import json from 'rollup-plugin-json';
import resolve from 'rollup-plugin-node-resolve';
import string from 'rollup-plugin-string';
import { terser } from 'rollup-plugin-terser';
import typescript from 'rollup-plugin-typescript';
import pkg from './package.json';

Expand All @@ -20,6 +21,7 @@ const now = new Date(
).toUTCString();

const banner = `/*
@license
Rollup.js v${pkg.version}
${now} - commit ${commitHash}

Expand Down Expand Up @@ -84,7 +86,7 @@ export default [
]
},

/* rollup.browser.js */
/* rollup.browser.js and rollup.browser.mjs */
{
input: 'src/browser-entry.ts',
onwarn,
Expand All @@ -101,16 +103,12 @@ export default [
typescript: require('typescript')
}),
resolve({ browser: true }),
commonjs()
commonjs(),
terser({ module: true, output: { comments: 'some' } })
],
output: [
{
file: 'dist/rollup.browser.js',
format: 'umd',
name: 'rollup',
sourcemap: true,
banner
}
{ file: 'dist/rollup.browser.js', format: 'umd', name: 'rollup', sourcemap: true, banner },
{ file: 'dist/rollup.browser.mjs', format: 'es', sourcemap: true, banner }
]
},

Expand Down
4 changes: 2 additions & 2 deletions test/sourcemaps/samples/names-transformed-render-chunk/_config.js
View file
Open in desktop
@@ -1,5 +1,5 @@
const assert = require('assert');
const uglify = require('uglify-js');
const terser = require('terser');
const MagicString = require('magic-string');
const getLocation = require('../../getLocation');
const SourceMapConsumer = require('source-map').SourceMapConsumer;
Expand Down Expand Up @@ -27,7 +27,7 @@ module.exports = {
};
},
renderChunk(code) {
return uglify.minify(code, {
return terser.minify(code, {
sourceMap: {
filename: 'x'
}
Expand Down
4 changes: 2 additions & 2 deletions test/sourcemaps/samples/names-transformed/_config.js
View file
Open in desktop
@@ -1,5 +1,5 @@
const assert = require('assert');
const uglify = require('uglify-js');
const terser = require('terser');
const MagicString = require('magic-string');
const getLocation = require('../../getLocation');
const SourceMapConsumer = require('source-map').SourceMapConsumer;
Expand Down Expand Up @@ -27,7 +27,7 @@ module.exports = {
};
},
transformBundle(code) {
return uglify.minify(code, {
return terser.minify(code, {
sourceMap: {
filename: 'x'
}
Expand Down
4 changes: 2 additions & 2 deletions test/sourcemaps/samples/render-chunk/_config.js
View file
Open in desktop
@@ -1,4 +1,4 @@
const uglify = require('uglify-js');
const terser = require('terser');
const assert = require('assert');
const getLocation = require('../../getLocation');
const SourceMapConsumer = require('source-map').SourceMapConsumer;
Expand All @@ -15,7 +15,7 @@ module.exports = {
}
};

return uglify.minify(code, options);
return terser.minify(code, options);
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions test/sourcemaps/samples/transform-bundle/_config.js
View file
Open in desktop
@@ -1,4 +1,4 @@
const uglify = require('uglify-js');
const terser = require('terser');
const assert = require('assert');
const getLocation = require('../../getLocation');
const SourceMapConsumer = require('source-map').SourceMapConsumer;
Expand All @@ -15,7 +15,7 @@ module.exports = {
}
};

return uglify.minify(code, options);
return terser.minify(code, options);
}
}
]
Expand Down