Skip to content

Commit

Permalink
Bump Babel to version 6
Browse files Browse the repository at this point in the history
closes CNVS-29019
closes instructuregh-817

Test Plan:
 - bundle exec rake canvas:compile_assets should compile
   /app/jsx and /specs/javascripts/jsx properly
 - Automated tests should pass
 - Areas of Canvas that use JSX/ES6 should work properly such
   as Moderated Grading, Files, and the new Admin search page

Change-Id: Ic2aefbe98dd65a9b38407a68dc569e19a9e300e2
Reviewed-on: https://gerrit.instructure.com/78232
Tested-by: Jenkins
Reviewed-by: Steven Burnett <[email protected]>
Reviewed-by: Clay Diffrient <[email protected]>
QA-Review: Heath Hales <[email protected]>
Product-Review: Clay Diffrient <[email protected]>
  • Loading branch information
claydiffrient committed Jul 15, 2016
1 parent fb54224 commit ebf63c9
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["es2015", "react", "stage-1"],
"plugins": ["add-module-exports"]
}
11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@
"brandable_css": "0.0.67"
},
"devDependencies": {
"babel": "^5.8.23",
"babel-core": "^5.8.25",
"babel-loader": "^5.3.2",
"babel-cli": "^6.10.1",
"babel-core": "^6.10.4",
"babel-loader": "^6.2.4",
"babel-plugin-add-module-exports": "0.2.1",
"babel-polyfill": "6.9.1",
"babel-preset-es2015": "^6.9.0",
"babel-preset-react": "^6.11.1",
"babel-preset-stage-1": "^6.5.0",
"base64-js": "0.0.8",
"coffee-loader": "^0.7.2",
"coffee-script": "1.6.2",
Expand Down
3 changes: 2 additions & 1 deletion webpack.config.babel.js
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import 'babel-polyfill'
import webpackConfig from './frontend_build/baseWebpackConfig'
export default webpackConfig
export default webpackConfig
1 change: 1 addition & 0 deletions webpack.production.config.babel.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'babel-polyfill'
var webpack = require("webpack");
var baseWebpackConfig = require("./frontend_build/baseWebpackConfig");
var productionWebpackConfig = baseWebpackConfig;
Expand Down
1 change: 1 addition & 0 deletions webpack.test.config.babel.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'babel-polyfill'
var webpack = require("webpack");
var I18nPlugin = require("./frontend_build/i18nPlugin");
var ClientAppsPlugin = require("./frontend_build/clientAppPlugin");
Expand Down

0 comments on commit ebf63c9

Please sign in to comment.