ember-cli 4.12.0-beta.0 → 4.13.0-beta.0

package/lib/broccoli/ember-app.js

@@ -9,16 +9,11 @@ const p = require('ember-cli-preprocess-registry/preprocessors');
 const chalk = require('chalk');
 const resolve = require('resolve');
 
+const assert = require('../debug/assert');
 const Project = require('../models/project');
 
-let preprocessJs = p.preprocessJs;
-let isType = p.isType;
-
-let preprocessTemplates = p.preprocessTemplates;
-
 const concat = require('broccoli-concat');
 const BroccoliDebug = require('broccoli-debug');
-const AmdFunnel = require('broccoli-amd-funnel');
 const mergeTrees = require('./merge-trees');
 const broccoliMergeTrees = require('broccoli-merge-trees');
 const WatchedDir = require('broccoli-source').WatchedDir;
@@ -29,11 +24,7 @@ const Funnel = require('broccoli-funnel');
 const logger = require('heimdalljs-logger')('ember-cli:ember-app');
 const addonProcessTree = require('../utilities/addon-process-tree');
 const lintAddonsByType = require('../utilities/lint-addons-by-type');
-const emberCLIBabelConfigKey = require('../utilities/ember-cli-babel-config-key');
-const { isExperimentEnabled } = require('../experiments');
-const semver = require('semver');
 const DefaultPackager = require('./default-packager');
-const { deprecate } = require('../debug');
 
 let DEFAULT_CONFIG = {
   storeConfigInMeta: true,
@@ -62,7 +53,6 @@ let DEFAULT_CONFIG = {
   },
   sourcemaps: {},
   trees: {},
-  jshintrc: {},
   addons: {},
 };
 
@@ -77,10 +67,8 @@ class EmberApp {
    - autoRun, defaults to `true`
    - outputPaths, defaults to `{}`
    - minifyCSS, defaults to `{enabled: !!isProduction,options: { relativeTo: 'assets' }}
-   - minifyJS, defaults to `{enabled: !!isProduction}
    - sourcemaps, defaults to `{}`
    - trees, defaults to `{}`
-   - jshintrc, defaults to `{}`
    - vendorFiles, defaults to `{}`
    - addons, defaults to `{ exclude: [], include: [] }`
 
@@ -106,8 +94,6 @@ class EmberApp {
 
     this.registry = options.registry || p.defaultRegistry(this);
 
-    this.bowerDirectory = this.project._bowerDirectory;
-
     this._initTestsAndHinting(options);
     this._initOptions(options);
     this._initVendorFiles();
@@ -164,16 +150,13 @@ class EmberApp {
       },
     });
 
