Update rollup and modify configs accordingly (fixes #800)

preactjs · Aug 24, 2017 · a42390d · a42390d
1 parent 99c856d
commit a42390d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 22 deletions.
diff --git a/config/rollup.config.devtools.js b/config/rollup.config.devtools.js
@@ -1,13 +1,17 @@
 import babel from 'rollup-plugin-babel';
 
 export default {
-	entry: 'devtools/index.js',
+	input: 'devtools/index.js',
+	output: {
+		format: 'umd',
+		file: 'devtools.js',
+		name: 'preactDevTools',
+		sourcemap: true
+	},
 	external: ['preact'],
-	format: 'umd',
 	globals: {
 		preact: 'preact'
 	},
-	moduleName: 'preactDevTools',
 	plugins: [
 		babel({
 			sourceMap: true,

diff --git a/config/rollup.config.esm.js b/config/rollup.config.esm.js
@@ -1,7 +1,8 @@
 import config from './rollup.config';
 
 // ES output
-config.format = 'es';
+config.output.format = 'es';
+config.output.file = 'dist/preact.esm.js';
 
 // remove memory() plugin
 config.plugins.splice(0, 1);

diff --git a/config/rollup.config.js b/config/rollup.config.js
@@ -3,9 +3,14 @@ import babel from 'rollup-plugin-babel';
 import memory from 'rollup-plugin-memory';
 
 export default {
-	useStrict: true,
-	format: 'iife',
-	entry: 'src/preact.js',
+	strict: true,
+	input: 'src/preact.js',
+	output: {
+		format: 'iife',
+		file: 'dist/preact.dev.js',
+		name: 'preact',
+		sourcemap: true
+	},
 	plugins: [
 		memory({
 			path: 'src/preact.js',

diff --git a/package.json b/package.json
@@ -12,17 +12,17 @@
     "copy-flow-definition": "copyfiles -f src/preact.js.flow dist",
     "copy-typescript-definition": "copyfiles -f src/preact.d.ts dist",
     "build": "npm-run-all --silent clean transpile copy-flow-definition copy-typescript-definition strip optimize minify size",
-    "transpile:main": "rollup -c config/rollup.config.js -m dist/preact.dev.js.map -n preact -o dist/preact.dev.js",
-    "transpile:devtools": "rollup -c config/rollup.config.devtools.js -o devtools.js -m devtools.js.map",
-    "transpile:esm": "rollup -c config/rollup.config.esm.js -m dist/preact.esm.js.map -o dist/preact.esm.js",
+    "transpile:main": "rollup -c config/rollup.config.js",
+    "transpile:devtools": "rollup -c config/rollup.config.devtools.js",
+    "transpile:esm": "rollup -c config/rollup.config.esm.js",
     "transpile:debug": "babel debug/ -o debug.js -s",
     "transpile": "npm-run-all transpile:main transpile:esm transpile:devtools transpile:debug",
     "optimize": "uglifyjs dist/preact.dev.js -c conditionals=false,sequences=false,loops=false,join_vars=false,collapse_vars=false --pure-funcs=Object.defineProperty --mangle-props --mangle-regex=\"/^(_|normalizedNodeName|nextBase|prev[CPS]|_parentC)/\" --name-cache config/properties.json -b width=120,quote_style=3 -o dist/preact.js -p relative --in-source-map dist/preact.dev.js.map --source-map dist/preact.js.map",
     "minify": "uglifyjs dist/preact.js -c collapse_vars,evaluate,screw_ie8,unsafe,loops=false,keep_fargs=false,pure_getters,unused,dead_code -m -o dist/preact.min.js -p relative --in-source-map dist/preact.js.map --source-map dist/preact.min.js.map",
     "strip:main": "jscodeshift --run-in-band -s -t config/codemod-strip-tdz.js dist/preact.dev.js && jscodeshift --run-in-band -s -t config/codemod-const.js dist/preact.dev.js && jscodeshift --run-in-band -s -t config/codemod-let-name.js dist/preact.dev.js",
     "strip:esm": "jscodeshift --run-in-band -s -t config/codemod-strip-tdz.js dist/preact.esm.js && jscodeshift --run-in-band -s -t config/codemod-const.js dist/preact.esm.js && jscodeshift --run-in-band -s -t config/codemod-let-name.js dist/preact.esm.js",
     "strip": "npm-run-all strip:main strip:esm",
-    "size": "node -e \"process.stdout.write('gzip size: ')\" && gzip-size dist/preact.min.js",
+    "size": "node -e \"process.stdout.write('gzip size: ')\" && gzip-size --raw dist/preact.min.js",
     "test": "npm-run-all lint --parallel test:mocha test:karma test:ts test:size",
     "test:ts": "tsc -p test/ts/",
     "test:mocha": "mocha --recursive --require babel-register test/shared test/node",
@@ -79,7 +79,7 @@
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "babel-plugin-transform-react-jsx": "^6.24.1",
     "babel-preset-env": "^1.5.1",
-    "bundlesize": "^0.6.1",
+    "bundlesize": "^0.13.2",
     "chai": "^3.4.1",
     "copyfiles": "^1.0.0",
     "core-js": "^2.4.1",
@@ -88,7 +88,7 @@
     "diff": "^3.0.0",
     "eslint": "^3.0.0",
     "eslint-plugin-react": "^6.0.0",
-    "gzip-size-cli": "^1.0.0",
+    "gzip-size-cli": "^2.0.0",
     "isparta-loader": "^2.0.0",
     "jscodeshift": "^0.3.25",
     "karma": "^1.1.0",
@@ -108,10 +108,10 @@
     "npm-run-all": "^4.0.0",
     "phantomjs-prebuilt": "^2.1.7",
     "rimraf": "^2.5.3",
-    "rollup": "^0.40.0",
-    "rollup-plugin-babel": "^2.7.1",
+    "rollup": "^0.48.2",
+    "rollup-plugin-babel": "^3.0.2",
     "rollup-plugin-memory": "^2.0.0",
-    "rollup-plugin-node-resolve": "^2.0.0",
+    "rollup-plugin-node-resolve": "^3.0.0",
     "sinon": "^2.2.0",
     "sinon-chai": "^2.8.0",
     "typescript": "^2.2.2",
@@ -120,13 +120,21 @@
   },
   "babel": {
     "presets": [
-      ["env", {
-        "loose": true,
-        "exclude": ["transform-es2015-typeof-symbol"],
-        "targets": {
-          "browsers": ["last 2 versions", "IE >= 9"]
+      [
+        "env",
+        {
+          "loose": true,
+          "exclude": [
+            "transform-es2015-typeof-symbol"
+          ],
+          "targets": {
+            "browsers": [
+              "last 2 versions",
+              "IE >= 9"
+            ]
+          }
         }
-      }]
+      ]
     ],
     "plugins": [
       "transform-object-rest-spread",