Skip to content

Commit

Permalink
Merge pull request #854 from cibernox/try-babel-6
Browse files Browse the repository at this point in the history
Try babel 6
  • Loading branch information
cibernox authored Mar 13, 2017
2 parents 717ee3a + e391a22 commit 4078f0f
Show file tree
Hide file tree
Showing 3 changed files with 657 additions and 78 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-deploy": "0.5.0",
"ember-cli-eslint": "3.0.0",
"ember-cli-htmlbars-inline-precompile": "^0.3.3",
"ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.1",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-mirage": "0.2.4",
"ember-cli-qunit": "^3.0.1",
"ember-cli-mirage": "0.2.8",
"ember-cli-qunit": "^3.1.2",
"ember-cli-release": "1.0.0-beta.2",
"ember-cli-sass": "^6.0.0",
"ember-cli-shims": "^1.0.0",
"ember-cli-template-lint": "0.4.12",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-code-example-component": "^0.1.1",
"ember-code-snippet": "1.8.0",
"ember-code-snippet": "1.8.1",
"ember-data": "^2.11.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
Expand All @@ -79,8 +79,8 @@
"dropdown"
],
"dependencies": {
"ember-basic-dropdown": "^0.30.2",
"ember-cli-babel": "^5.1.10",
"ember-basic-dropdown": "0.31.0-beta.1",
"ember-cli-babel": "^6.0.0-beta.3",
"ember-cli-htmlbars": "^1.1.1",
"ember-concurrency": "^0.7.15",
"ember-text-measurer": "^0.3.3",
Expand Down
6 changes: 3 additions & 3 deletions tests/dummy/app/templates/snippets/the-search-6-js.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ export default Ember.Controller.extend({
});

// helpers/highlight-substr.js
export default Ember.Helper.helper(function([text, termToHighlight]) {
return Ember.String.htmlSafe(text.replace(new RegExp(termToHighlight, 'i'), '<b>$&</b>')); // Warning. This is not XSS safe!
});
// export default Ember.Helper.helper(function([text, termToHighlight]) {
// return Ember.String.htmlSafe(text.replace(new RegExp(termToHighlight, 'i'), '<b>$&</b>')); // Warning. This is not XSS safe!
// });
Loading

0 comments on commit 4078f0f

Please sign in to comment.