ember-cli 3.4.4 → 3.5.1

package/.travis.yml

@@ -1,10 +1,13 @@
-language: node_js
-node_js:
-  - "10"
+sudo: false
+dist: trusty
 
 addons:
   chrome: stable
 
+language: node_js
+node_js:
+  - "10"
+
 branches:
   only:
     - auto
@@ -56,6 +59,8 @@ jobs:
     - env: EMBER_CLI_PACKAGER=true
     - env: EMBER_CLI_MODULE_UNIFICATION=true
     - env: EMBER_CLI_DELAYED_TRANSPILATION=true
+    - env: EMBER_CLI_BROCCOLI_2=false
+    - env: EMBER_CLI_SYSTEM_TEMP=false
 
     - stage: deploy
       script: ./.travis/deploy.sh
@@ -63,10 +68,6 @@ jobs:
 before_install:
   # prevent the npm loading indicator
   - npm config --global set spin false
-  # if npm version is less than 3.0.0, upgrade to 3
-  - if [[ $(npm -v | cut -d '.' -f 1) -lt 3 ]]; then npm i -g npm@^3; fi
-  # if npm version is newer than 4, downgrade to 4
-  - if [[ $(npm -v | cut -d '.' -f 1) -gt 4 ]]; then npm i -g npm@^4; fi
 
   # travis currently includes yarn v0.17.8 (20170705)
   # this isn't new enough for our use of --non-interactive

package/CHANGELOG.md

@@ -1,20 +1,112 @@
 # ember-cli Changelog
 
-## v3.4.4
+## v3.5.1
 
 #### Blueprint Changes
 
-- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.4.3...v3.4.4)
-- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.4.3...v3.4.4)
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.5.0...v3.5.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.5.0...v3.5.1)
 
 #### Community Contributions
 
