Merge pull request microsoft#67 from johnnyreilly/master

DanielRosenwasser · DanielRosenwasser · commit f206e7ca3e0f · 2015-12-16T14:15:39.000-08:00
Upgraded to Babel 6
diff --git a/es6-babel-react-flux-karma/karma.conf.js b/es6-babel-react-flux-karma/karma.conf.js
@@ -9,7 +9,7 @@ module.exports = function(config) {
     browsers: [ 'PhantomJS' ],
 
     files: [
-      'src/dependencies.ts', // This ensures we have the es6 shims in place from babel
+      'test/import-babel-polyfill.js', // This ensures we have the es6 shims in place from babel
       'test/**/*.tests.ts',
       'test/**/*.tests.tsx'
     ],
@@ -21,6 +21,7 @@ module.exports = function(config) {
     logLevel: config.LOG_INFO, //config.LOG_DEBUG
 
     preprocessors: {
+      'test/import-babel-polyfill.js': [ 'webpack', 'sourcemap' ],
       'src/**/*.{ts,tsx}': [ 'webpack', 'sourcemap' ],
       'test/**/*.tests.{ts,tsx}': [ 'webpack', 'sourcemap' ]
     },
diff --git a/es6-babel-react-flux-karma/package.json b/es6-babel-react-flux-karma/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "globalize-so-what-cha-want",
-  "version": "0.10.0",
-  "description": "Tell me what Globalize 1.x modules you want to use, I'll tell you what you need.",
+  "name": "es6-babel-react-flux-karma",
+  "version": "1.0.0",
+  "description": "ES6 + TypeScript + Babel + React + Karma: The Secret Recipe",
   "main": "index.js",
   "scripts": {
     "test": "karma start --reporters mocha,junit --single-run --browsers PhantomJS",
@@ -11,7 +11,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/johnnyreilly/globalize-so-what-cha-want.git"
+    "url": "git+https://github.com/microsoft/typescriptsamples.git"
   },
   "keywords": [
     "Globalize",
@@ -22,13 +22,16 @@
   "author": "John Reilly",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/johnnyreilly/globalize-so-what-cha-want/issues"
+    "url": "https://github.com/microsoft/typescriptsamples/issues"
   },
-  "homepage": "https://github.com/johnnyreilly/globalize-so-what-cha-want#readme",
+  "homepage": "https://github.com/Microsoft/TypeScriptSamples/tree/master/es6-babel-react-flux-karma#readme",
   "devDependencies": {
-    "babel": "^5.8.23",
-    "babel-core": "^5.8.25",
-    "babel-loader": "^5.3.2",
+    "babel": "^6.0.0",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-polyfill": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-react": "^6.0.0",
     "del": "^2.0.2",
     "eslint": "^1.6.0",
     "flux": "^2.0.3",
diff --git a/es6-babel-react-flux-karma/src/dependencies.ts b/es6-babel-react-flux-karma/src/dependencies.ts
diff --git a/es6-babel-react-flux-karma/src/main.tsx b/es6-babel-react-flux-karma/src/main.tsx
@@ -1,4 +1,4 @@
-import './dependencies';
+import 'babel-polyfill';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import App from './components/App';
diff --git a/es6-babel-react-flux-karma/src/tsconfig.json b/es6-babel-react-flux-karma/src/tsconfig.json
@@ -25,12 +25,14 @@
         "components/Greeting.tsx",
         "components/WhoToGreet.tsx",
         "constants/action-types/GreetingActionTypes.ts",
-        "dependencies.ts",
         "dispatcher/AppDispatcher.ts",
         "main.tsx",
         "stores/FluxStore.ts",
         "stores/GreetingStore.ts",
         "types/GreetingState.ts"
     ],
-    "exclude": []
+    "exclude": [],
+    "atom": {
+        "rewriteTsconfig": true
+    }
 }
diff --git a/es6-babel-react-flux-karma/test/import-babel-polyfill.js b/es6-babel-react-flux-karma/test/import-babel-polyfill.js
@@ -0,0 +1 @@
+import 'babel-polyfill';
diff --git a/es6-babel-react-flux-karma/test/tsconfig.json b/es6-babel-react-flux-karma/test/tsconfig.json
@@ -27,5 +27,8 @@
         "../typings/react/react.d.ts",
         "../typings/tsd.d.ts"
     ],
-    "exclude": []
+    "exclude": [],
+    "atom": {
+        "rewriteTsconfig": true
+    }
 }
diff --git a/es6-babel-react-flux-karma/webpack.config.js b/es6-babel-react-flux-karma/webpack.config.js
@@ -2,17 +2,16 @@
 'use strict';
 
 var path = require('path');
-// var webpack = require('webpack');
 
 module.exports = {
   cache: true,
   entry: {
     main: './src/main.tsx',
     vendor: [
-      'react',
-      'flux',
+      'babel-polyfill',
       'events',
-      'babel/polyfill'
+      'flux',
+      'react'
     ]
   },
   output: {
@@ -24,11 +23,14 @@ module.exports = {
     loaders: [{
       test: /\.ts(x?)$/,
       exclude: /node_modules/,
-      loader: 'babel-loader!ts-loader'
+      loader: 'babel-loader?presets[]=es2015&presets[]=react!ts-loader'
     }, {
       test: /\.js$/,
       exclude: /node_modules/,
-      loader: 'babel'
+      loader: 'babel',
+      query: {
+        presets: ['es2015', 'react']
+      }
     }]
   },
   plugins: [

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import './dependencies';`
	`1`	`+import 'babel-polyfill';`
`2`	`2`	`import * as React from 'react';`
`3`	`3`	`import * as ReactDOM from 'react-dom';`
`4`	`4`	`import App from './components/App';`