Merge branch 'forked/3.21.1' into forked/3.25.3

lib/broccoli/ember-app.js

@@ -103,6 +103,8 @@ class EmberApp {
     this._initProject(options);
     this.name = options.name || this.project.name();
 
+    this._folderName = options.folderName || 'app';
+
     this.env = EmberApp.env();
     this.isProduction = this.env === 'production';
 
@@ -245,21 +247,21 @@ class EmberApp {
     };
     let trees = (options && options.trees) || {};
 
-    let appTree = buildTreeFor('app', trees.app);
+    let appTree = buildTreeFor(this._folderName, trees.app);
 
     let testsPath = typeof trees.tests === 'string' ? resolvePathFor('tests', trees.tests) : null;
     let testsTree = buildTreeFor('tests', trees.tests, options.tests);
 
     // these are contained within app/ no need to watch again
     // (we should probably have the builder or the watcher dedup though)
-    this._stylesPath = resolvePathFor('app/styles', trees.styles);
+    this._stylesPath = resolvePathFor(this._folderName + '/styles', trees.styles);
 
     let stylesTree = null;
     if (fs.existsSync(this._stylesPath)) {
       stylesTree = new UnwatchedDir(this._stylesPath);
     }
 
-    let templatesTree = buildTreeFor('app/templates', trees.templates, false);
+    let templatesTree = buildTreeFor(this._folderName + '/templates', trees.templates, false);
 
     // do not watch bower's default directory by default
     let bowerTree = buildTreeFor(this.bowerDirectory, null, !!this.project._watchmanInfo.enabled);
@@ -376,6 +378,11 @@ class EmberApp {
     @method _initVendorFiles
   */
   _initVendorFiles() {
+
+    if (this.options.skipVendorFiles) {
+      return;
+    }
+
     let bowerDeps = this.project.bowerDependencies();
     let ember = this.project.findAddonByName('ember-source');
     let addonEmberCliShims = this.project.findAddonByName('ember-cli-shims');

package.json

@@ -29,7 +29,6 @@
   "scripts": {
     "docs": "yuidoc",
     "lint": "eslint . --cache",
-    "prepack": "yarn docs",
     "test": "node --unhandled-rejections=strict tests/runner",
     "test:all": "node --unhandled-rejections=strict tests/runner all",
     "test:cover": "nyc --all --reporter=text --reporter=lcov node tests/runner all",