ember-cli 3.28.1 → 4.0.0-beta.2

package/.github/workflows/ci.yml

@@ -24,6 +24,7 @@ jobs:
       - uses: actions/setup-node@v2.1.5
         with:
           node-version: 12.x
+          cache: 'yarn'
 
       - run: yarn install --frozen-lockfile --non-interactive
       - run: yarn lint
@@ -41,6 +42,7 @@ jobs:
       - uses: actions/setup-node@v2.1.5
         with:
           node-version: 12.x
+          cache: 'yarn'
 
       - run: yarn install --frozen-lockfile --non-interactive
       - run: yarn test
@@ -62,6 +64,7 @@ jobs:
       - uses: actions/setup-node@v2.1.5
         with:
           node-version: ${{ matrix.node-version }}
+          cache: 'yarn'
 
       - run: yarn install --frozen-lockfile --non-interactive
       - run: yarn test:all
@@ -86,6 +89,7 @@ jobs:
       - uses: actions/setup-node@v2.1.5
         with:
           node-version: 12.x
+          cache: 'yarn'
 
       - run: yarn install --frozen-lockfile --non-interactive
       - run: yarn test:all

package/CHANGELOG.md

@@ -1,5 +1,49 @@
 # ember-cli Changelog
 
+
+## v4.0.0-beta.2
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v4.0.0-beta.1...v4.0.0-beta.2)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v4.0.0-beta.1...v4.0.0-beta.2)
+
+#### Changelog
+
+- [#9659](https://github.com/ember-cli/ember-cli/pull/9659) Ensure `ember-classic` ember-try scenario uses Ember 3.x [@rwjblue](https://github.com/rwjblue)
+- [#9661](https://github.com/ember-cli/ember-cli/pull/9661) Set default CI config blueprints to run all builds [@elwayman02](https://github.com/elwayman02)
+- [#9666](https://github.com/ember-cli/ember-cli/pull/9666) Remove IE11 comments from `config/target.js` in app blueprint [@bertdeblock](https://github.com/bertdeblock)
+- [#9667](https://github.com/ember-cli/ember-cli/pull/9667) Update eslint-plugin-qunit to v7 in blueprint [@bmish](https://github.com/bmish)
+- [#9670](https://github.com/ember-cli/ember-cli/pull/9670) Don't emit an error when the `lint:fix` script fails post blueprint generation [@bertdeblock](https://github.com/bertdeblock)
+
+Thank you to all who took the time to contribute!
+
+## v3.28.3
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.28.2...v3.28.3)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.28.2...v3.28.3)
+
+#### Changelog
+
+- [#9670](https://github.com/ember-cli/ember-cli/pull/9670) Don't emit an error when the `lint:fix` script fails post blueprint generation [@bertdeblock](https://github.com/bertdeblock)
+
+Thank you to all who took the time to contribute!
+
+## v3.28.2
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.28.1...v3.28.2)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.28.1...v3.28.2)
+
+#### Changelog
+
+- [#9659](https://github.com/ember-cli/ember-cli/pull/9659) Ensure `ember-classic` ember-try scenario uses Ember 3.x [@rwjblue](https://github.com/rwjblue)
+
+Thank you to all who took the time to contribute!
+
 ## v3.28.1
 
 #### Blueprint Changes
@@ -11,6 +55,32 @@
 
 - [#9618](https://github.com/ember-cli/ember-cli/pull/9618) Ensure discovered addons are refreshed after `ember install` (fix usage of default blueprints) [@brendenpalmer](https://github.com/brendenpalmer)
 
+## v4.0.0-beta.1
+
+#### Blueprint Changes
+
+- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.28.0...v4.0.0-beta.1)
+- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.28.0...v4.0.0-beta.1)
+
+#### Changelog
+
+- [#9574](https://github.com/ember-cli/ember-cli/pull/9574) Update link to Discord in README.md [@MelSumner](https://github.com/MelSumner)
+- [#9613](https://github.com/ember-cli/ember-cli/pull/9613) Fix test that started failing with v2.17.0 of qunit [@kategengler](https://github.com/kategengler)
+- [#9579](https://github.com/ember-cli/ember-cli/pull/9579) Add `--ci-provider` option to `ember new` and `ember addon` [@snewcomer](https://github.com/snewcomer)
+- [#9618](https://github.com/ember-cli/ember-cli/pull/9618) Reload `_packageInfo` as part of `reloadPkg` [@brendenpalmer](https://github.com/brendenpalmer)
+- [#9563](https://github.com/ember-cli/ember-cli/pull/9563) Add `pnpm` support to `ember install` command [@Turbo87](https://github.com/Turbo87)
+- [#9580](https://github.com/ember-cli/ember-cli/pull/9580) Add `.lint-todo` to prettier ignore [@elwayman02](https://github.com/elwayman02)
+- [#9589](https://github.com/ember-cli/ember-cli/pull/9589) Add link to visualizer to perf guide [@mehulkar](https://github.com/mehulkar)
+- [#9595](https://github.com/ember-cli/ember-cli/pull/9595) Add support for `addons.exclude` and `addons.include` options [@bertdeblock](https://github.com/bertdeblock)
+- [#9623](https://github.com/ember-cli/ember-cli/pull/9623) Update app/addon blueprints to use ember-auto-import@2 [@rwjblue](https://github.com/rwjblue)
+- [#9619](https://github.com/ember-cli/ember-cli/pull/9619) Update watch-detector to 1.0.1 [@colenso](https://github.com/colenso)
+- [#9627](https://github.com/ember-cli/ember-cli/pull/9627) Update app & addon blueprint dependencies to latest [@rwjblue](https://github.com/rwjblue)
+- [#9605](https://github.com/ember-cli/ember-cli/pull/9605) Properly set `loglevel` flag for npm [@jrvidal](https://github.com/jrvidal)
+- [#9609](https://github.com/ember-cli/ember-cli/pull/9609) Ignore additional `ember-try` files for apps and addons [@bertdeblock](https://github.com/bertdeblock)
+- [#9644](https://github.com/ember-cli/ember-cli/pull/9644) Default `ember new` and `ember addon` to use GitHub Actions [@rwjblue](https://github.com/rwjblue)
+
+Thank you to all who took the time to contribute!
+
 ## v3.28.0
 
 #### Blueprint Changes

package/README.md

@@ -63,7 +63,7 @@ Please see the [contributing guidelines](https://github.com/ember-cli/ember-cli/
 Community
 ------------------------------------------------------------------------------
 
-- Discord: [Get your invite](https://discordapp.com/invite/zT3asNS)
+- Discord: [Get your invite](https://discord.gg/emberjs)
 - Issues: [ember-cli/issues](https://github.com/ember-cli/ember-cli/issues)
 - Documentation: [ember-cli.com](https://cli.emberjs.com/release/)
 

package/blueprints/addon/additional-dev-dependencies.json

@@ -1,6 +1,6 @@
 {
   "devDependencies": {
-    "@embroider/test-setup": "^0.43.5",
+    "@embroider/test-setup": "^0.44.1",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-try": "^1.4.0",
     "ember-source-channel-url": "^3.0.0"

package/blueprints/addon/files/.github/workflows/ci.yml

@@ -0,0 +1,73 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request: {}
+
+jobs:
+  test:
+    name: "Tests"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+          cache: <%= yarn ? 'yarn' : 'npm' %>
+      - name: Install Dependencies
+        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
+      - name: Lint
+        run: <%= yarn ? 'yarn' : 'npm run' %> lint
+      - name: Run Tests
+        run: <%= yarn ? 'yarn' : 'npm run' %> test:ember
+
+  floating:
+    name: "Floating Dependencies"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+          cache: <%= yarn ? 'yarn' : 'npm' %>
+      - name: Install Dependencies
+        run: <%= yarn ? 'yarn install --no-lockfile' : 'npm install --no-shrinkwrap' %>
+      - name: Run Tests
+        run: <%= yarn ? 'yarn' : 'npm run' %> test:ember
+
+  try-scenarios:
+    name: ${{ matrix.try-scenario }}
+    runs-on: ubuntu-latest
+    needs: 'test'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        try-scenario:
+          - ember-lts-3.20
+          - ember-lts-3.24
+          - ember-release
+          - ember-beta
+          - ember-canary
+          - ember-classic
+          - ember-default-with-jquery
+          - embroider-safe
+          - embroider-optimized
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+          cache: <%= yarn ? 'yarn' : 'npm' %>
+      - name: Install Dependencies
+        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
+      - name: Run Tests
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

package/blueprints/addon/files/.travis.yml

@@ -29,7 +29,7 @@ branches:
     - /^v\d+\.\d+\.\d+/
 
 jobs:
-  fast_finish: true
+  fast_finish: false
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 

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

@@ -70,6 +70,9 @@ module.exports = async function () {
           }),
         },
         npm: {
+          devDependencies: {
+            'ember-source': '~3.28.0',
+          },
           ember: {
             edition: 'classic',
           },

package/blueprints/addon/files/npmignore

@@ -14,6 +14,7 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
 /.prettierignore
 /.prettierrc.js
@@ -33,4 +34,7 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

package/blueprints/addon/index.js

@@ -132,7 +132,7 @@ module.exports = {
     let addonName = stringUtil.dasherize(addonRawName);
     let addonNamespace = stringUtil.classify(addonRawName);
 
-    let hasOptions = options.welcome || options.yarn;
+    let hasOptions = options.welcome || options.yarn || options.ciProvider;
     let blueprintOptions = '';
     if (hasOptions) {
       let indent = `\n            `;
@@ -140,7 +140,13 @@ module.exports = {
 
       blueprintOptions =
         indent +
-        [options.welcome && '"--welcome"', options.yarn && '"--yarn"'].filter(Boolean).join(',\n            ') +
+        [
+          options.welcome && '"--welcome"',
+          options.yarn && '"--yarn"',
+          options.ciProvider && `"--ci-provider=${options.ciProvider}"`,
+        ]
+          .filter(Boolean)
+          .join(',\n            ') +
         outdent;
     }
 
@@ -158,13 +164,16 @@ module.exports = {
       blueprintOptions,
       embroider: false,
       lang: options.lang,
+      ciProvider: options.ciProvider,
     };
   },
 
-  files() {
-    let appFiles = this.lookupBlueprint(this.appBlueprintName).files();
+  files(options) {
+    let appFiles = this.lookupBlueprint(this.appBlueprintName).files(options);
     let addonFilesPath = this.filesPath(this.options);
-    let addonFiles = walkSync(addonFilesPath);
+    let ignoredCITemplate = this.options.ciProvider !== 'travis' ? '.travis.yml' : '.github';
+
+    let addonFiles = walkSync(addonFilesPath, { ignore: [ignoredCITemplate] });
 
     return uniq(appFiles.concat(addonFiles));
   },

package/blueprints/app/files/.eslintignore

@@ -19,4 +19,7 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

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

@@ -52,7 +52,7 @@ module.exports = {
       },<% } %>
     },
     {
-      // Test files:
+      // test files
       files: ['tests/**/*-test.{js,ts}'],
       extends: ['plugin:qunit/recommended'],
     },

package/blueprints/app/files/.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request: {}
+
+jobs:
+  lint:
+    name: "Lint"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+          cache: <%= yarn ? 'yarn' : 'npm' %>
+      - name: Install Dependencies
+        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
+      - name: Lint
+        run: <%= yarn ? 'yarn' : 'npm run' %> lint
+
+  test:
+    name: "Test"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+          cache: <%= yarn ? 'yarn' : 'npm' %>
+      - name: Install Dependencies
+        run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
+      - name: Run Tests
+        run: <%= yarn ? 'yarn' : 'npm' %> test

package/blueprints/app/files/.prettierignore

@@ -14,8 +14,12 @@
 /coverage/
 !.*
 .eslintcache
+.lint-todo/
 
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

package/blueprints/app/files/config/targets.js

@@ -6,21 +6,6 @@ const browsers = [
   'last 1 Safari versions',
 ];
 
-// Ember's browser support policy is changing, and IE11 support will end in
-// v4.0 onwards.
-//
-// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
-//
-// If you need IE11 support on a version of Ember that still offers support
-// for it, uncomment the code block below.
-//
-// const isCI = Boolean(process.env.CI);
-// const isProduction = process.env.EMBER_ENV === 'production';
-//
-// if (isCI || isProduction) {
-//   browsers.push('ie 11');
-// }
-
 module.exports = {
   browsers,
 };

package/blueprints/app/files/gitignore

@@ -23,4 +23,7 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
+/yarn.lock.ember-try

package/blueprints/app/files/package.json

@@ -25,14 +25,14 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.4.2<% if (embroider) { %>",
-    "@embroider/compat": "^0.43.5",
-    "@embroider/core": "^0.43.5",
-    "@embroider/webpack": "^0.43.5<% } %>",
+    "@embroider/compat": "^0.44.1",
+    "@embroider/core": "^0.44.1",
+    "@embroider/webpack": "^0.44.1<% } %>",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-auto-import": "^1.11.3",
+    "ember-auto-import": "^2.2.0",
     "ember-cli": "~<%= emberCLIVersion %>",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-babel": "^7.26.6",
@@ -41,29 +41,28 @@
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~3.28.0",
+    "ember-data": "~4.0.0-beta.2",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
-    "ember-resolver": "^8.0.2",
-    "ember-source": "~3.28.0",
-    "ember-template-lint": "^3.6.0<% if (welcome) { %>",
-    "ember-welcome-page": "^4.0.0<% } %>",
+    "ember-resolver": "^8.0.3",
+    "ember-source": "~4.0.0-beta.4",
+    "ember-template-lint": "^3.7.0<% if (welcome) { %>",
+    "ember-welcome-page": "^5.0.0<% } %>",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-ember": "^10.5.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.1",
-    "eslint-plugin-qunit": "^6.2.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-qunit": "^7.0.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.2",
-    "qunit": "^2.16.0",
-    "qunit-dom": "^1.6.0<% if (embroider) { %>",
-    "webpack": "^5.51.1<% } %>"
+    "prettier": "^2.4.0",
+    "qunit": "^2.17.2",
+    "qunit-dom": "^2.0.0",
+    "webpack": "^5.52.1"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/blueprints/app/index.js

@@ -23,7 +23,7 @@ module.exports = {
     let namespace = stringUtil.classify(rawName);
     let embroider = isExperimentEnabled('EMBROIDER') || options.embroider;
 
-    let hasOptions = !options.welcome || options.yarn || embroider;
+    let hasOptions = !options.welcome || options.yarn || embroider || options.ciProvider;
     let blueprintOptions = '';
     if (hasOptions) {
       let indent = `\n            `;
@@ -31,7 +31,12 @@ module.exports = {
 
       blueprintOptions =
         indent +
-        [!options.welcome && '"--no-welcome"', options.yarn && '"--yarn"', embroider && '"--embroider"']
+        [
+          !options.welcome && '"--no-welcome"',
+          options.yarn && '"--yarn"',
+          embroider && '"--embroider"',
+          options.ciProvider && `"--ci-provider=${options.ciProvider}"`,
+        ]
           .filter(Boolean)
           .join(',\n            ') +
         outdent;
@@ -48,9 +53,25 @@ module.exports = {
       blueprintOptions,
       embroider,
       lang: options.lang,
+      ciProvider: options.ciProvider,
     };
   },
 
+  files(options) {
+    if (this._files) {
+      return this._files;
+    }
+
+    let files = this._super();
+    if (options.ciProvider !== 'travis') {
+      this._files = files.filter((file) => file !== '.travis.yml');
+    } else {
+      this._files = files.filter((file) => file.indexOf('.github') < 0);
+    }
+
+    return this._files;
+  },
+
   beforeInstall() {
     const version = require('../../package.json').version;
     const prependEmoji = require('../../lib/utilities/prepend-emoji');

package/docs/build/classes/Addon.html

@@ -173,7 +173,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/classes/AmdTransformAddon.html

@@ -100,7 +100,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/classes/Blueprint.html

@@ -182,7 +182,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/classes/Builder.html

@@ -107,7 +107,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/classes/CLI.html

@@ -120,7 +120,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/classes/Command.html

@@ -131,7 +131,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/classes/DefaultPackager.html

@@ -100,7 +100,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>