-- [#8277](https://github.com/ember-cli/ember-cli/pull/8277) DefaultPackager: Move `addon-test-support` out of the `tests` folder [@Turbo87](https://github.com/Turbo87)
-- [#8278](https://github.com/ember-cli/ember-cli/pull/8278) DefaultPackager: Fix addon preprocessing [@Turbo87](https://github.com/Turbo87)
+- [#8127](https://github.com/ember-cli/ember-cli/pull/8127) Fix eslint errors in new app [@Gaurav0](https://github.com/Gaurav0)
+- [#8130](https://github.com/ember-cli/ember-cli/pull/8130) Use regex to parse /livereload urls [@rwjblue](https://github.com/rwjblue)
+- [#8141](https://github.com/ember-cli/ember-cli/pull/8141) Use `debug` for `package-info-cache` messages [@stefanpenner](https://github.com/stefanpenner)
+- [#8150](https://github.com/ember-cli/ember-cli/pull/8150) Fix `toTree()` with custom paths [@wagenet](https://github.com/wagenet)
 
 Thank you to all who took the time to contribute!
 
 
+## v3.5.0
+
+The following changes are required if you are upgrading from the previous
+version:
+
+- Users
+  + [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.4.3...v3.5.0)
+  + Upgrade your project's ember-cli version - [docs](https://ember-cli.com/user-guide/#upgrading)
+- Addon Developers
+  + [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.4.3...v3.5.0)
+  + No changes required
+- Core Contributors
+  + No changes required
+
+#### Community Contributions
+
+- [#8079](https://github.com/ember-cli/ember-cli/pull/8079) add .template-lintrc.js to npmignore [@kellyselden](https://github.com/kellyselden)
+- [#8083](https://github.com/ember-cli/ember-cli/pull/8083) Catch InvalidNodeError for Broccoli 2.0 and fallback to broccoli-builder [@oligriffiths](https://github.com/oligriffiths)
+- [#8117](https://github.com/ember-cli/ember-cli/pull/8117) Do not ignore dotfiles in ESLint [@Gaurav0](https://github.com/Gaurav0)
+- [#7365](https://github.com/ember-cli/ember-cli/pull/7365) Migrate from ember-cli-qunit to ember-qunit. [@rwjblue](https://github.com/rwjblue)
+- [#8062](https://github.com/ember-cli/ember-cli/pull/8062) Add `yarn.lock` to `.npmignore` [@Turbo87](https://github.com/Turbo87)
+- [#8064](https://github.com/ember-cli/ember-cli/pull/8064) Update `qunit-dom` to v0.8.0 [@Turbo87](https://github.com/Turbo87)
+- [#8067](https://github.com/ember-cli/ember-cli/pull/8067) Less restrictive blueprints - change how addons are identified [@scalvert](https://github.com/scalvert)
+- [#8068](https://github.com/ember-cli/ember-cli/pull/8068) Enable BROCCOLI_2 and SYSTEM_TEMP experiments by default. [@rwjblue](https://github.com/rwjblue)
+- [#8069](https://github.com/ember-cli/ember-cli/pull/8069) Adding back feature to customization of serveURL [@SparshithNR](https://github.com/SparshithNR)
+- [#7798](https://github.com/ember-cli/ember-cli/pull/7798) Add Broccoli 2.0 support [@oligriffiths](https://github.com/oligriffiths)
+- [#7916](https://github.com/ember-cli/ember-cli/pull/7916) Support node-http-proxy timeout options [@jboler](https://github.com/jboler)
+- [#7937](https://github.com/ember-cli/ember-cli/pull/7937) Update fallback default browser targets from IE9 -> IE11. [@arthirm](https://github.com/arthirm)
+- [#7984](https://github.com/ember-cli/ember-cli/pull/7984) Reject when command args validation fails [@zonkyio](https://github.com/zonkyio)
+- [#7946](https://github.com/ember-cli/ember-cli/pull/7946) upgrade ember-cli-htmlbars to 3.x [@stefanpenner](https://github.com/stefanpenner)
+- [#8000](https://github.com/ember-cli/ember-cli/pull/8000) Adding `--in` option to `ember generate` and `ember destroy` to allow blueprint generation for in repo addons in custom paths. [@scalvert](https://github.com/scalvert)
+- [#8028](https://github.com/ember-cli/ember-cli/pull/8028) Add `public` to the list of disallowed application names [@twokul](https://github.com/twokul)
+
+Thank you to all who took the time to contribute!
+
+
+## v3.5.0-beta.2
+
+The following changes are required if you are upgrading from the previous
+version:
+
+- Users
+  + [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.4.0...v3.5.0-beta.2)
+  + Upgrade your project's ember-cli version - [docs](https://ember-cli.com/user-guide/#upgrading)
+- Addon Developers
+  + [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.4.0...v3.5.0-beta.2)
+  + No changes required
+- Core Contributors
+  + No changes required
+
+#### Community Contributions
+
+- [#7365](https://github.com/ember-cli/ember-cli/pull/7365) Migrate from ember-cli-qunit to ember-qunit. [@rwjblue](https://github.com/rwjblue)
+- [#8062](https://github.com/ember-cli/ember-cli/pull/8062) Add `yarn.lock` to `.npmignore` [@Turbo87](https://github.com/Turbo87)
+- [#8064](https://github.com/ember-cli/ember-cli/pull/8064) Update `qunit-dom` to v0.8.0 [@Turbo87](https://github.com/Turbo87)
+- [#8067](https://github.com/ember-cli/ember-cli/pull/8067) Less restrictive blueprints - change how addons are identified [@scalvert](https://github.com/scalvert)
+- [#8068](https://github.com/ember-cli/ember-cli/pull/8068) Enable BROCCOLI_2 and SYSTEM_TEMP experiments by default. [@rwjblue](https://github.com/rwjblue)
+- [#8069](https://github.com/ember-cli/ember-cli/pull/8069) Adding back feature to customization of serveURL [@SparshithNR](https://github.com/SparshithNR)
+- [#8071](https://github.com/ember-cli/ember-cli/pull/8071) Update sane to the latest version 🚀 [@ember-cli/greenkeeper](https://github.com/ember-cli/greenkeeper)
+
+Thank you to all who took the time to contribute!
+
+## v3.5.0-beta.1
+
+The following changes are required if you are upgrading from the previous
+version:
+
+- Users
+  + [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.4.0...v3.5.0-beta.1)
+  + Upgrade your project's ember-cli version - [docs](https://ember-cli.com/user-guide/#upgrading)
+- Addon Developers
+  + [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.4.0...v3.5.0-beta.1)
+  + No changes required
+- Core Contributors
+  + No changes required
+
+#### Community Contributions
+
+- [#7798](https://github.com/ember-cli/ember-cli/pull/7798) Add Broccoli 2.0 support [@oligriffiths](https://github.com/oligriffiths)
+- [#7916](https://github.com/ember-cli/ember-cli/pull/7916) Support node-http-proxy timeout options [@jboler](https://github.com/jboler)
+- [#7937](https://github.com/ember-cli/ember-cli/pull/7937) Update fallback default browser targets from IE9 -> IE11. [@arthirm](https://github.com/arthirm)
+- [#7984](https://github.com/ember-cli/ember-cli/pull/7984) Reject when command args validation fails [@zonkyio](https://github.com/zonkyio)
+- [#7946](https://github.com/ember-cli/ember-cli/pull/7946) upgrade ember-cli-htmlbars to 3.x [@stefanpenner](https://github.com/stefanpenner)
+- [#7976](https://github.com/ember-cli/ember-cli/pull/7976) Upgrade ember-source to master in `new` blueprint [@dcyriller](https://github.com/dcyriller)
+- [#8025](https://github.com/ember-cli/ember-cli/pull/8025) Update MU blueprint to latest canary [@CodingItWrong](https://github.com/CodingItWrong)
+- [#8000](https://github.com/ember-cli/ember-cli/pull/8000) Adding `--in` option to `ember generate` and `ember destroy` to allow blueprint generation for in repo addons in custom paths. [@scalvert](https://github.com/scalvert)
+- [#8028](https://github.com/ember-cli/ember-cli/pull/8028) Add `public` to the list of disallowed application names [@twokul](https://github.com/twokul)
+
+Thank you to all who took the time to contribute!
+
 ## v3.4.3
 
 The following changes are required if you are upgrading from the previous
@@ -58,7 +150,7 @@ version:
 
 - [#8024](https://github.com/ember-cli/ember-cli/pull/8024) [BUGFIX] Remove 2.12 scenario from travis.yml [@cibernox](https://github.com/cibernox)
 - [#8033](https://github.com/ember-cli/ember-cli/pull/8033) Restore `styles` behaviour [@twokul](https://github.com/twokul)
-- [#8038](https://github.com/ember-cli/ember-cli/pull/8038) Ensure livereload proxy is scoped to only live reload prefix. [@ember-cli](https://github.com/ember-cli)
+- [#8038](https://github.com/ember-cli/ember-cli/pull/8038) Ensure livereload proxy is scoped to only live reload prefix. [@rwjblue](https://github.com/rwjblue)
 
 Thank you to all who took the time to contribute!
 

package/CONTRIBUTING.md

@@ -93,7 +93,7 @@ We love pull requests. Here's a quick guide:
    * google chrome
 
 3. Run the tests. We only take pull requests with passing tests, and it's great
-   to know that you have a clean slate: `npm install && npm run test-all`.
+   to know that you have a clean slate: `npm install && npm run test:all`.
 
 4. Add a test for your change. Only refactoring and documentation changes
    require no new tests. If you are adding functionality or fixing a bug, we

package/PERF_GUIDE.md

@@ -188,7 +188,7 @@ flags are:
 + `DEBUG=broccoli-caching-writer:* ember s`
 + `DEBUG=broccoli-funnel:* ember s`
 + `DEBUG=broccoli-funnel:Funnel*Addon* ember s`
-+ `DEBUG=broccoli-merge-trees:ember s`
++ `DEBUG=broccoli-merge-trees ember s`
 + `DEBUG=broccoli-merge-trees:TreeMerger* ember s`
 + `DEBUG=broccoli-merge-trees:Addon* ember s`
 + `DEBUG=broccoli-merge-trees:styles ember s`

package/README.md

@@ -17,7 +17,7 @@ ember-cli
 [appveyor-badge-url]: https://ci.appveyor.com/project/embercli/ember-cli/branch/master
 [coveralls-badge]: https://img.shields.io/coveralls/ember-cli/ember-cli/master.svg
 [coveralls-badge-url]: https://coveralls.io/github/ember-cli/ember-cli
-[codeclimate-badge]: https://img.shields.io/codeclimate/github/ember-cli/ember-cli.svg
+[codeclimate-badge]: https://codeclimate.com/github/ember-cli/ember-cli/badges/gpa.svg
 [codeclimate-badge-url]: https://codeclimate.com/github/ember-cli/ember-cli
 
 The Ember.js command line utility.

package/RELEASE.md

@@ -11,9 +11,9 @@ the release gotchas and will hopefully result in a successful release.
 ### Communication
 
 - Ensure that homu isn't presently processing any PRs.
-- Post a note in [#dev-ember-cli](https://embercommunity.slack.com/archives/dev-ember-cli) letting us know you're doing a release.
+- Post a note in [#dev-ember-cli](https://discordapp.com/channels/480462759797063690/480501885837770763) letting us know you're doing a release.
 
-> I'm starting an Ember CLI release. Please hold off merging PRs, "homu r+"-ing, and pushing new code!
+> I'm starting an Ember CLI release. Please hold off merging PRs and pushing new code!
 
 ### Environment
 
@@ -24,7 +24,6 @@ node --version
 npm --version
 ```
 
-
 ## Branching
 
 If you're planning to release a stable/bugfix version _and_ a beta, make sure to release the beta _after_ the stable version.
@@ -57,7 +56,6 @@ git checkout -B beta --track origin/beta
 git merge vX.Y.0
 ```
 
-
 ### Stable bugfix release
 
 Follow these steps if you're releasing a bugfix for a stable version (e.g. from `v2.5.0` to `v2.5.1`)
@@ -117,13 +115,17 @@ git checkout -B master --track origin/master
 git merge vX.Y.0-beta.N
 ```
 
-
 ## Release
 
 ### Setup
 
 * Update Ember and Ember Data versions.
   * `blueprints/app/files/package.json`
+  * if you're releasing a new minor or major version:
+    * `tests/fixtures/addon/npm/package.json`
+    * `tests/fixtures/addon/yarn/package.json`
+    * `tests/fixtures/app/npm/package.json`
+    * `tests/fixtures/app/yarn/package.json`
 * generate changelog
   * if on master branch
     * run `./dev/changelog`
@@ -234,16 +236,16 @@ Announce release!
 https://github.com/ember-cli/ember-cli/releases/tag/vX.Y.Z
 \#emberjs
 
-### Slack
+### Discord
 
 Grab a link to your tweet and post in:
-* [#-announcements](https://embercommunity.slack.com/archives/-announcements)
-* [#dev-ember-cli](https://embercommunity.slack.com/archives/dev-ember-cli)
-* [#-ember-cli](https://embercommunity.slack.com/archives/-ember-cli)
+* [#news-and-announcements](https://discordapp.com/channels/480462759797063690/480499624663056390)
+* [#dev-ember-cli](https://discordapp.com/channels/480462759797063690/480501885837770763)
+* [#ember-cli](https://discordapp.com/channels/480462759797063690/486548111221719040)
 
 
 ## Troubleshooting
 
 * if a few mins after release you notice an issue, you can unpublish
-  * `npm unpublish ember-cli@<version>`
+  * `npm unpublish ember-cli@<version>` (`npm unpublish` is write-only, that is you can unpublish but cannot push `ember-cli` with the same version, you have to bump `version` in `package.json`)
 * if it is completely broken, feel free to unpublish a few hours later or the next morning, even if you don't have time to immediately rerelease

package/blueprints/addon/files/addon-config/ember-try.js

@@ -14,7 +14,7 @@ module.exports = function() {
         {
           name: 'ember-lts-2.16',
           env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
           },
           npm: {
             devDependencies: {
@@ -26,7 +26,7 @@ module.exports = function() {
         {
           name: 'ember-lts-2.18',
           env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
           },
           npm: {
             devDependencies: {

package/blueprints/addon/files/npmignore

@@ -12,8 +12,9 @@
 /.eslintignore
 /.eslintrc.js
 /.gitignore
-/.watchmanconfig
+/.template-lintrc.js
 /.travis.yml
+/.watchmanconfig
 /bower.json
 /config/ember-try.js
 /ember-cli-build.js

package/blueprints/addon-import/index.js

@@ -32,6 +32,9 @@ module.exports = {
         if (options.inRepoAddon) {
           return path.join('lib', options.inRepoAddon, 'app');
         }
+        if (options.in) {
+          return path.join(options.in, 'app');
+        }
         return 'app';
       },
     };

package/blueprints/app/files/.eslintignore

@@ -8,9 +8,11 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/

package/blueprints/app/files/.eslintrc.js

@@ -20,6 +20,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',<% if (blueprint !== 'app') { %>
         'index.js',<% } %>

package/blueprints/app/files/package.json

@@ -30,20 +30,20 @@
     "ember-cli-htmlbars": "^3.0.0",
     "ember-cli-htmlbars-inline-precompile": "^1.0.3",
     "ember-cli-inject-live-reload": "^1.8.2",
-    "ember-cli-qunit": "^4.3.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^1.0.0-beta.1",
     "ember-cli-uglify": "^2.1.0",
-    "ember-data": "~3.4.0",
+    "ember-data": "~3.5.0",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^3.4.1",
     "ember-resolver": "^5.0.1",
-    "ember-source": "~3.4.0<% if (welcome) { %>",
+    "ember-source": "~3.5.1<% if (welcome) { %>",
     "ember-welcome-page": "^3.2.0<% } %>",
     "eslint-plugin-ember": "^5.2.0",
     "loader.js": "^4.7.0",
-    "qunit-dom": "^0.7.1"
+    "qunit-dom": "^0.8.0"
   },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"

package/blueprints/module-unification-app/files/.eslintignore

@@ -8,9 +8,11 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/
+!.*
 
 # ember-try
 /.node_modules.ember-try/

package/blueprints/module-unification-app/files/.eslintrc.js

@@ -20,6 +20,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',

package/blueprints/module-unification-app/files/config/environment.js

@@ -50,7 +50,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-
+    // here you can enable a production-specific feature
   }
 
   return ENV;

package/blueprints/module-unification-app/files/config/targets.js

@@ -1,6 +1,6 @@
 module.exports = {
   browsers: [
-    'ie 9',
+    'ie 11',
     'last 1 Chrome versions',
     'last 1 Firefox versions',
     'last 1 Safari versions'

package/blueprints/module-unification-app/files/package.json

@@ -3,13 +3,13 @@
   "version": "0.0.0",
   "private": true,
   "description": "Small description for <%= name %> goes here",
+  "repository": "",
   "license": "MIT",
   "author": "",
   "directories": {
     "doc": "doc",
     "test": "tests"
   },
-  "repository": "",
   "scripts": {
     "build": "ember build",
     "lint:hbs": "ember-template-lint .",
@@ -18,33 +18,34 @@
     "test": "ember test"
   },
   "devDependencies": {
-    "@ember/jquery": "^0.5.1",
-    "@ember/optional-features": "^0.6.1",
+    "@ember/jquery": "^0.5.2",
+    "@ember/optional-features": "^0.6.3",
     "broccoli-asset-rev": "^2.7.0",
-    "ember-ajax": "^3.0.0",
+    "ember-ajax": "^3.1.0",
     "ember-cli": "github:ember-cli/ember-cli",
-    "ember-cli-app-version": "^3.0.0",
-    "ember-cli-babel": "^6.6.0",
+    "ember-cli-app-version": "^3.2.0",
+    "ember-cli-babel": "^6.16.0",
     "ember-cli-dependency-checker": "^3.0.0",
-    "ember-cli-eslint": "^4.2.1",
+    "ember-cli-eslint": "^4.2.3",
     "ember-cli-htmlbars": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
     "ember-cli-inject-live-reload": "^1.8.2",
-    "ember-cli-qunit": "^4.3.2",
-    "ember-cli-sri": "^2.1.0",
+    "ember-cli-sri": "^2.1.1",
     "ember-cli-template-lint": "^1.0.0-beta.1",
-    "ember-cli-uglify": "^2.0.0",
-    "ember-data": "~3.1.1",
+    "ember-cli-uglify": "^2.1.0",
+    "ember-data": "~3.5.0",
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.1.0",
     "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-qunit": "^3.4.1",
     "ember-resolver": "^5.0.1",
-    "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/5431f71df060e7b5c82c05c300f40e9151d135e8.tgz<% if (welcome) { %>",
-    "ember-welcome-page": "^3.0.0<% } %>",
-    "eslint-plugin-ember": "^5.0.0",
-    "loader.js": "^4.2.3"
+    "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/caa2c70d40dbfeffb0e6c9ac15ff6d72c8e24bae.tgz<% if (welcome) { %>",
+    "ember-welcome-page": "^3.2.0<% } %>",
+    "eslint-plugin-ember": "^5.2.0",
+    "loader.js": "^4.7.0",
+    "qunit-dom": "^0.8.0"
   },
   "engines": {
-    "node": "6.* || >= 8.*"
+    "node": "6.* || 8.* || >= 10.*"
   }
 }

package/lib/broccoli/default-packager.js

@@ -833,28 +833,26 @@ module.exports = class DefaultPackager {
   */
   processTests(tree) {
     if (this._cachedTests === null) {
-      let addonTestSupportTree = new Funnel(tree, {
-        srcDir: 'tests/addon-test-support',
-        destDir: 'addon-test-support',
-      });
-
       let testTree = new Funnel(tree, {
         srcDir: 'tests',
         exclude: ['addon-test-support/**/*'],
       });
 
+      testTree = callAddonsPreprocessTreeHook(this.project, 'test', testTree);
+
       let treeToCompile = new Funnel(testTree, {
         destDir: `${this.name}/tests`,
         annotation: 'Tests To Process',
       });
 
-      treeToCompile = callAddonsPreprocessTreeHook(this.project, 'test', treeToCompile);
-
       let preprocessedTests = preprocessJs(treeToCompile, '/tests', this.name, {
         registry: this.registry,
       });
 
-      let mergedTestTrees = mergeTrees([addonTestSupportTree, preprocessedTests], {
+      let mergedTestTrees = mergeTrees([new Funnel(tree, {
+        srcDir: 'tests/addon-test-support',
+        destDir: `${this.name}/tests`,
+      }), preprocessedTests], {
         overwrite: true,
         annotation: 'Packaged Tests',
       });
@@ -1114,7 +1112,7 @@ module.exports = class DefaultPackager {
       this.legacyTestFilesToAppend
     );
 
-    let inputFiles = ['addon-test-support/**/*.js'];
+    let inputFiles = ['tests/addon-test-support/**/*.js'];
 
     let footerFiles = ['vendor/ember-cli/test-support-suffix.js'];