fix: add maindir support to blueprints for addon and app

denali-js · Sep 2, 2017 · 4adf3aa · 4adf3aa
1 parent 4b13376
commit 4adf3aa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/blueprints/addon/files/__name__/package.json b/blueprints/addon/files/__name__/package.json
@@ -11,6 +11,7 @@
     "addon"
   ],
   "main": "app/addon.js",
+  "mainDir": "dist",
   "license": "MIT",
   "dependencies": {
     "bluebird": "^3.4.6",

diff --git a/blueprints/addon/files/__name__/test/dummy/app/index.js b/blueprints/addon/files/__name__/test/dummy/app/index.js
@@ -1,3 +1,4 @@
+import 'main-dir';
 import sourcemaps from 'source-map-support';
 import path from 'path';
 import Application from './application';

diff --git a/blueprints/app/files/__name__/app/index.js b/blueprints/app/files/__name__/app/index.js
@@ -1,3 +1,4 @@
+import 'main-dir';
 import sourcemaps from 'source-map-support';
 import path from 'path';
 import Application from './application';

diff --git a/blueprints/app/files/__name__/package.json b/blueprints/app/files/__name__/package.json
@@ -6,6 +6,7 @@
     "test": "denali test"
   },
   "private": true,
+  "mainDir": "dist",
   "engines": {
     "node": ">=6.2.0"
   },

diff --git a/lib/blueprint.ts b/lib/blueprint.ts
@@ -88,7 +88,7 @@ export default class Blueprint extends Command {
     let addons = findAddons(projectPkg && projectPkg.name !== 'denali');
     debug(`discovering available blueprints from [ ${ addons.map((a) => a.pkg.name).join(', ') } ] addons`);
     addons.forEach((addon) => {
-      this.discoverBlueprintsForAddon(blueprints, addon.pkg.name, path.join(addon.dir, 'blueprints'));
+      this.discoverBlueprintsForAddon(blueprints, addon.pkg.name, path.join(addon.distDir, 'blueprints'));
     });
     return blueprints;
   }