chore(sass): relocate chokidar removal

ionic-team · Oct 29, 2019 · 7d65b8b · 7d65b8b
1 parent 7260896
commit 7d65b8b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/rollup.config.js b/rollup.config.js
@@ -11,19 +11,6 @@ export default {
     rollupResolve({
       preferBuiltins: true
     }),
-    {
-      generateBundle(_options, bundle) {
-        // chokidar is required by sass.dart
-        // however this build doesn't use or need chokidar
-        // so we're manually hacking the source to remove it
-        Object.keys(bundle).forEach(fileName => {
-          bundle[fileName].code = bundle[fileName].code.replace(
-            'require("chokidar")',
-            '{}'
-          );
-        });
-      }
-    },
   ],
 
   external: [

diff --git a/rollup.plugin.sass.js b/rollup.plugin.sass.js
@@ -61,14 +61,29 @@ const render = Sass.render;
 export { render };
 `;
 
-  if (code.indexOf('dartNodePreambleSelf.window') === -1) {
+  if (!code.includes('dartNodePreambleSelf.window')) {
     // in jest environments, global.window DOES exist
     // which messes with sass's file path resolving on node
     // remove global.window check to force it to know we're on node
     throw new Error('cannot find "dartNodePreambleSelf.window" in sass.dart');
   }
+  code = code.replace(
+    'dartNodePreambleSelf.window',
+    'false /** NODE ENVIRONMENT **/'
+  );
+
+  if (!code.includes('require("chokidar")')) {
+    // chokidar is required by sass.dart
+    // however this build doesn't use or need chokidar
+    // so we're manually remove it from the source
+    throw new Error('cannot find "require("chokidar")" in sass.dart');
+  }
+  code = code.replace(
+    'require("chokidar")',
+    '{}'
+  );
+
+  code = minify(code, { module: true }).code;
 
-  code = code.replace('dartNodePreambleSelf.window', 'false /** NODE ENVIRONMENT **/');
-  code = minify(code, {module: true}).code;
   return code
 }