build(rollup): Re-add rollup-plugin-cleanup with acorn dynamic import…

… workaround related aMarCruz/rollup-plugin-cleanup#13
regal · Dec 16, 2018 · ed267d6 · ed267d6
1 parent 0489a4a
commit ed267d6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 25 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,15 +50,15 @@
     "@types/cosmiconfig": "^5.0.3",
     "@types/filenamify": "^2.0.1",
     "@types/mocha": "^5.2.5",
-    "acorn": "^6.0.4",
-    "acorn-dynamic-import": "^4.0.0",
+    "acorn-dynamic-import": "^3.0.0",
     "chai": "^4.2.0",
     "commitizen": "^3.0.5",
     "coveralls": "^3.0.2",
     "cz-conventional-changelog": "^2.1.0",
     "mocha": "^5.2.0",
     "nyc": "^13.1.0",
     "prettier": "^1.15.3",
+    "rollup-plugin-cleanup": "^3.0.0",
     "source-map-support": "^0.5.9",
     "ts-node": "^7.0.1",
     "tslint": "^5.11.0",

diff --git a/rollup.config.js b/rollup.config.js
@@ -1,8 +1,8 @@
 import typescript from "rollup-plugin-typescript2";
-// import cleanup from "rollup-plugin-cleanup";
+import cleanup from "rollup-plugin-cleanup";
 import json from "rollup-plugin-json";
-// import acorn from "acorn";
-// import inject from "acorn-dynamic-import/lib/walk";
+import acorn from "acorn";
+import inject from "acorn-dynamic-import/lib/inject";
 
 import pkg from "./package.json";
 
@@ -27,7 +27,7 @@ const tsPlugin = typescript({
     }
 });
 
-// inject(acorn);
+inject(acorn);
 
 export default [
     {
@@ -40,18 +40,16 @@ export default [
         plugins: [
             tsPlugin,
             json(),
-
-            /* TODO: Waiting on issue with rollup-plugin-cleanup */
-            // cleanup({
-            //     extensions: [".js", ".ts"],
-            //     comments: /^((?!(Joseph R Cowman)|tslint)[\s\S])*$/, // Removes file-header comments and tslint comments
-            //     maxEmptyLines: 0,
-            //     acornOptions: {
-            //         plugins: {
-            //             dynamicImport: true
-            //         }
-            //     }
-            // })
+            cleanup({
+                extensions: [".js", ".ts"],
+                comments: /^((?!(Joseph R Cowman)|tslint)[\s\S])*$/, // Removes file-header comments and tslint comments
+                maxEmptyLines: 0,
+                acornOptions: {
+                    plugins: {
+                        dynamicImport: true
+                    }
+                }
+            })
         ],
         onwarn: suppressCircularImportWarnings
     }