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.

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

Upgrade to babel6 #132

Merged
merged 5 commits into from
Dec 21, 2015
Merged

Upgrade to babel6 #132

merged 5 commits into from
Dec 21, 2015

Conversation

levithomason
Copy link
Member

No description provided.

<!-- build:development-->
<script src="/webpack-dev-server.js"></script>
<!-- endbuild -->

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was added to the webpack entry config. It is no longer needed here.

@dvdzkwsk
Copy link
Member

Are we cool to mergerino?

}
});
};
module.exports = require('./karma.conf.babel');
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We simply import our karma.conf.babel.js file after invoking the babel register hook. So we can write our karma conf in future ES.

"babel-preset-es2015": "^6.1.18",
"babel-preset-react": "^6.1.18",
"babel-preset-stage-1": "^6.1.18",
"chai": "^3.3.0",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pulled runtime deps into dependencies, all others are devDependencies. Also, bumped us down to stage 1 for a bit more stability.

@ghost
Copy link

ghost commented Dec 21, 2015

:shipit:

@dvdzkwsk
Copy link
Member

levithomason added a commit that referenced this pull request Dec 21, 2015
@levithomason levithomason merged commit 670ecbf into master Dec 21, 2015
@levithomason levithomason deleted the feature/babel6 branch December 21, 2015 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants