Skip to content

Commit eccea62

Browse files
wagenetkiwiupover
authored andcommitted
Switch to ember-auto-import and Babel 7 (#198)
* Switch to ember-auto-import and upgrade to Babel 7 * Explicitly declare extraneous dependencies
1 parent 81c3081 commit eccea62

4 files changed

Lines changed: 3242 additions & 180 deletions

File tree

addon/components/ember-spinner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global require */
22

3-
import { Spinner } from 'spin';
3+
import { Spinner } from 'spin.js';
44
import { assign } from '@ember/polyfills';
55
import Component from '@ember/component';
66

index.js

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,12 @@
33

44
const path = require('path');
55
const resolve = require('resolve');
6-
const Rollup = require('broccoli-rollup');
76
const Funnel = require('broccoli-funnel');
87
const mergeTrees = require('broccoli-merge-trees');
9-
const transformer = require('ember-cli-es6-transform');
108

119
module.exports = {
1210
name: 'ember-cli-spinjs',
1311

14-
included(app) {
15-
// this._super.included.apply(app, arguments);
16-
this._super.included.apply(this, arguments);
17-
this.app = this._findHost();
18-
19-
app.import('vendor/spin.js');
20-
},
21-
22-
treeForVendor(tree) {
23-
const spinJsPath = path.join(resolve.sync('spin.js'), '..');
24-
25-
let allTrees = [];
26-
27-
let rollupTree = new Rollup(spinJsPath, {
28-
rollup: {
29-
input: 'spin.js',
30-
output: {
31-
file: 'spin.js',
32-
format: 'es'
33-
},
34-
onwarn: function(warning) {
35-
36-
// Suppress known error message caused by TypeScript compiled code with Rollup
37-
// https://github.com/rollup/rollup/wiki/Troubleshooting#this-is-undefined
38-
if (warning.code === 'THIS_IS_UNDEFINED') {
39-
return;
40-
}
41-
42-
// eslint-disable-next-line no-console
43-
console.log("Rollup warning: ", warning.message);
44-
},
45-
}
46-
});
47-
48-
const babel = this.app.project.findAddonByName('ember-cli-babel');
49-
const babelOptions = babel.buildBabelOptions();
50-
const es6Tree = transformer.es6Transform(rollupTree, babelOptions);
51-
52-
allTrees.push(es6Tree);
53-
54-
if (tree) {
55-
allTrees.push(tree);
56-
}
57-
58-
return mergeTrees(allTrees);
59-
},
60-
6112
treeForAddonStyles: function (tree) {
6213
const spinJsPath = path.join(resolve.sync('spin.js'), '..');
6314

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,11 @@
6060
"qunit-dom": "^0.8.0"
6161
},
6262
"dependencies": {
63+
"broccoli-funnel": "^2.0.1",
6364
"broccoli-merge-trees": "^3.0.1",
64-
"broccoli-rollup": "^2.0.0",
65-
"ember-cli-babel": "^6.16.0",
66-
"ember-cli-es6-transform": "^0.0.5",
65+
"ember-auto-import": "^1.2.15",
66+
"ember-cli-babel": "^7.1.2",
67+
"resolve": "^1.8.1",
6768
"spin.js": "^4.0.0"
6869
},
6970
"bugs": {

0 commit comments

Comments
 (0)