diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-05-14 19:59:40 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-14 12:59:40 +0200 |
| commit | 882e4f53221b13ead821093561ae4b665cea3a35 (patch) | |
| tree | 9c03685a140275eacd5dbf393a3e3083e9b7761d | |
| parent | bc1a91f4cd6d4b8fc0655321a2f7506f29ba6222 (diff) | |
Remove Babel plugin for ES Modules (#2975)
* Remove Babel plugin for ES Modules Processing of ES Modules is executed by Webpack. Don't have to do it on Babel side. * Add plugin for test
| -rw-r--r-- | .babelrc | 6 | ||||
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | yarn.lock | 11 |
3 files changed, 9 insertions, 11 deletions
diff --git a/.babelrc b/.babelrc index 37cdb1c20..716f88775 100644 --- a/.babelrc +++ b/.babelrc @@ -5,6 +5,7 @@ "env", { "loose": true, + "modules": false, "targets": { "browsers": ["last 2 versions", "IE >= 11", "iOS >= 9"] } @@ -33,6 +34,11 @@ "plugins": [ "lodash" ] + }, + "test": { + "plugins": [ + "transform-es2015-modules-commonjs" + ] } } } diff --git a/package.json b/package.json index 41bb140e0..78d8213e4 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "storybook": "start-storybook -p 9001 -c storybook", "test": "npm run test:lint && npm run test:mocha", "test:lint": "eslint -c .eslintrc.yml --ext=js --ext=jsx app/javascript/", - "test:mocha": "mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx", + "test:mocha": "NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx", "postinstall": "npm rebuild node-sass" }, "repository": { @@ -29,6 +29,7 @@ "babel-plugin-react-transform": "^2.0.2", "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-plugin-transform-class-properties": "^6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", "babel-plugin-transform-object-rest-spread": "^6.23.0", "babel-plugin-transform-react-jsx-self": "^6.22.0", "babel-plugin-transform-react-jsx-source": "^6.22.0", diff --git a/yarn.lock b/yarn.lock index a0bdb7af2..99cde63c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -718,16 +718,7 @@ babel-plugin-transform-class-properties@6.16.0: babel-plugin-syntax-class-properties "^6.8.0" babel-runtime "^6.9.1" -babel-plugin-transform-class-properties@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.22.0.tgz#aa78f8134495c7de06c097118ba061844e1dc1d8" - dependencies: - babel-helper-function-name "^6.22.0" - babel-plugin-syntax-class-properties "^6.8.0" - babel-runtime "^6.22.0" - babel-template "^6.22.0" - -babel-plugin-transform-class-properties@^6.24.1: +babel-plugin-transform-class-properties@^6.22.0, babel-plugin-transform-class-properties@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" dependencies: |