Skip to content
This repository has been archived by the owner on Apr 17, 2020. It is now read-only.

Commit

Permalink
Merge pull request #31 from rwjblue/make-ember-init-use-installed-ver…
Browse files Browse the repository at this point in the history
…sion

Allow usage of blueprint within a blueprinted project.
  • Loading branch information
rwjblue committed Apr 12, 2017
2 parents e6af65c + 2aaccaa commit 130915c
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 1 deletion.
26 changes: 26 additions & 0 deletions blueprints/@glimmer/blueprint/index.js
@@ -0,0 +1,26 @@
'use strict';
const path = require('path');
const MainBlueprint = require('../../../index');

/*
Create an "addon blueprint" that simply defers to our
top level entry point as the blueprint.
This is basically just a work around for
https://github.com/ember-cli/ember-cli/issues/6952.
Once that issue is fixed and released we can remove:
* ember-addon keyword in package.json
* ember-addon key in package.json
* ember-addon-main.js file
* blueprints/ folder
*/
module.exports = Object.assign({}, MainBlueprint, {
init() {
this._super.init.apply(this, arguments);

this.path = path.join(__dirname, '..', '..', '..');
this.name = '@glimmer/blueprint';
}
});
19 changes: 19 additions & 0 deletions ember-addon-main.js
@@ -0,0 +1,19 @@
'use strict';

/*
Create an "addon blueprint" that simply defers to our
top level entry point as the blueprint.
This is basically just a work around for
https://github.com/ember-cli/ember-cli/issues/6952.
Once that issue is fixed and released we can remove:
* ember-addon keyword in package.json
* ember-addon key in package.json
* ember-addon-main.js file
* blueprints/ folder
*/
module.exports = {
name: '@glimmer/blueprint'
};
1 change: 1 addition & 0 deletions files/package.json
Expand Up @@ -14,6 +14,7 @@
"devDependencies": {
"@glimmer/application": "^0.4.0",
"@glimmer/application-pipeline": "^0.5.2",
"@glimmer/blueprint": "^0.1.12",
"@glimmer/component": "^0.3.8",
"@glimmer/resolver": "^0.3.0",
"ember-cli": "github:ember-cli/ember-cli",
Expand Down
6 changes: 5 additions & 1 deletion package.json
Expand Up @@ -11,7 +11,8 @@
"url": "git+https://github.com/glimmerjs/glimmer-blueprint.git"
},
"keywords": [
"ember-blueprint"
"ember-blueprint",
"ember-addon"
],
"author": "Tom Dale <tom@tomdale.net>",
"license": "MIT",
Expand All @@ -24,5 +25,8 @@
},
"devDependencies": {
"ember-cli-valid-component-name": "^1.0.0"
},
"ember-addon": {
"main": "ember-addon-main.js"
}
}

0 comments on commit 130915c

Please sign in to comment.