Skip to content

Commit

Permalink
combine client, codemirror and sw rollup configs
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich-Harris committed Jun 13, 2017
1 parent 760edbf commit 1b3f728
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion client/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import buble from 'rollup-plugin-buble';
const CleanCSS = require( 'clean-css' );

const dev = !!process.env.DEV;
const root = path.resolve( __dirname, '..' );
const root = path.resolve( '.' );

console.log( `creating ${dev ? 'development' : 'production'} bundle` );

Expand Down
9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
"description": "Docs and examples for Svelte",
"scripts": {
"start": "node server",
"bundle": "npm run bundle:client && npm run bundle:sw && npm run bundle:codemirror",
"bundle:client": "rm -rf client/dist && mkdir -p client/dist && npm run bundle:codemirror && rollup -c client/rollup.config.js",
"bundle:sw": "rm -rf service-worker/dist && rollup -c service-worker/rollup.config.js",
"bundle:codemirror": "rollup -c client/rollup.config.codemirror.js",
"rollup:dev": "npm run bundle:codemirror && export DEV=true && rollup -c client/rollup.config.js -w",
"dev": "npm run rollup:dev & ( export DEV=true && node scripts/prep && node server )",
"bundle": "rollup -c",
"prebundle": "rm -rf client/dist && mkdir -p client/dist && rm -rf service-worker/dist && mkdir -p service-worker/dist",
"dev": "export DEV=true && rollup -c -w & node scripts/prep && node server",
"prep": "npm run zip && node scripts/prep && npm run bundle",
"zip": "sh scripts/zip.sh",
"prestage": "npm run prep",
Expand Down
9 changes: 9 additions & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import client from './client/rollup.config.js';
import codemirror from './client/rollup.config.codemirror.js';
import serviceWorker from './service-worker/rollup.config.js';

export default [
client,
codemirror,
serviceWorker
];
2 changes: 1 addition & 1 deletion server/manifests/bundle.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

{
"bundle.js": "client/dist/bundle.61a4bf9ffd6ee74ba4888ed12ca593a805f4b550.js"
"bundle.js": "client/dist/bundle.15e4b2de02007df1d11cd5ca31a99a64e3dff030.js"
}

0 comments on commit 1b3f728

Please sign in to comment.