Skip to content

Commit 7a8eb5a

Browse files
authored
Merge pull request #89 from ember-learn/bugfix/move-sandbox
[bugfix] Ensure sandbox does not get included in parent addons
2 parents a39dd1a + 7ac57ec commit 7a8eb5a

File tree

9 files changed

+9
-4
lines changed

9 files changed

+9
-4
lines changed

ember-cli-build.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
'use strict';
22

33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
4+
const Project = require('ember-cli/lib/models/project');
45

56
module.exports = function(defaults) {
7+
let project = Project.closestSync(process.cwd());
8+
9+
project.pkg['ember-addon'].paths = ['sandbox'];
10+
11+
defaults.project = project;
12+
613
var app = new EmberAddon(defaults, {
14+
project,
715
svgJar: {
816
sourceDirs: [
917
'public',
@@ -13,7 +21,7 @@ module.exports = function(defaults) {
1321
'ember-cli-addon-docs': {
1422
projects: {
1523
sandbox: {
16-
tree: 'lib/sandbox'
24+
tree: 'sandbox'
1725
}
1826
}
1927
}

package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@
108108
],
109109
"after": [
110110
"ember-modal-dialog"
111-
],
112-
"paths": [
113-
"lib/sandbox"
114111
]
115112
}
116113
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)