fix differences

gildas-lormeau · Jan 22, 2022 · f83228c · f83228c
1 parent 27287c5
commit f83228c
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 63 deletions.
diff --git a/rollup-es5.config.dev.js b/rollup-es5.config.dev.js
@@ -54,12 +54,13 @@ export default [{
 	input: "lib/z-worker-inline-template-base64.js",
 	output: [{
 		file: "lib/z-worker-inline.js",
-		format: "esm"
-	}],
-	plugins: [replace({
-		preventAssignment: true,
-		"__workerCode__": () => JSON.stringify(fs.readFileSync("lib/z-worker-inline.js", { encoding: "base64" }))
-	})]
+		format: "esm",
+		plugins: [
+			replace({
+				preventAssignment: true,
+				"__workerCode__": () => JSON.stringify(fs.readFileSync("lib/z-worker-inline.js", { encoding: "base64" }))
+			})]
+	}]
 }, {
 	input: ["lib/zip.js"],
 	output: [{

diff --git a/rollup-es5.config.js b/rollup-es5.config.js
@@ -56,15 +56,15 @@ export default [{
 	input: "lib/z-worker-inline-template-base64.js",
 	output: [{
 		file: "lib/z-worker-inline.js",
-		format: "esm"
-	}],
-	plugins: [
-		replace({
-			preventAssignment: true,
-			"__workerCode__": () => JSON.stringify(fs.readFileSync("lib/z-worker-inline.js", { encoding: "base64" }))
-		}),
-		terser()
-	]
+		format: "esm",
+		plugins: [
+			replace({
+				preventAssignment: true,
+				"__workerCode__": () => JSON.stringify(fs.readFileSync("lib/z-worker-inline.js", { encoding: "base64" }))
+			}),
+			terser()
+		]
+	}]
 }, {
 	input: ["lib/zip.js"],
 	output: [{

diff --git a/rollup-fflate.config.dev.js b/rollup-fflate.config.dev.js
@@ -4,7 +4,7 @@ export default [{
 	input: "lib/z-worker-fflate.js",
 	output: [{
 		file: "lib/z-worker-inline.js",
-		format: "es"
+		format: "umd"
 	}],
 	plugins: [nodeResolve()]
 }, {
@@ -19,7 +19,7 @@ export default [{
 		file: "lib/z-worker-inline.js",
 		outro:
 			`		\`;
-					const uri = URL.createObjectURL(new Blob(["(" + code + ")()"], { type : "text/javascript" })); 
+					const uri = URL.createObjectURL(new Blob([code], { type : "text/javascript" })); 
 					configure({ workerScripts: { inflate: [uri], deflate: [uri] } });
 				}
 			};`,
@@ -35,7 +35,8 @@ export default [{
 		file: "dist/zip.js",
 		format: "umd",
 		name: "zip"
-	}]
+	}],
+	plugins: [nodeResolve()]
 }, {
 	input: ["lib/zip-full-fflate.js"],
 	output: [{
@@ -82,15 +83,16 @@ export default [{
 		file: "dist/zip-fs.js",
 		format: "umd",
 		name: "zip"
-	}]
+	}],
+	plugins: [nodeResolve()]
 }, {
 	input: "index-fflate.js",
 	output: [{
-		file: "dist/zip-fs-full.js",
+		file: "dist/zip-fs-full.min.js",
 		format: "umd",
 		name: "zip"
 	}, {
-		file: "dist/zip-fs-full.min.js",
+		file: "dist/zip-fs-full.js",
 		format: "umd",
 		name: "zip"
 	}],
@@ -100,5 +102,6 @@ export default [{
 	output: [{
 		file: "dist/z-worker.js",
 		format: "iife"
-	}]
+	}],
+	plugins: [nodeResolve()]
 }];
diff --git a/rollup-fflate.config.js b/rollup-fflate.config.js
@@ -5,9 +5,10 @@ export default [{
 	input: "lib/z-worker-fflate.js",
 	output: [{
 		file: "lib/z-worker-inline.js",
-		format: "es"
+		format: "es",
+		plugins: [terser()]
 	}],
-	plugins: [nodeResolve(), terser()]
+	plugins: [nodeResolve()]
 }, {
 	input: "lib/z-worker-inline.js",
 	output: [{
@@ -24,9 +25,9 @@ export default [{
 					configure({ workerScripts: { inflate: [uri], deflate: [uri] } });
 				}
 			};`,
-		format: "esm"
-	}],
-	plugins: [terser()]
+		format: "esm",
+		plugins: [terser()]
+	}]
 }, {
 	input: ["lib/zip.js"],
 	output: [{
@@ -37,9 +38,9 @@ export default [{
 	}, {
 		file: "dist/zip.js",
 		format: "umd",
-		name: "zip",
-		plugins: []
-	}]
+		name: "zip"
+	}],
+	plugins: [nodeResolve()]
 }, {
 	input: ["lib/zip-full-fflate.js"],
 	output: [{
@@ -50,34 +51,36 @@ export default [{
 	}, {
 		file: "dist/zip-full.js",
 		format: "umd",
-		name: "zip",
-		plugins: []
+		name: "zip"
 	}],
 	plugins: [nodeResolve()]
 }, {
 	input: "lib/zip-no-worker-fflate.js",
 	output: [{
 		file: "dist/zip-no-worker.min.js",
 		format: "umd",
-		name: "zip"
+		name: "zip",
+		plugins: [terser()]
 	}],
-	plugins: [nodeResolve(), terser()]
+	plugins: [nodeResolve()]
 }, {
 	input: "lib/zip-no-worker-fflate-deflate.js",
 	output: [{
 		file: "dist/zip-no-worker-deflate.min.js",
 		format: "umd",
-		name: "zip"
+		name: "zip",
+		plugins: [terser()]
 	}],
-	plugins: [nodeResolve(), terser()]
+	plugins: [nodeResolve()]
 }, {
 	input: "lib/zip-no-worker-fflate-inflate.js",
 	output: [{
 		file: "dist/zip-no-worker-inflate.min.js",
 		format: "umd",
-		name: "zip"
+		name: "zip",
+		plugins: [terser()]
 	}],
-	plugins: [nodeResolve(), terser()]
+	plugins: [nodeResolve()]
 }, {
 	input: "lib/zip-fs.js",
 	output: [{
@@ -88,21 +91,20 @@ export default [{
 	}, {
 		file: "dist/zip-fs.js",
 		format: "umd",
-		name: "zip",
-		plugins: []
-	}]
+		name: "zip"
+	}],
+	plugins: [nodeResolve()]
 }, {
 	input: "index-fflate.js",
 	output: [{
-		file: "dist/zip-fs-full.js",
-		format: "umd",
-		name: "zip",
-		plugins: []
-	}, {
 		file: "dist/zip-fs-full.min.js",
 		format: "umd",
 		name: "zip",
 		plugins: [terser()]
+	}, {
+		file: "dist/zip-fs-full.js",
+		format: "umd",
+		name: "zip"
 	}],
 	plugins: [nodeResolve()]
 }, {
@@ -111,5 +113,6 @@ export default [{
 		file: "dist/z-worker.js",
 		format: "iife",
 		plugins: [terser()]
-	}]
+	}],
+	plugins: [nodeResolve()]
 }];
diff --git a/rollup.config.dev.js b/rollup.config.dev.js
@@ -27,8 +27,7 @@ export default [{
 	output: [{
 		file: "dist/zip.min.js",
 		format: "umd",
-		name: "zip",
-		plugins: []
+		name: "zip"
 	}, {
 		file: "dist/zip.js",
 		format: "umd",
@@ -39,8 +38,7 @@ export default [{
 	output: [{
 		file: "dist/zip-full.min.js",
 		format: "umd",
-		name: "zip",
-		plugins: []
+		name: "zip"
 	}, {
 		file: "dist/zip-full.js",
 		format: "umd",
@@ -81,11 +79,11 @@ export default [{
 }, {
 	input: "index.js",
 	output: [{
-		file: "dist/zip-fs-full.js",
+		file: "dist/zip-fs-full.min.js",
 		format: "umd",
 		name: "zip"
 	}, {
-		file: "dist/zip-fs-full.min.js",
+		file: "dist/zip-fs-full.js",
 		format: "umd",
 		name: "zip"
 	}]

diff --git a/rollup.config.js b/rollup.config.js
@@ -4,9 +4,9 @@ export default [{
 	input: "lib/z-worker.js",
 	output: [{
 		file: "lib/z-worker-inline.js",
-		format: "es"
-	}],
-	plugins: [terser()]
+		format: "es",
+		plugins: [terser()]
+	}]
 }, {
 	input: "lib/z-worker-inline.js",
 	output: [{
@@ -23,9 +23,9 @@ export default [{
 					configure({ workerScripts: { inflate: [uri], deflate: [uri] } });
 				}
 			};`,
-		format: "esm"
-	}],
-	plugins: [terser()]
+		format: "esm",
+		plugins: [terser()]
+	}]
 }, {
 	input: ["lib/zip.js"],
 	output: [{
@@ -89,14 +89,14 @@ export default [{
 }, {
 	input: "index.js",
 	output: [{
-		file: "dist/zip-fs-full.js",
-		format: "umd",
-		name: "zip"
-	}, {
 		file: "dist/zip-fs-full.min.js",
 		format: "umd",
 		name: "zip",
 		plugins: [terser()]
+	}, {
+		file: "dist/zip-fs-full.js",
+		format: "umd",
+		name: "zip"
 	}]
 }, {
 	input: "lib/z-worker-bootstrap-pako.js",