Skip to content

Commit

Permalink
polyfill es2015 in older browsers and for phantomjs (#1323)
Browse files Browse the repository at this point in the history
* use babel polyfill

* alphabetize entry files, only add babel-polyfill once for each entry
  • Loading branch information
Alanna Scott committed Oct 12, 2016
1 parent 73cd2ea commit 5cb3cc2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
5 changes: 3 additions & 2 deletions caravel/assets/package.json
Expand Up @@ -37,8 +37,6 @@
"homepage": "https://github.com/airbnb/caravel#readme",
"dependencies": {
"autobind-decorator": "^1.3.3",
"babel-cli": "^6.14.0",
"babel-preset-es2015": "^6.14.0",
"bootstrap": "^3.3.6",
"bootstrap-datepicker": "^1.6.0",
"brace": "^0.7.0",
Expand Down Expand Up @@ -90,6 +88,9 @@
},
"devDependencies": {
"babel": "^6.3.26",
"babel-cli": "^6.14.0",
"babel-polyfill": "^6.14.0",
"babel-preset-es2015": "^6.14.0",
"babel-core": "^6.10.4",
"babel-loader": "^6.2.4",
"babel-preset-airbnb": "^2.1.1",
Expand Down
12 changes: 6 additions & 6 deletions caravel/assets/webpack.config.js
Expand Up @@ -13,13 +13,13 @@ const VERSION_STRING = JSON.parse(fs.readFileSync('package.json')).version;
const config = {
entry: {
'css-theme': APP_DIR + '/javascripts/css-theme.js',
dashboard: APP_DIR + '/javascripts/dashboard/Dashboard.jsx',
explore: APP_DIR + '/javascripts/explore/explore.jsx',
explorev2: APP_DIR + '/javascripts/explorev2/index.jsx',
welcome: APP_DIR + '/javascripts/welcome.js',
standalone: APP_DIR + '/javascripts/standalone.js',
common: APP_DIR + '/javascripts/common.js',
sqllab: APP_DIR + '/javascripts/SqlLab/index.jsx',
dashboard: ['babel-polyfill', APP_DIR + '/javascripts/dashboard/Dashboard.jsx'],
explore: ['babel-polyfill', APP_DIR + '/javascripts/explore/explore.jsx'],
explorev2: ['babel-polyfill', APP_DIR + '/javascripts/explorev2/index.jsx'],
sqllab: ['babel-polyfill', APP_DIR + '/javascripts/SqlLab/index.jsx'],
standalone: ['babel-polyfill', APP_DIR + '/javascripts/standalone.js'],
welcome: ['babel-polyfill', APP_DIR + '/javascripts/welcome.js'],
},
output: {
path: BUILD_DIR,
Expand Down

0 comments on commit 5cb3cc2

Please sign in to comment.