External dependencies

lib/service-worker-builder.js

@@ -8,15 +8,18 @@ const mergeTrees = require('broccoli-merge-trees');
 const path = require('path');
 const rollupReplace = require('rollup-plugin-replace');
 const uglify = require('broccoli-uglify-sourcemap');
+const resolve = require('rollup-plugin-node-resolve');
+const includePaths = require('rollup-plugin-includepaths')
+const commonJs = require('rollup-plugin-commonjs');
 
 const TREE_FOR_METHODS = {
-  'service-worker': 'treeForServiceWorker',
-  'service-worker-registration': 'treeForServiceWorkerRegistration'
+  "service-worker": "treeForServiceWorker",
+  "service-worker-registration": "treeForServiceWorkerRegistration"
 };
 
 const ENTRY_POINT_FILENAMES = {
-  'service-worker': 'sw.js',
-  'service-worker-registration': 'sw-registration.js'
+  "service-worker": "sw.js",
+  "service-worker-registration": "sw-registration.js"
 };
 
 module.exports = class ServiceWorkerBuilder {
@@ -41,7 +44,7 @@ module.exports = class ServiceWorkerBuilder {
         return trees.concat(pluginTree);
       }
 
-      return trees
+      return trees;
     }, []);
   }
 
@@ -61,7 +64,7 @@ module.exports = class ServiceWorkerBuilder {
 
     if (tree) {
       return new Funnel(tree, {
-        destDir: plugin.pkg.name + '/' + type
+        destDir: plugin.pkg.name + "/" + type
       });
     }
   }
@@ -72,7 +75,7 @@ module.exports = class ServiceWorkerBuilder {
 
     let registrationDistPath = this.options.registrationDistPath;
     let treeDistPath = treeName;
-    if (treeName === 'sw-registration.js' && registrationDistPath) {
+    if (treeName === "sw-registration.js" && registrationDistPath) {
       treeDistPath = path.join(registrationDistPath, treeName);
     }
 
@@ -84,7 +87,7 @@ module.exports = class ServiceWorkerBuilder {
   }
 
   _rollupTree(tree, entryFile, destFile) {
-    let rollupReplaceConfig = {
+    const rollupReplaceConfig = {
       include: [
         '/**/ember-service-worker/**/*.js',
         // same as above but for windows paths like D:\my-ember\ember-service-worker\whatever\sw.js; which are updated before this step to D:/my-ember/ember-service/worker/whatever/sw.js
@@ -96,16 +99,29 @@ module.exports = class ServiceWorkerBuilder {
       ROOT_URL: this.options.rootURL
     };
 
+    const includePathOptions = {
+      extensions: ['.js', '.json']
+    }
+
     return new Rollup(tree, {
-      inputFiles: '**/*.js',
+      inputFiles: "**/*.js",
       rollup: {
         input: entryFile,
         output: {
           file: destFile || entryFile,
           format: 'iife',
+          exports: 'none',
         },
-        exports: 'none',
         plugins: [
+          commonJs({
+            include: 'node_modules/**',
+          }),
+          resolve({
+            module: true,
+            jsnext: true,
+            browser: true,
+          }),
+          includePaths(includePathOptions),
           rollupReplace(rollupReplaceConfig)
         ]
       }
@@ -116,14 +132,18 @@ module.exports = class ServiceWorkerBuilder {
     if (this.options.minifyJS && this.options.minifyJS.enabled) {
       let options = this.options.minifyJS.options || {};
       options.sourceMapConfig = this.options.sourcemaps;
-      return uglify(tree,  options);
+      return uglify(tree, options);
     }
 
     return tree;
   }
 
   _babelTranspile(tree) {
     let emberCliBabel = this.app.project.addons.filter((a) => a.name === 'ember-cli-babel')[0];
-    return emberCliBabel.transpileTree(tree, { 'ember-cli-babel': { compileModules: false } });
+    return emberCliBabel.transpileTree(tree,
+      {
+        'ember-cli-babel': { compileModules: false},
+      }
+    );
   }
-}
+};