Update example, update webpack and rebuild

Author: Anthropic

dist/angular-schema-form-material-bundled.js

@@ -127,10 +127,6 @@ <h3>Select Example</h3>
             <md-option ng-value="obj" ng-repeat="obj in tests">{{::obj.name}}</md-option>
           </md-select>
         </md-input-container>
-        <div class="btw">
-          By the way, there is also an example of
-          <a href="custom-validators.html">custom (async) validators</a> example.
-        </div>
       </div>
       <h3>Form</h3>
       <div ui-ace="{ theme: 'monokai',mode:'json'}"
@@ -168,7 +164,7 @@ <h3>Schema</h3>
 <!-- <script type="text/javascript" src="../bower_components/angular-ui-sortable/sortable.js"></script>
 -->
 <script type="text/javascript" src="../bower_components/angular-ui-ace/ui-ace.js"></script>
-<script type="text/javascript" src="../dist/angular-schema-form-material.js"></script>
+<script type="text/javascript" src="../dist/angular-schema-form-material-bundled.js"></script>
 
 <script type="text/javascript">
 // @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat

dist/angular-schema-form-material.js

@@ -1,44 +1,40 @@
 {
   "name": "angular-schema-form-material",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "description": "Angular Material decorator for Angular Schema Form",
   "main": "dist/material-decorator.js",
   "scripts": {
-    "templates": "gulp templates",
-    "dist": "npm run build && npm run minify",
     "build": "webpack",
+    "dist": "webpack --config webpack.config.dist.js",
     "watch": "webpack --watch",
-    "minify": "uglifyjs dist/angular-schema-form-material.js --comments --output=dist/angular-schema-form-material.min.js",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "test-not-yet-done": "karma start --single-run --browsers PhantomJS karma.conf.js --log-level info"
+    "test": "echo \"Error: test not currently available\" && exit 1",
+    "test-me": "karma start --log-level debug"
   },
   "keywords": [
     "angular-schema-form-decorator"
   ],
-  "author": "Marcel Bennett <[email protected]>",
+  "author": "json-schema-form",
+  "contributors": [
+    "Marcel J Bennett <[email protected]> (https://github.com/Anthropic)"
+  ],
   "license": "MIT",
   "dependencies": {
     "angular": ">= 1.2",
     "angular-messages": "^1.5.0",
     "angular-sanitize": ">= 1.2",
-    "angular-schema-form": "git://github.com/json-schema-form/angular-schema-form.git#feature/webpack-babel",
     "tv4": "~1.0.15"
   },
   "devDependencies": {
+    "babel": "^6.5.2",
     "babel-core": "^6.10.4",
     "babel-loader": "^6.2.4",
     "babel-polyfill": "^6.9.1",
     "babel-preset-es2015": "^6.9.0",
     "chai": "^3.5.0",
     "coveralls": "^2.11.0",
-    "gulp": "^3.9.0",
-    "gulp-angular-templatecache": "^1.6.0",
-    "gulp-concat": "^2.5.2",
-    "gulp-jscs": "^3.0.2",
-    "gulp-minify-html": "^1.0.2",
-    "gulp-rename": "^1.2.2",
-    "gulp-uglify": "^1.2.0",
-    "gulp-watch": "^4.2.4",
+    "html": "^1.0.0",
+    "html-loader": "^0.4.4",
+    "html-webpack-plugin": "^2.25.0",
     "karma": "^0.13.22",
     "karma-chai-sinon": "^0.1.5",
     "karma-coverage": "^1.0.0",
@@ -48,13 +44,13 @@
     "karma-webpack": "^1.7.0",
     "mocha": "^2.5.3",
     "mocha-lcov-reporter": "0.0.1",
-    "ng-cache-loader": "0.0.16",
+    "ngtemplate-loader": "^1.3.1",
     "protractor": "^2.5.1",
     "sinon": "^1.17.4",
     "sinon-chai": "^2.8.0",
     "streamqueue": "^0.1.3",
     "uglify-js": "^2.6.2",
-    "webpack": "^1.13.1",
-    "webpack-dev-server": "^1.14.1"
+    "webpack": "^2.1.0-beta.28",
+    "webpack-dev-server": "^2.1.0-beta.12"
   }
 }

