Web app is now an entry point for other apps

AccelerationNet · Mar 16, 2016 · 150ae3d · 150ae3d
1 parent c67ea3a
commit 150ae3d
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 35 deletions.
diff --git a/gulp/tasks/build.js b/gulp/tasks/build.js
@@ -1,7 +1,7 @@
 import gulp from 'gulp';
 import gutil from 'gulp-util';
 import webpack from 'webpack';
-import prodConfig from '../../webpack/prod.config';
+import prodConfig from '../../webpack/extension.config';
 import appConfig from '../../webpack/app.config';
 import electronConfig from '../../webpack/electron.config';
 import webConfig from '../../webpack/web.config';

diff --git a/src/web/index.js → src/app/index.js b/src/web/index.js → src/app/index.js
diff --git a/webpack/app.config.js b/webpack/app.config.js
@@ -3,8 +3,8 @@ import baseConfig from './base.config';
 
 export default baseConfig({
   input: {
-    background: [path.join(__dirname, '../src/chromeApp/index')],
-    app: [path.join(__dirname, '../src/web/index')]
+    background: [path.join(__dirname, '../src/chromeApp/')],
+    app: [path.join(__dirname, '../src/app')]
   },
   output: {
     path: path.join(__dirname, '../build/app')

diff --git a/webpack/base.config.js b/webpack/base.config.js
@@ -1,15 +1,8 @@
 import path from 'path';
 import webpack from 'webpack';
 
-const srcPath = path.join(__dirname, '../src/browser/');
-
-const baseConfig = ({ input, output = {}, globals = {}, plugins, loaders, entry = [] }) => ({
-  entry: input || {
-    background: [`${srcPath}extension/background/index`, ...entry],
-    window: [`${srcPath}window/index`, ...entry],
-    popup: [`${srcPath}extension/popup/index`, ...entry],
-    inject: [`${srcPath}extension/inject/index`, ...entry]
-  },
+const baseConfig = ({ input, output = {}, globals = {}, plugins, loaders }) => ({
+  entry: input,
   output: {
     filename: 'js/[name].bundle.js',
     chunkFilename: 'js/[id].chunk.js',

diff --git a/webpack/cordova.config.js b/webpack/cordova.config.js
@@ -3,7 +3,7 @@ import baseConfig from './base.config';
 
 export default baseConfig({
   input: {
-    app: [path.join(__dirname, '../src/web/index')]
+    app: [path.join(__dirname, '../src/app/')]
   },
   output: {
     path: path.join(__dirname, '../www')

diff --git a/webpack/dev.config.js b/webpack/dev.config.js
@@ -11,11 +11,11 @@ const srcPath = path.join(__dirname, '../src/browser/');
 
 const config = baseConfig({
   input: {
-    background: [`${srcPath}extension/background/index`, ...entry],
-    window: [`${srcPath}window/index`, ...entry],
-    popup: [`${srcPath}extension/popup/index`, ...entry],
-    inject: [`${srcPath}extension/inject/index`, ...entry],
-    app: [path.join(__dirname, '../src/web/index'), ...entry]
+    background: [`${srcPath}extension/background/`, ...entry],
+    window: [`${srcPath}window/`, ...entry],
+    popup: [`${srcPath}extension/popup/`, ...entry],
+    inject: [`${srcPath}extension/inject/`, ...entry],
+    app: [path.join(__dirname, '../src/app/'), ...entry]
   },
   output: {
     path: path.join(__dirname, '../dev'),
@@ -49,8 +49,7 @@ const config = baseConfig({
         ]
       ]
     }
-  }],
-  entry
+  }]
 });
 
 config.devtool = 'eval';

diff --git a/webpack/electron.config.js b/webpack/electron.config.js
@@ -3,7 +3,7 @@ import baseConfig from './base.config';
 
 export default baseConfig({
   input: {
-    app: [path.join(__dirname, '../src/web/index')]
+    app: [path.join(__dirname, '../src/app/')]
   },
   output: {
     path: path.join(__dirname, '../build/electron')

diff --git a/webpack/extension.config.js b/webpack/extension.config.js
@@ -0,0 +1,20 @@
+import path from 'path';
+import baseConfig from './base.config';
+const srcPath = path.join(__dirname, '../src/browser/');
+
+export default baseConfig({
+  input: {
+    background: [`${srcPath}extension/background/`],
+    window: [`${srcPath}window/`],
+    popup: [`${srcPath}extension/popup/`],
+    inject: [`${srcPath}extension/inject/`]
+  },
+  output: {
+    path: path.join(__dirname, '../build/extension')
+  },
+  globals: {
+    'process.env': {
+      NODE_ENV: '"production"'
+    }
+  }
+});
diff --git a/webpack/prod.config.js b/webpack/prod.config.js
diff --git a/webpack/web.config.js b/webpack/web.config.js
@@ -3,7 +3,7 @@ import baseConfig from './base.config';
 
 export default baseConfig({
   input: {
-    app: [path.join(__dirname, '../src/web/index')]
+    app: [path.join(__dirname, '../src/app/')]
   },
   output: {
     path: path.join(__dirname, '../build/web')