Merge pull request #161 from Conduitry/master

rollup: dedupe svelte package
This commit is contained in:
Rich Harris
2019-07-09 08:27:31 -04:00
committed by GitHub
2 changed files with 9 additions and 5 deletions

View File

@@ -33,10 +33,10 @@
"@babel/plugin-transform-runtime": "^7.0.0", "@babel/plugin-transform-runtime": "^7.0.0",
"@babel/preset-env": "^7.0.0", "@babel/preset-env": "^7.0.0",
"@babel/runtime": "^7.0.0", "@babel/runtime": "^7.0.0",
"rollup": "^1.0.0", "rollup": "^1.12.0",
"rollup-plugin-babel": "^4.0.2", "rollup-plugin-babel": "^4.0.2",
"rollup-plugin-commonjs": "^9.1.6", "rollup-plugin-commonjs": "^10.0.0",
"rollup-plugin-node-resolve": "^4.0.0", "rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-replace": "^2.0.0", "rollup-plugin-replace": "^2.0.0",
"rollup-plugin-svelte": "^5.0.1", "rollup-plugin-svelte": "^5.0.1",
"rollup-plugin-terser": "^4.0.4" "rollup-plugin-terser": "^4.0.4"

View File

@@ -12,6 +12,7 @@ const dev = mode === 'development';
const legacy = !!process.env.SAPPER_LEGACY_BUILD; const legacy = !!process.env.SAPPER_LEGACY_BUILD;
const onwarn = (warning, onwarn) => (warning.code === 'CIRCULAR_DEPENDENCY' && /[/\\]@sapper[/\\]/.test(warning.message)) || onwarn(warning); const onwarn = (warning, onwarn) => (warning.code === 'CIRCULAR_DEPENDENCY' && /[/\\]@sapper[/\\]/.test(warning.message)) || onwarn(warning);
const dedupe = importee => importee === 'svelte' || importee.startsWith('svelte/');
export default { export default {
client: { client: {
@@ -28,7 +29,8 @@ export default {
emitCss: true emitCss: true
}), }),
resolve({ resolve({
browser: true browser: true,
dedupe
}), }),
commonjs(), commonjs(),
@@ -69,7 +71,9 @@ export default {
generate: 'ssr', generate: 'ssr',
dev dev
}), }),
resolve(), resolve({
dedupe
}),
commonjs() commonjs()
], ],
external: Object.keys(pkg.dependencies).concat( external: Object.keys(pkg.dependencies).concat(