examples/material-example.html renamed to examples/example.html

@@ -0,0 +1,11 @@
+const config = require('./webpack.config.js');
+const path = require('path');
+
+config.entry = {
+  'angular-schema-form-material': [ path.join(__dirname, 'src', 'module') ],
+  'angular-schema-form-material-bundled': [ 'angular-schema-form', path.join(__dirname, 'src', 'module') ],
+  'angular-schema-form-material.min': [ path.join(__dirname, 'src', 'module') ],
+  'angular-schema-form-material-bundled.min': [ 'angular-schema-form', path.join(__dirname, 'src', 'module') ],
+}
+
+module.exports = config;

package.json

@@ -1,38 +1,79 @@
 /* global __dirname */
-var webpack = require('webpack');
-var path = require('path');
-var pjson = require('./package.json');
-console.log('Angular Schema Form v' + pjson.version);
+/**
+* NOTE in order to build with angular-schema-form you must
+* have it cloned as a sibling directory to this one or npm
+* installed with the version you wish to build with.
+*/
+const webpack = require('webpack');
+const path = require('path');
+const package = require('./package.json');
+const buildDate = new Date();
+console.log('Angular Schema Form Material v' + package.version);
+const plugins = [
+  new webpack.BannerPlugin(
+    'angular-schema-form-material\n' +
+    '@version ' + package.version + '\n' +
+    '@date ' + buildDate.toUTCString() + '\n' +
+    '@link https://github.com/json-schema-form/angular-schema-form-material\n' +
+    '@license MIT\n' +
+    'Copyright (c) 2014-' + buildDate.getFullYear() + ' JSON Schema Form'),
+  /* Minification only occurs if the output is named .min */
+  new webpack.optimize.UglifyJsPlugin(
+    {
+      include: /\.min\.js$/,
+      minimize: true
+    })
+];
 
 module.exports = {
-  entry: './src/module.js',
+  entry: {
+    'angular-schema-form-material': [ path.join(__dirname, 'src', 'module') ],
+    'angular-schema-form-material-bundled': [ 'angular-schema-form', path.join(__dirname, 'src', 'module') ],
+  },
   output: {
     path: path.join(__dirname, 'dist'),
-    filename: 'angular-schema-form-material.js',
-    libraryTarget: 'umd'
+    filename: '[name].js',
+    sourceMapFilename: '[name].map'
+  },
+  resolve: {
+    modules: [
+      path.join(__dirname, "src"),
+      path.join(__dirname, "src", "material"),
+      path.join(__dirname, "..", "angular-schema-form", "dist"),
+      'node_modules',
+    ],
+    extensions: [ '.js', '.html' ]
   },
-  resolve: { extensions: [ '', '.js', '.html' ] },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.js$/,
-        include: [ path.join(__dirname, 'src') ],
-        loader: 'babel',
+        use: [{
+          loader: 'babel-loader',
+          options: {
+            presets: [
+              [ "es2015", { "modules": false }]
+            ]
+          }
+        }],
+        exclude: /(node_modules|angular-schema-form)/
       },
-      { test: /\.html$/, loader: "ng-cache?prefix=decorators/material" }
+      {
+        test: /\.html$/,
+        use: [{
+          loader: 'ngtemplate-loader',
+          options: {
+            relativeTo: path.join(__dirname, 'src')
+          }
+        }, 'html-loader'],
+        exclude: /(index)/
+      }
     ]
   },
   externals: {
     'angular': 'var angular',
     'tv4': 'var tv4',
+    'bundle!angular-schema-form': 'commonjs angular-schema-form'
   },
-  plugins: [
-    new webpack.BannerPlugin(
-      'angular-schema-form-material\n' +
-      '@version ' +
-      pjson.version + '\n' +
-      '@link https://github.com/json-schema-form/angular-schema-form-material\n' +
-      '@license MIT\n' +
-      'Copyright (c) 2016 JSON Schema Form')
-  ]
+  plugins: plugins
 };