-    this._isPackageHookSupplied = typeof this.options.package === 'function';
     this._cachedAddonBundles = {};
 
     if (this.project.perBundleAddonCache && this.project.perBundleAddonCache.numProxies > 0) {
       if (this.options.addons.include && this.options.addons.include.length) {
-        let optionKey = this.options.addons.hasWhitelist ? 'whitelist' : 'include';
-
         throw new Error(
           [
-            `[ember-cli] addon bundle caching is disabled for apps that specify an addon "${optionKey}"`,
+            `[ember-cli] addon bundle caching is disabled for apps that specify an addon "include"`,
             '',
             'All addons using bundle caching:',
             ...this.project.perBundleAddonCache.getPathsToAddonsOptedIn(),
@@ -182,11 +165,9 @@ class EmberApp {
       }
 
       if (this.options.addons.exclude && this.options.addons.exclude.length) {
-        let optionKey = this.options.addons.hasBlacklist ? 'blacklist' : 'exclude';
-
         throw new Error(
           [
-            `[ember-cli] addon bundle caching is disabled for apps that specify an addon "${optionKey}"`,
+            `[ember-cli] addon bundle caching is disabled for apps that specify an addon "exclude"`,
             '',
             'All addons using bundle caching:',
             ...this.project.perBundleAddonCache.getPathsToAddonsOptedIn(),
@@ -272,8 +253,6 @@ class EmberApp {
     let trees = (options && options.trees) || {};
 
     let appTree = buildTreeFor('app', 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
@@ -286,47 +265,15 @@ class EmberApp {
     }
 
     let templatesTree = buildTreeFor('app/templates', trees.templates, false);
-
-    // do not watch bower's default directory by default
-    let bowerTree = buildTreeFor(this.bowerDirectory, null, !!this.project._watchmanInfo.enabled);
-
-    // Set the flag to make sure:
-    //
-    // - we do not blow up if there is no bower_components folder
-    // - we do not attempt to merge bower and vendor together if they are the
-    //   same tree
-    this._bowerEnabled = this.bowerDirectory !== 'vendor' && fs.existsSync(this.bowerDirectory);
-
     let vendorTree = buildTreeFor('vendor', trees.vendor);
     let publicTree = buildTreeFor('public', trees.public);
 
     let detectedDefaultOptions = {
       babel: {},
-      jshintrc: {
-        app: this.project.root,
-        tests: testsPath,
-      },
       minifyCSS: {
         enabled: this.isProduction,
         options: { processImport: false },
       },
-      // TODO: remove this with a deprecation (nothing in the default app/addon setup consumes it)
-      minifyJS: {
-        enabled: this.isProduction,
-        options: {
-          compress: {
-            // this is adversely affects heuristics for IIFE eval
-            // eslint-disable-next-line camelcase
-            negate_iife: false,
-            // limit sequences because of memory issues during parsing
-            sequences: 30,
-          },
-          output: {
-            // no difference in size and much easier to debug
-            semicolons: false,
-          },
-        },
-      },
       outputPaths: {
         app: {
           css: {
@@ -344,7 +291,6 @@ class EmberApp {
         tests: testsTree,
         styles: stylesTree,
         templates: templatesTree,
-        bower: bowerTree,
         vendor: vendorTree,
         public: publicTree,
       },
@@ -352,84 +298,12 @@ class EmberApp {
 
     let emberCLIBabelInstance = this.project.findAddonByName('ember-cli-babel');
     if (emberCLIBabelInstance) {
-      let version = this.project.require('ember-cli-babel/package.json').version;
-      if (semver.lt(version, '6.0.0-alpha.1')) {
-        detectedDefaultOptions.babel = {
-          modules: 'amdStrict',
-          moduleIds: true,
-          resolveModuleSource: require('amd-name-resolver').moduleResolve,
-        };
-      }
-
-      let emberCLIBabelConfigKey = this._emberCLIBabelConfigKey();
-      detectedDefaultOptions[emberCLIBabelConfigKey] = detectedDefaultOptions[emberCLIBabelConfigKey] || {};
-      detectedDefaultOptions[emberCLIBabelConfigKey].compileModules = true;
+      detectedDefaultOptions['ember-cli-babel'] = detectedDefaultOptions['ember-cli-babel'] || {};
+      detectedDefaultOptions['ember-cli-babel'].compileModules = true;
     }
 
     this.options = defaultsDeep(options, detectedDefaultOptions, DEFAULT_CONFIG);
 
-    if (this.options.addons.blacklist) {
-      deprecate(
-        'Using the `addons.blacklist` build option is deprecated. Please use `addons.exclude` instead.',
-        false,
-        {
-          for: 'ember-cli',
-          id: 'ember-cli.blacklist-whitelist-build-options',
-          since: {
-            available: '4.4.0',
-            enabled: '4.4.0',
-          },
-          until: '5.0.0',
-        }
-      );
-
-      if (this.options.addons.exclude) {
-        throw new Error('Specifying both "blacklist" and "exclude" is not supported. Please use only one.');
-      }
-
-      this.options.addons.hasBlacklist = true;
-      this.options.addons.exclude = this.options.addons.blacklist;
-    }
-
-    Object.defineProperty(this.options.addons, 'blacklist', {
-      get() {
-        console.log(chalk.yellow('Please use "exclude" instead of "blacklist".'));
-
-        return this.exclude;
-      },
-    });
-
-    if (this.options.addons.whitelist) {
-      deprecate(
-        'Using the `addons.whitelist` build option is deprecated. Please use `addons.include` instead.',
-        false,
-        {
-          for: 'ember-cli',
-          id: 'ember-cli.blacklist-whitelist-build-options',
-          since: {
-            available: '4.4.0',
-            enabled: '4.4.0',
-          },
-          until: '5.0.0',
-        }
-      );
-
-      if (this.options.addons.include) {
-        throw new Error('Specifying both "whitelist" and "include" is not supported. Please use only one.');
-      }
-
-      this.options.addons.hasWhitelist = true;
-      this.options.addons.include = this.options.addons.whitelist;
-    }
-
-    Object.defineProperty(this.options.addons, 'whitelist', {
-      get() {
-        console.log(chalk.yellow('Please use "include" instead of "whitelist".'));
-
-        return this.include;
-      },
-    });
-
     // For now we must disable Babel sourcemaps due to unforeseen
     // performance regressions.
     if (!('sourceMaps' in this.options.babel)) {
@@ -443,12 +317,6 @@ class EmberApp {
     this.options.fingerprint.exclude.push('testem');
   }
 
-  _emberCLIBabelConfigKey() {
-    let emberCLIBabelInstance = this.project.findAddonByName('ember-cli-babel');
-
-    return emberCLIBabelConfigKey(emberCLIBabelInstance);
-  }
-
   /**
     Resolves a path relative to the project's root
 
@@ -464,118 +332,26 @@ class EmberApp {
     @method _initVendorFiles
   */
   _initVendorFiles() {
-    let bowerDeps = this.project._bowerDependencies();
-    let ember = this.project.findAddonByName('ember-source');
-    let addonEmberCliShims = this.project.findAddonByName('ember-cli-shims');
-    let bowerEmberCliShims = bowerDeps['ember-cli-shims'];
-    let developmentEmber;
-    let productionEmber;
-    let emberTesting;
-    let emberShims = null;
-
-    if (ember) {
-      developmentEmber = ember.paths.debug;
-      productionEmber = ember.paths.prod;
-      emberTesting = ember.paths.testing;
-      emberShims = ember.paths.shims;
-    } else {
-      if (bowerEmberCliShims) {
-        emberShims = `${this.bowerDirectory}/ember-cli-shims/app-shims.js`;
-      }
+    let emberSource = this.project.findAddonByName('ember-source');
 
-      // in Ember 1.10 and higher `ember.js` is deprecated in favor of
-      // the more aptly named `ember.debug.js`.
-      productionEmber = `${this.bowerDirectory}/ember/ember.prod.js`;
-      developmentEmber = `${this.bowerDirectory}/ember/ember.debug.js`;
-      if (!fs.existsSync(this._resolveLocal(developmentEmber))) {
-        developmentEmber = `${this.bowerDirectory}/ember/ember.js`;
-      }
-      emberTesting = `${this.bowerDirectory}/ember/ember-testing.js`;
-    }
-
-    let handlebarsVendorFiles;
-    if ('handlebars' in bowerDeps) {
-      handlebarsVendorFiles = {
-        development: `${this.bowerDirectory}/handlebars/handlebars.js`,
-        production: `${this.bowerDirectory}/handlebars/handlebars.runtime.js`,
-      };
-    } else {
-      handlebarsVendorFiles = null;
-    }
+    assert(
+      'Could not find `ember-source`. Please install `ember-source` by running `ember install ember-source`.',
+      emberSource
+    );
 
     this.vendorFiles = omitBy(
       merge(
         {
-          'handlebars.js': handlebarsVendorFiles,
           'ember.js': {
-            development: developmentEmber,
-            production: productionEmber,
+            development: emberSource.paths.debug,
+            production: emberSource.paths.prod,
           },
-          'ember-testing.js': [emberTesting, { type: 'test' }],
-          'app-shims.js': emberShims,
-          'ember-resolver.js': [
-            `${this.bowerDirectory}/ember-resolver/dist/modules/ember-resolver.js`,
-            {
-              exports: {
-                'ember/resolver': ['default'],
-              },
-            },
-          ],
+          'ember-testing.js': [emberSource.paths.testing, { type: 'test' }],
         },
         this.options.vendorFiles
       ),
       isNull
     );
-
-    this._addJqueryInLegacyEmber();
-
-    if (this._addonInstalled('ember-resolver') || !bowerDeps['ember-resolver']) {
-      // if the project is using `ember-resolver` as an addon
-      // remove it from `vendorFiles` (the npm version properly works
-      // without `app.import`s)
-      delete this.vendorFiles['ember-resolver.js'];
-    }
-
-    // Warn if ember-cli-shims is not included.
-    // certain versions of `ember-source` bundle them by default,
-    // so we must check if that is the load mechanism of ember
-    // before checking `bower`.
-    let emberCliShimsRequired = this._checkEmberCliBabel(this.project.addons);
-    if (!emberShims && !addonEmberCliShims && !bowerEmberCliShims && emberCliShimsRequired) {
-      this.project.ui.writeWarnLine(
-        "You have not included `ember-cli-shims` in your project's `bower.json` or `package.json`. This only works if you provide an alternative yourself and unset `app.vendorFiles['app-shims.js']`."
-      );
-    }
-
-    // If ember-testing.js is coming from Bower (not ember-source) and it does not
-    // exist, then we remove it from vendor files. This is needed to support versions
-    // of Ember older than 1.8.0 (when ember-testing.js was incldued in ember.js itself)
-    if (!ember && this.vendorFiles['ember-testing.js'] && !fs.existsSync(this.vendorFiles['ember-testing.js'][0])) {
-      delete this.vendorFiles['ember-testing.js'];
-    }
-  }
-
-  _addJqueryInLegacyEmber() {
-    if (this.project.findAddonByName('@ember/jquery')) {
-      return;
-    }
-    let ember = this.project.findAddonByName('ember-source');
-    let jqueryPath;
-    if (ember) {
-      let optionFeatures = this.project.findAddonByName('@ember/optional-features');
-      if (optionFeatures && !optionFeatures.isFeatureEnabled('jquery-integration')) {
-        return;
-      }
-      this.project.ui.writeDeprecateLine(
-        'The integration of jQuery into Ember has been deprecated and will be removed with Ember 4.0. You can either' +
-          ' opt-out of using jQuery, or install the `@ember/jquery` addon to provide the jQuery integration. Please' +
-          ' consult the deprecation guide for further details: https://emberjs.com/deprecations/v3.x#toc_jquery-apis'
-      );
-      jqueryPath = ember.paths.jquery;
-    } else {
-      jqueryPath = `${this.bowerDirectory}/jquery/dist/jquery.js`;
-    }
-    this.vendorFiles = merge({ 'jquery.js': jqueryPath }, this.vendorFiles);
   }
 
   /**
@@ -639,34 +415,6 @@ class EmberApp {
     return !!include && include.indexOf(addon.name) === -1;
   }
 
-  /**
-    @private
-    @method _checkEmberCliBabel
-    @param {Addons} addons
-    @return {Boolean}
-  */
-  _checkEmberCliBabel(addons, result, roots) {
-    addons = addons || [];
-    result = result || false;
-    roots = roots || {};
-
-    let babelInstance = addons.find((addon) => addon.name === 'ember-cli-babel');
-    if (babelInstance) {
-      let version = babelInstance.pkg.version;
-      if (semver.lt(version, '6.6.0')) {
-        result = true;
-      }
-      if (semver.lt(version, '6.0.0') && !roots[babelInstance.root]) {
-        roots[babelInstance.root] = true;
-        this.project.ui.writeDeprecateLine(
-          `ember-cli-babel 5.x has been deprecated. Please upgrade to at least ember-cli-babel 6.6. Version ${version} located: ${babelInstance.root}`
-        );
-      }
-    }
-
-    return addons.some((addon) => this._checkEmberCliBabel(addon.addons, result, roots)) || result;
-  }
-
   /**
     Returns whether an addon should be added to the project
 
@@ -693,21 +441,17 @@ class EmberApp {
     let addonNames = this.project.addons.map((addon) => addon.name);
 
     if (this.options.addons.exclude) {
-      let optionKey = this.options.addons.hasBlacklist ? 'blacklist' : 'exclude';
-
       this.options.addons.exclude.forEach((addonName) => {
         if (addonNames.indexOf(addonName) === -1) {
-          throw new Error(`Addon "${addonName}" defined in "${optionKey}" is not found`);
+          throw new Error(`Addon "${addonName}" defined in "exclude" is not found`);
         }
       });
     }
 
     if (this.options.addons.include) {
-      let optionKey = this.options.addons.hasWhitelist ? 'whitelist' : 'include';
-
       this.options.addons.include.forEach((addonName) => {
         if (addonNames.indexOf(addonName) === -1) {
-          throw new Error(`Addon "${addonName}" defined in "${optionKey}" is not found`);
+          throw new Error(`Addon "${addonName}" defined in "include" is not found`);
         }
       });
     }
@@ -811,93 +555,6 @@ class EmberApp {
     return this._addonTreesFor(type).map((addonBundle) => addonBundle.tree);
   }
 
-  _getDefaultPluginForType(type) {
-    let plugins = this.registry.load(type);
-    let defaultsForType = plugins.filter((plugin) => plugin.isDefaultForType);
-
-    if (defaultsForType.length > 1) {
-      throw new Error(
-        `There are multiple preprocessor plugins marked as default for '${type}': ${defaultsForType
-          .map((p) => p.name)
-          .join(', ')}`
-      );
-    }
-
-    return defaultsForType[0];
-  }
-
-  _compileAddonTemplates(tree) {
-    let defaultPluginForType = this._getDefaultPluginForType('template');
-    let options = {
-      annotation: `_compileAddonTemplates`,
-      registry: this.registry,
-    };
-
-    if (defaultPluginForType) {
-      tree = defaultPluginForType.toTree(tree, options);
-    } else {
-      tree = preprocessTemplates(tree, options);
-    }
-
-    return tree;
-  }
-
-  _compileAddonJs(tree) {
-    let defaultPluginForType = this._getDefaultPluginForType('js');
-    let options = {
-      annotation: '_compileAddonJs',
-      registry: this.registry,
-    };
-
-    if (defaultPluginForType) {
-      tree = defaultPluginForType.toTree(tree, options);
-    } else {
-      tree = preprocessJs(tree, '/', '/', options);
-    }
-
-    return tree;
-  }
-
-  _compileAddonTree(tree, skipTemplates) {
-    if (!skipTemplates) {
-      tree = this._compileAddonTemplates(tree);
-    }
-    tree = this._compileAddonJs(tree);
-
-    return tree;
-  }
-
-  _precompileAppJsTree(tree) {
-    let emberCLIBabelConfigKey = this._emberCLIBabelConfigKey();
-
-    let original = this.options[emberCLIBabelConfigKey];
-
-    // the app will handle transpilation after it tree-shakes
-    // do it here instead of the constructor because
-    // ember-data and others do their own compilation in their
-    // treeForAddon without calling super
-    // they need the original params preserved because they call
-    // babel themselves and expect compilation the old way
-    this.options[emberCLIBabelConfigKey] = Object.assign({}, original, {
-      compileModules: false,
-      disablePresetEnv: true,
-      disableDebugTooling: true,
-      disableEmberModulesAPIPolyfill: true,
-    });
-
-    tree = preprocessJs(tree, '/', '/', {
-      annotation: `_precompileAppJsTree`,
-      registry: this.registry,
-      treeType: 'app',
-    });
-
-    // return the original params because there are multiple
-    // entrances to preprocessJs
-    this.options[emberCLIBabelConfigKey] = original;
-
-    return tree;
-  }
-
   /**
     Runs addon post-processing on a given tree and returns the processed tree.
 
@@ -1076,7 +733,7 @@ class EmberApp {
    * @method getAppJavascript
    * @return {BroccoliTree}
    */
-  getAppJavascript(isPackageHookSupplied) {
+  getAppJavascript() {
     let appTrees = [].concat(this.addonTreesFor('app'), this.trees.app).filter(Boolean);
 
     let mergedApp = mergeTrees(appTrees, {
@@ -1090,10 +747,6 @@ class EmberApp {
       annotation: 'ProcessedAppTree',
     });
 
-    if (isExperimentEnabled('PACKAGER') && isPackageHookSupplied) {
-      appTree = this._precompileAppJsTree(appTree);
-    }
-
     return appTree;
   }
 
@@ -1248,7 +901,6 @@ class EmberApp {
    *
    * + app `vendor` files
    * + add-ons' `vendor` files
-   * + bower packages
    * + node modules
    *
    * Resulting tree:
@@ -1256,7 +908,6 @@ class EmberApp {
    * ```
    * /
    * ├── addon-tree-output/
-   * ├── bower_components/
    * └── vendor/
    * ```
    *
@@ -1278,13 +929,7 @@ class EmberApp {
       );
 
       let addons = this.addonTree();
-
       let trees = [vendor].concat(addons);
-      if (this._bowerEnabled) {
-        let bower = this._defaultPackager.packageBower(this.trees.bower, this.bowerDirectory);
-
-        trees.push(bower);
-      }
 
       trees = this._nodeModuleTrees().concat(trees);
 
@@ -1426,16 +1071,6 @@ class EmberApp {
     });
   }
 
-  /**
-   * @private
-   * @method _addonInstalled
-   * @param  {String} addonName The name of the addon we are checking to see if it's installed
-   * @return {Boolean}
-   */
-  _addonInstalled(addonName) {
-    return !!this.registry.availablePlugins[addonName];
-  }
-
   /**
     @public
     @method dependencies
@@ -1479,7 +1114,7 @@ class EmberApp {
     }
 
     let directory = path.dirname(assetPath);
-    let subdirectory = directory.replace(new RegExp(`^vendor/|${this.bowerDirectory}|node_modules/`), '');
+    let subdirectory = directory.replace(new RegExp(`^vendor/|node_modules/`), '');
     let extension = path.extname(assetPath);
 
     if (!extension) {
@@ -1504,7 +1139,7 @@ class EmberApp {
     // TODO: refactor, this has gotten very messy. Relevant tests: tests/unit/broccoli/ember-app-test.js
     let basename = path.basename(assetPath);
 
-    if (isType(assetPath, 'js', { registry: this.registry })) {
+    if (p.isType(assetPath, 'js', { registry: this.registry })) {
       if (options.using) {
         if (!Array.isArray(options.using)) {
           throw new Error('You must pass an array of transformations for `using` option');
@@ -1631,77 +1266,10 @@ class EmberApp {
       this.getTests(),
       this.getExternalTree(),
       this.getPublic(),
-      this.getAppJavascript(this._isPackageHookSupplied),
+      this.getAppJavascript(),
     ].filter(Boolean);
   }
 
-  _legacyAddonCompile(type, outputDir, _options) {
-    let options = Object.assign(
-      {
-        // moduleNormalizerDisabled: this.options.moduleNormalizerDisabled,
-        amdFunnelDisabled: this.options.amdFunnelDisabled,
-        skipTemplates: false,
-      },
-      _options
-    );
-
-    let addonBundles = this._cachedAddonBundles[type];
-
-    let addonTrees = addonBundles.map((addonBundle) => {
-      let { name, tree, root } = addonBundle;
-
-      let precompiledSource = tree;
-
-      if (!options.amdFunnelDisabled) {
-        // don't want to double compile the AMD modules
-        let hasAlreadyPrintedAmdDeprecation;
-        precompiledSource = new AmdFunnel(precompiledSource, {
-          callback: () => {
-            if (!hasAlreadyPrintedAmdDeprecation) {
-              this.project.ui.writeDeprecateLine(
-                `Addon "${name}" (found at "${root}") is manually generating AMD modules. Code should be ES6 modules only. Support for this will be removed in a future version.`
-              );
-              hasAlreadyPrintedAmdDeprecation = true;
-            }
-          },
-          annotation: `AmdFunnel (${type} ${name})`,
-        });
-      }
-
-      return [tree, precompiledSource];
-    });
-
-    let precompiledSource = addonTrees.map((pair) => pair[1]);
-    addonTrees = addonTrees.map((pair) => pair[0]);
-
-    precompiledSource = mergeTrees(precompiledSource, {
-      overwrite: true,
-      annotation: `TreeMerger (${type})`,
-    });
-
-    precompiledSource = this._debugTree(precompiledSource, `precompiledAddonTree:${type}`);
-
-    let compiledSource = this._compileAddonTree(precompiledSource, options.skipTemplates);
-
-    compiledSource = this._debugTree(compiledSource, `postcompiledAddonTree:${type}`);
-
-    let combinedAddonTree;
-
-    if (options.amdFunnelDisabled) {
-      combinedAddonTree = compiledSource;
-    } else {
-      combinedAddonTree = mergeTrees(addonTrees.concat(compiledSource), {
-        overwrite: true,
-        annotation: `AmdFunnel TreeMerger (${type})`,
-      });
-    }
-
-    return new Funnel(combinedAddonTree, {
-      destDir: outputDir,
-      annotation: `Funnel: ${outputDir} ${type}`,
-    });
-  }
-
   _legacyPackage(fullTree) {
     let javascriptTree = this._defaultPackager.packageJavascript(fullTree);
     let stylesTree = this._defaultPackager.packageStyles(fullTree);
@@ -1731,7 +1299,6 @@ class EmberApp {
    */
   toTree(additionalTrees) {
     let packagedTree;
-    let packageFn = this.options.package;
 
     let fullTree = mergeTrees(this.toArray(), {
       overwrite: true,
@@ -1740,14 +1307,6 @@ class EmberApp {
 
     fullTree = this._debugTree(fullTree, 'prepackage');
 
-    if (isExperimentEnabled('PACKAGER')) {
-      if (this._isPackageHookSupplied) {
-        packagedTree = packageFn.call(this, fullTree);
-      } else {
-        this.project.ui.writeWarnLine('`package` hook must be a function, falling back to default packaging.');
-      }
-    }
-
     if (!packagedTree) {
       packagedTree = this._legacyPackage(fullTree);
     }