Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove temporary fork after babel release #116

Merged
merged 1 commit into from Mar 13, 2017
Merged

Remove temporary fork after babel release #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions index.js
View file
Open in desktop
Expand Up @@ -188,14 +188,8 @@ module.exports = {
},

_getModulesPlugin() {
// using custom built modules package until version of
// babel@6 is released that includes changes from
// https://github.com/babel/babel/pull/5422
// replace with the following once that is released:
//
// const ModulesTransform = require('babel-plugin-transform-es2015-modules-amd');
const ModulesTransform = require('babel-plugin-transform-es2015-modules-amd');

const ModulesTransform = require('rwjblue-custom-babel-6-amd-modules-no-interop');
addBaseDir(ModulesTransform);

return [
Expand Down
5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Expand Up @@ -34,15 +34,14 @@
},
"dependencies": {
"amd-name-resolver": "0.0.6",
"babel-plugin-transform-es2015-modules-amd": "^6.22.0",
"babel-plugin-transform-es2015-modules-amd": "^6.24.0",
"babel-polyfill": "^6.16.0",
"babel-preset-env": "^1.2.0",
"broccoli-babel-transpiler": "^6.0.0",
"broccoli-funnel": "^1.0.0",
"broccoli-source": "^1.1.0",
"clone": "^2.0.0",
"ember-cli-version-checker": "^1.2.0",
"rwjblue-custom-babel-6-amd-modules-no-interop": "0.1.1"
"ember-cli-version-checker": "^1.2.0"
},
"devDependencies": {
"chai": "^3.5.0",
Expand Down