Merge pull request #138 from johnnyreilly/master

updated react-flux-babel-karma to webpack 2

Author: DanielRosenwasser

react-flux-babel-karma/gulp/webpack.js

@@ -10,7 +10,7 @@ var packageJson = require('../package.json');
 
 function buildProduction(done) {
    // modify some webpack config options
-   var myProdConfig = Object.create(webpackConfig);
+   var myProdConfig = webpackConfig;
    myProdConfig.output.filename = '[name].[hash].js';
 
    myProdConfig.plugins = myProdConfig.plugins.concat(
@@ -20,8 +20,11 @@ function buildProduction(done) {
          }
       }),
       new webpack.optimize.CommonsChunkPlugin({ name: 'vendor', filename: 'vendor.[hash].js' }),
-      new webpack.optimize.DedupePlugin(),
-      new webpack.optimize.UglifyJsPlugin(),
+      new webpack.optimize.UglifyJsPlugin({
+         compress: {
+            warnings: true
+         }
+      }),
       failPlugin
    );
 
@@ -38,9 +41,8 @@ function buildProduction(done) {
 
 function createDevCompiler() {
    // modify some webpack config options
-   var myDevConfig = Object.create(webpackConfig);
+   var myDevConfig = webpackConfig;
    myDevConfig.devtool = 'inline-source-map';
-   myDevConfig.debug = true;
 
    myDevConfig.plugins = myDevConfig.plugins.concat(
       new webpack.optimize.CommonsChunkPlugin({ name: 'vendor', filename: 'vendor.js' }),
@@ -73,13 +75,13 @@ function watch() {
       }, function (err, stats) {
          if (err) {
             if (!firstBuildDone) {
-               firstBuildDone = true; 
+               firstBuildDone = true;
                reject(err);
             }
             throw new gutil.PluginError('webpack:build-dev', err);
          } else {
             if (!firstBuildDone) {
-               firstBuildDone = true; 
+               firstBuildDone = true;
                resolve('webpack built');
             }
          }
@@ -95,4 +97,4 @@ function watch() {
 module.exports = {
    build: function () { return build(); },
    watch: function () { return watch(); }
-};
+};

react-flux-babel-karma/gulpFile.js

@@ -16,15 +16,11 @@ gulp.task('delete-dist', function (done) {
   clean.run(done);
 });
 
-gulp.task('build-process.env.NODE_ENV', function () {
-  process.env.NODE_ENV = 'production';
-});
-
-gulp.task('build-js', ['delete-dist', 'build-process.env.NODE_ENV'], function(done) {
+gulp.task('build-js', ['delete-dist'], function(done) {
   webpack.build().then(function() { done(); });
 });
 
-gulp.task('build-other', ['delete-dist', 'build-process.env.NODE_ENV'], function() {
+gulp.task('build-other', ['delete-dist'], function() {
   staticFiles.build();
 });
 

react-flux-babel-karma/karma.conf.js

@@ -26,7 +26,6 @@ module.exports = function(config) {
 
     webpack: {
       devtool: 'inline-source-map',
-      debug: true,
       module: webpackConfig.module,
       resolve: webpackConfig.resolve
     },

react-flux-babel-karma/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "es6-babel-react-flux-karma",
+  "name": "react-flux-babel-karma",
   "version": "1.0.0",
   "description": "ES6 + TypeScript + Babel + React + Karma: The Secret Recipe",
   "main": "index.js",
@@ -14,17 +14,18 @@
     "url": "git+https://github.com/microsoft/typescriptsamples.git"
   },
   "keywords": [
-    "React",
-    "Flux",
-    "ES2016",
-    "typescript"
+    "react",
+    "flux",
+    "es2016",
+    "typescript",
+    "webpack"
   ],
   "author": "John Reilly",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/microsoft/typescriptsamples/issues"
   },
-  "homepage": "https://github.com/Microsoft/TypeScriptSamples/tree/master/es6-babel-react-flux-karma#readme",
+  "homepage": "https://github.com/Microsoft/TypeScriptSamples/tree/master/react-flux-babel-karma#readme",
   "devDependencies": {
     "@types/fbemitter": "^2.0.32",
     "@types/flux": "0.0.32",
@@ -57,18 +58,17 @@
     "gulp-util": "^3.0.6",
     "jasmine-core": "^2.3.4",
     "karma": "^1.2.0",
-    "karma-coverage": "^1.0.0",
     "karma-jasmine": "^1.0.0",
     "karma-junit-reporter": "^1.0.0",
     "karma-mocha-reporter": "^2.0.0",
     "karma-notify-reporter": "^1.0.0",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.6",
-    "karma-webpack": "^1.7.0",
+    "karma-webpack": "^2.0.2",
     "phantomjs-prebuilt": "^2.1.4",
-    "ts-loader": "^1.3.1",
+    "ts-loader": "^2.0.1",
     "typescript": "^2.1.4",
-    "webpack": "^1.12.2",
+    "webpack": "^2.2.1",
     "webpack-fail-plugin": "^1.0.4",
     "webpack-notifier": "^1.2.1"
   },

react-flux-babel-karma/webpack.config.js

@@ -3,15 +3,31 @@
 
 var path = require('path');
 
+
+var babelOptions = {
+  "presets": [
+    "react",
+    [
+      "es2015",
+      {
+        "modules": false
+      }
+    ],
+    "es2016"
+  ]
+};
+
 module.exports = {
   cache: true,
   entry: {
     main: './src/main.tsx',
     vendor: [
       'babel-polyfill',
       'events',
+      'fbemitter',
       'flux',
-      'react'
+      'react',
+      'react-dom'
     ]
   },
   output: {
@@ -20,23 +36,32 @@ module.exports = {
     chunkFilename: '[chunkhash].js'
   },
   module: {
-    loaders: [{
+    rules: [{
       test: /\.ts(x?)$/,
       exclude: /node_modules/,
-      loader: 'babel-loader?presets[]=es2016&presets[]=es2015&presets[]=react!ts-loader'
+      use: [
+        {
+          loader: 'babel-loader',
+          options: babelOptions
+        },
+        {
+          loader: 'ts-loader'
+        }
+      ]
     }, {
       test: /\.js$/,
       exclude: /node_modules/,
-      loader: 'babel',
-      query: {
-        presets: ['es2016', 'es2015', 'react']
-      }
+      use: [
+        {
+          loader: 'babel-loader',
+          options: babelOptions
+        }
+      ]
     }]
   },
   plugins: [
   ],
   resolve: {
-    // Add `.ts` and `.tsx` as a resolvable extension.
-    extensions: ['', '.ts', '.tsx', '.js']
+    extensions: ['.ts', '.tsx', '.js']
   },
-};
+};