Merge branch 'feature/webpack-beta-25' into develop

Author: dweber019

.travis.yml

@@ -2,7 +2,7 @@ addons:
   firefox: latest
 language: node_js
 node_js:
-  - "5.9.0"
+  - "6.9.1"
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"

config/config-aurelia-linter.js

@@ -1,33 +1,37 @@
 "use strict";
+const path = require('path');
 
 /**
  * AureliaTemplateLinter config
  */
 const aureliaTemplateLinter = function (options) {
-	return {
-		module: {
-			preLoaders: [
-				{
-					test: /\.html$/,
-					loader: 'aurelia-template-lint-loader'
-				}
-			]
-		},
-		aureliaTemplateLinter: {
-			configuration: options && options.config,
+  return {
+    module: {
+      rules: [
+        {
+          test: /\.html$/,
+          loader: 'aurelia-template-lint-loader',
+          enforce: 'pre',
+          exclude: [path.join(options.rootDir, 'node_modules')]
+        }
+      ]
+    },
+    aureliaTemplateLinter: {
+      configuration: options && options.config,
 
-			// aurelia errors are displayed by default as warnings
-			// set emitErrors to true to display them as errors
-			emitErrors: false,
+      // aurelia errors are displayed by default as warnings
+      // set emitErrors to true to display them as errors
+      emitErrors: false,
 
-			// aurelia does not interrupt the compilation by default
-			// if you want any file with aurelia errors to fail
-			// set failOnHint to true
-			failOnHint: options.failOnHint,
+      // aurelia does not interrupt the compilation by default
+      // if you want any file with aurelia errors to fail
+      // set failOnHint to true
+      failOnHint: options.failOnHint,
 
-			typeChecking: options.typeChecking,
-			fileGlob: options.sourceDir
-		}
-		};
+      typeChecking: options.typeChecking,
+      fileGlob: options.sourceDir
+    }
+  };
 };
+
 module.exports = aureliaTemplateLinter;

config/config-ignore.js

@@ -6,7 +6,7 @@
 const configIgnore = function (options) {
 	return {
 		module: {
-			loaders: [
+			rules: [
 				{ test: /\.html$/, loader: 'ignore-loader' },
 				{ test: /\.ejs$/, loader: 'ignore-loader' },
 				{ test: /\.scss$/, loader: 'ignore-loader' }

config/config-loader-options.js

@@ -0,0 +1,23 @@
+"use strict";
+const core_1 = require('@easy-webpack/core');
+const webpack = require('webpack');
+
+module.exports = function LoaderOptions(initalConfig = {}, extractOptions = []) {
+  return function LoaderOptions() {
+    let options = {};
+    extractOptions.forEach(k => {
+      if (this[k]) {
+        options[k] = this[k];
+      }
+      delete this[k];
+    });
+    Object.assign(initalConfig, options);
+    return {
+      plugins: [
+        new webpack.LoaderOptionsPlugin({
+          options: initalConfig
+        })
+      ].concat(core_1.get(this, 'plugins', []))
+    };
+  };
+};

config/config-node.js

@@ -17,7 +17,7 @@ const configNode = function (level) {
 		 * See: https://webpack.github.io/docs/configuration.html#node
 		 */
 		node: {
-			global: 'window',
+			global: true,
 			crypto: 'empty',
 			fs: 'empty',
 			process: true,