Skip to content

Commit

Permalink
Updates to support using emberjs-build@0.20.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue committed Apr 27, 2017
1 parent 58df3b2 commit b100b70
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 3 deletions.
1 change: 0 additions & 1 deletion bower.json
Expand Up @@ -5,6 +5,5 @@
"url": "https://github.com/emberjs/ember.js.git"
},
"devDependencies": {
"ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c"
}
}
13 changes: 12 additions & 1 deletion ember-cli-build.js
Expand Up @@ -254,11 +254,22 @@ function qunit() {
});
}

module.exports = function() {

function treeForAddon(project, name) {
var addon = project.findAddonByName(name);
var tree = addon.treeFor('addon');

return new Funnel(tree, {
srcDir: 'modules'
});
}

module.exports = function(options) {
var features = getFeatures();
var version = getVersion();

var vendorPackages = {
'ember-dev': treeForAddon(options.project, 'ember-dev'),
'external-helpers': vendoredPackage('external-helpers'),
'loader': vendoredPackage('loader'),
'rsvp': rsvp(),
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -67,6 +67,7 @@
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-sauce": "^2.0.0",
"ember-cli-yuidoc": "0.8.4",
"ember-dev": "github:emberjs/ember-dev#eace534",
"ember-publisher": "0.0.7",
"emberjs-build": "0.20.1",
"eslint-plugin-ember-internal": "^1.0.1",
Expand Down
26 changes: 25 additions & 1 deletion yarn.lock
Expand Up @@ -1750,7 +1750,7 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

ember-cli-babel@^5.1.3:
ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.3:
version "5.2.1"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.1.tgz#14a1a7b3ae9e9f1284f7bcdb142eb53bd0b1b5bd"
dependencies:
Expand Down Expand Up @@ -1999,6 +1999,12 @@ ember-cli@2.10.0:
walk-sync "^0.3.0"
yam "0.0.22"

"ember-dev@github:emberjs/ember-dev#eace534":
version "0.0.0"
resolved "https://codeload.github.com/emberjs/ember-dev/tar.gz/eace534"
dependencies:
ember-cli-babel "^5.0.0"

ember-publisher@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/ember-publisher/-/ember-publisher-0.0.7.tgz#865ca69ef47bafb38120a84244aa58b950ca4850"
Expand Down Expand Up @@ -2248,6 +2254,13 @@ escope@^3.2.0, escope@^3.6.0:
esrecurse "^4.1.0"
estraverse "^4.1.1"

eslint-plugin-ember-internal@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-ember-internal/-/eslint-plugin-ember-internal-1.1.0.tgz#4bf01f696ca607cb256c9291aaad7447c9ec18bd"
dependencies:
line-column "^1.0.2"
requireindex "~1.1.0"

eslint@^3.0.0:
version "3.12.2"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.12.2.tgz#6be5a9aa29658252abd7f91e9132bab1f26f3c34"
Expand Down Expand Up @@ -3764,6 +3777,13 @@ levn@^0.3.0, levn@~0.3.0:
prelude-ls "~1.1.2"
type-check "~0.3.2"

line-column@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
dependencies:
isarray "^1.0.0"
isobject "^2.0.0"

linkify-it@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.2.tgz#994629a4adfa5a7d34e08c075611575ab9b6fcfc"
Expand Down Expand Up @@ -5221,6 +5241,10 @@ require-uncached@^1.0.2:
caller-path "^0.1.0"
resolve-from "^1.0.0"

requireindex@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"

requires-port@1.x.x:
version "1.0.0"
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
Expand Down

0 comments on commit b100b70

Please sign in to comment.