Fix remaining issues with webpack config

Author: edgarmueller

examples/app/app.js

@@ -2,10 +2,12 @@
 
 var app = angular.module('makeithappen', [
     'ngRoute',
-    'jsonforms'
 ]);
 
-angular.forEach(['jsonforms-bootstrap'], function(dep) {
-   app.requires.push(dep);
-});
-
+try {
+  // check whether jsonforms-bootstrap is available
+  angular.module('jsonforms-bootstrap')
+  app.requires.push('jsonforms-bootstrap');
+} catch(ignored) {
+  app.requires.push('jsonforms');
+}

package.json

@@ -8,8 +8,8 @@
   "license": "MIT",
   "main": "/",
   "scripts": {
-    "dev":           "webpack --config webpack/webpack.dev.js;           webpack-dev-server --config webpack/webpack.dev.js --NODE_ENV=dev --inline",
-    "dev-bootstrap": "webpack --config webpack/webpack.dev-bootstrap.js; webpack-dev-server --config webpack/webpack.dev-bootstrap.js --NODE_ENV=dev --inline",
+    "dev":           "webpack --config webpack/webpack.dev.js && webpack-dev-server --config webpack/webpack.dev.js --NODE_ENV=dev --inline",
+    "dev-bootstrap": "webpack --config webpack/webpack.dev-bootstrap.js && webpack-dev-server --config webpack/webpack.dev-bootstrap.js --NODE_ENV=dev --inline",
     "test": "karma start --NODE_ENV=test",
     "build":           "webpack --config webpack/webpack.build.js --NODE_ENV=production --display-error-details",
     "build-bootstrap": "webpack --config webpack/webpack.build-bootstrap.js --NODE_ENV=production --display-error-details",

webpack/webpack.build-bootstrap.js

@@ -3,13 +3,21 @@ var webpack = require('webpack');
 var CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
-    entry: [
-        "bootstrap-webpack!./bootstrap.config.js",
-        './src/bootstrap/jsonforms_bootstrap.ts'
-    ],
+    devtool: 'source-map',
+    entry: {
+        'dist/jsonforms': './src/bootstrap/jsonforms_bootstrap.ts',
+        'examples/assets/jsonforms': './src/bootstrap/jsonforms_bootstrap.ts'
+    },
     output: {
-        filename: 'jsonforms-bootstrap.js',
-        path: 'dist'
+        filename: '[name].js',
+        path: './'
+    },
+    resolve: {
+        root: __dirname,
+        extensions: ['', '.ts', '.js', '.json']
+    },
+    resolveLoader: {
+        modulesDirectories: ["node_modules"]
     },
     plugins: [
         new webpack.optimize.UglifyJsPlugin(
@@ -26,17 +34,16 @@ module.exports = {
             'window.jquery': 'jquery'
         }),
         new CopyWebpackPlugin([
-            { from: 'src/bootstrap/jsonforms-bootstrap.css' }
+            { 
+                from: 'src/bootstrap/jsonforms-bootstrap.css',
+                to:   'dist/jsonforms.css'
+            },
+            { 
+                from: 'src/bootstrap/jsonforms-bootstrap.css',
+                to:   'examples/assets/jsonforms.css'
+            },
         ])
     ],
-    devtool: 'source-map',
-    resolve: {
-        root: __dirname,
-        extensions: ['', '.ts', '.js', '.json']
-    },
-    resolveLoader: {
-        modulesDirectories: ["node_modules"]
-    },
     module: {
         preLoaders: [
             {

webpack/webpack.build.js

@@ -4,12 +4,13 @@ var CopyWebpackPlugin = require('copy-webpack-plugin');
 
 module.exports = {
     devtool: 'source-map',
-    entry: [
-        './src/index.ts'
-    ],
+    entry: {
+        'dist/jsonforms': './src/index.ts',
+        'examples/assets/jsonforms': './src/index.ts'
+    },
     output: {
-        filename: 'jsonforms.js',
-        path: 'dist'
+        filename: '[name].js',
+        path: './'
     },
     plugins: [
         new webpack.optimize.UglifyJsPlugin(
@@ -26,7 +27,14 @@ module.exports = {
             'window.jquery': 'jquery'
         }),
         new CopyWebpackPlugin([
-            { from: 'src/jsonforms.css' }
+            { 
+                from: 'src/jsonforms.css',
+                to:   'dist/jsonforms.css'
+            },
+            { 
+                from: 'src/jsonforms.css',
+                to:   'examples/assets/jsonforms.css'
+            },
         ])
     ],
     resolve: {

webpack/webpack.dev-bootstrap.js

@@ -11,7 +11,6 @@ module.exports = {
     ],
     output: {
         filename: 'jsonforms.js',
-        path: 'dist',
         publicPath: '/assets/'
     },
     resolve: {
@@ -36,11 +35,11 @@ module.exports = {
         new CopyWebpackPlugin([
             {
                 from: 'src/bootstrap/jsonforms-bootstrap.css',
-                to: 'jsonforms.css'
+                to:   'examples/assets/jsonforms.css'
             }
         ])
     ],
     module:{
         loaders: loaders
     }
-};
+};

webpack/webpack.dev.js

@@ -11,7 +11,6 @@ module.exports = {
     ],
     output: {
         filename: 'jsonforms.js',
-        path: 'dist',
         publicPath: '/assets/'
     },
     resolve: {
@@ -34,10 +33,13 @@ module.exports = {
             'window.jquery': 'jquery'
         }),
         new CopyWebpackPlugin([
-            { from: 'src/jsonforms.css' }
+            { 
+                from: 'src/jsonforms.css',
+                to:   'examples/assets/jsonforms.css'
+            }
         ])
     ],
     module:{
         loaders: loaders
     }
-};
+};