From 68c48f9a2fc2259559b388f1b3a84d976e5272f0 Mon Sep 17 00:00:00 2001 From: Colin Megill Date: Mon, 23 Oct 2017 12:47:52 -0700 Subject: [PATCH] fix build --- configuration/babel/babel.dev.js | 4 ++-- configuration/babel/babel.prod.js | 4 ++-- configuration/webpack/webpack.config.prod.js | 6 +----- package.json | 6 +++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/configuration/babel/babel.dev.js b/configuration/babel/babel.dev.js index acfd9228..571d4cd2 100644 --- a/configuration/babel/babel.dev.js +++ b/configuration/babel/babel.dev.js @@ -2,12 +2,12 @@ module.exports = { babelrc: false, cacheDirectory: true, presets: [ - [ "es2015", { loose: true, modules: false } ], + [ "env", { loose: true, modules: false } ], "stage-0", "react" ], plugins: [ "react-hot-loader/babel", - "transform-decorators-legacy" + "babel-plugin-transform-decorators-legacy" ] }; diff --git a/configuration/babel/babel.prod.js b/configuration/babel/babel.prod.js index 4bbdad38..c2399a54 100644 --- a/configuration/babel/babel.prod.js +++ b/configuration/babel/babel.prod.js @@ -1,12 +1,12 @@ module.exports = { babelrc: false, presets: [ - [ "es2015", { loose: true, modules: false } ], + [ "env", { loose: true, modules: false } ], "stage-0", "react" ], plugins: [ "babel-plugin-transform-react-constant-elements", - "transform-decorators-legacy" + "babel-plugin-transform-decorators-legacy" ].map(require.resolve).concat([ [ require.resolve('babel-plugin-transform-runtime') ] ]) }; diff --git a/configuration/webpack/webpack.config.prod.js b/configuration/webpack/webpack.config.prod.js index 9649c166..3dc27a02 100644 --- a/configuration/webpack/webpack.config.prod.js +++ b/configuration/webpack/webpack.config.prod.js @@ -100,12 +100,8 @@ module.exports = { output: { comments: false, screw_ie8: true } }), new ExtractTextPlugin('static/css/[name].[contenthash:8].css'), - new CopyWebpackPlugin([ - { from: 'public' }, - { from: 'manifest.webmanifest' } - ]), new SWPrecacheWebpackPlugin({ - cacheId: 'formidable-react-starter', + cacheId: 'cellxgene', filename: 'service-worker.js' }) ] diff --git a/package.json b/package.json index cf2010f0..91d329b7 100644 --- a/package.json +++ b/package.json @@ -47,11 +47,12 @@ "autoprefixer": "^6.4.0", "babel-core": "^6.13.2", "babel-eslint": "^7.1.1", - "babel-loader": "^6.2.4", + "babel-loader": "^7.1.2", "babel-plugin-istanbul": "^3.1.2", "babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-react-constant-elements": "^6.9.1", - "babel-plugin-transform-runtime": "^6.12.0", + "babel-plugin-transform-runtime": "^6.23.0", + "babel-preset-env": "^1.6.1", "babel-preset-es2015": "^6.13.2", "babel-preset-react": "^6.11.1", "babel-preset-stage-0": "^6.5.0", @@ -65,7 +66,6 @@ "css-modules-require-hook": "^4.0.1", "enzyme": "^2.4.1", "eslint": "^2.10.2", - "eslint-config-formidable": "^2.0.1", "eslint-loader": "^1.5.0", "eslint-plugin-filenames": "^1.1.0", "eslint-plugin-import": "^2.2.0",