Skip to content

Commit

Permalink
Update ember-cli-babel and remove deprecated broccoli plugin
Browse files Browse the repository at this point in the history
Update packages relying on older ember-cli-babel


Add babel fix to ember-cli-build


Move mocha test out of ember folder structure
  • Loading branch information
repl-andrew-ovens committed Dec 3, 2018
1 parent 69bf643 commit 6d35c27
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
11 changes: 4 additions & 7 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ var fs = require('fs');
var path = require('path');
var util = require('util');

var renameFiles = require('broccoli-rename-files');
var mergeTrees = require('broccoli-merge-trees');
var funnel = require('broccoli-funnel');
var removeFiles = require('broccoli-file-remover');
var replaceString = require('broccoli-string-replace');

var assign = require('object-assign');
Expand Down Expand Up @@ -99,13 +97,12 @@ module.exports = {

if (this.options.enabled && type === 'all') {
if (this.options.output) {
renamedIndexTree = renameFiles(funnel(tree, {
renamedIndexTree = funnel(tree, {
srcDir: '.',
files: ['index.html'],
destDir: this.options.destDir || '.'
}), {
transformFilename: function() {
return this.options.output;
destDir: this.options.destDir || '.',
getDestinationPath: function() {
return this.options.output;
}.bind(this)
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function findEmberIndex(app) {
describe('Addon', function () {
var builder;

this.timeout(15000);
this.timeout(60000);

afterEach(function () {
if (builder) {
Expand Down
12 changes: 5 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"start": "ember server",
"build": "ember build",
"test": "ember try:testall && npm run test-mocha",
"test-mocha": "mocha tests/**/*-test-node.js"
"test-mocha": "mocha mocha-tests"
},
"repository": "https://github.com/ramybenaroya/ember-index",
"engines": {
Expand All @@ -23,18 +23,18 @@
"broccoli-asset-rev": "^2.2.2",
"chai": "^3.0.0",
"ember-cli": "1.13.12",
"ember-cli-app-version": "^1.0.0",
"ember-cli-app-version": "^3.2.0",
"ember-cli-dependency-checker": "^1.1.0",
"ember-cli-htmlbars": "1.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-htmlbars-inline-precompile": "^0.4.0",
"ember-cli-ic-ajax": "0.2.4",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "1.0.4",
"ember-cli-release": "0.2.8",
"ember-cli-uglify": "^1.0.1",
"ember-disable-prototype-extensions": "^1.0.0",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4",
"ember-export-application-global": "^2.0.0",
"ember-try": "~0.0.8",
"mocha": "^2.2.5"
},
Expand All @@ -43,13 +43,11 @@
"index"
],
"dependencies": {
"broccoli-file-remover": "^0.3.1",
"broccoli-funnel": "^1.1.0",
"broccoli-merge-trees": "^0.2.1",
"broccoli-rename-files": "0.0.3",
"broccoli-string-replace": "^0.1.2",
"colors": "^1.1.2",
"ember-cli-babel": "^5.1.5",
"ember-cli-babel": "^6.16.0",
"object-assign": "^3.0.0"
},
"ember-addon": {
Expand Down

0 comments on commit 6d35c27

Please sign in to comment.