v3.28.6...v5.5.0

# Conflicts: # .eslintignore # .eslintrc.js # .github/workflows/ci.yml # .gitignore # .npmignore # .prettierignore # CONTRIBUTING.md # README.md # ember-cli-build.js # tests/dummy/app/index.html # tests/dummy/app/styles/app.css # tests/dummy/config/addon-docs.js # tests/dummy/config/deploy.js # tests/dummy/config/ember-try.js # tests/index.html
ember-cli · Dec 27, 2023 · ac53792 · ac53792
1 parent 1ee3a8f
commit ac53792
Show file tree

Hide file tree

Showing 24 changed files with 3,148 additions and 1,436 deletions.
diff --git a/.ember-cli b/.ember-cli
@@ -1,9 +1,7 @@
 {
   /**
-    Ember CLI sends analytics information by default. The data is completely
-    anonymous, but there are times when you might want to disable this behavior.
-
-    Setting `disableAnalytics` to true will prevent any data from being sent.
+    Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
+    rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
   */
-  "disableAnalytics": false
+  "isTypeScriptProject": false
 }
diff --git a/.eslintignore b/.eslintignore
@@ -1,20 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
+.*/
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,12 +2,15 @@
 
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 'latest',
     sourceType: 'module',
-    ecmaFeatures: {
-      legacyDecorators: true,
+    requireConfigFile: false,
+    babelOptions: {
+      plugins: [
+        ['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
+      ],
     },
   },
   plugins: ['ember'],
@@ -24,25 +27,20 @@ module.exports = {
     // node files
     {
       files: [
-        '.eslintrc.js',
-        '.prettierrc.js',
-        '.template-lintrc.js',
-        'ember-cli-build.js',
-        'index.js',
-        'testem.js',
-        'testem.multiple-test-page.js',
-        'testem.no-test-page.js',
-        'testem.simple-test-page.js',
-        'blueprints/*/index.js',
-        'config/**/*.js',
-        'tests/dummy/config/**/*.js',
-        'lib/**/*',
-      ],
-      excludedFiles: [
-        'addon/**',
-        'addon-test-support/**',
-        'app/**',
-        'tests/dummy/app/**',
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.stylelintrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './index.js',
+        './testem.js',
+        './testem.multiple-test-page.js',
+        './testem.no-test-page.js',
+        './testem.simple-test-page.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './tests/dummy/config/**/*.js',
+        './lib/**/*',
       ],
       parserOptions: {
         sourceType: 'script',
@@ -51,8 +49,7 @@ module.exports = {
         browser: false,
         node: true,
       },
-      plugins: ['node'],
-      extends: ['plugin:node/recommended'],
+      extends: ['plugin:n/recommended'],
     },
     {
       files: ['node-tests/**/*'],

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,11 +6,15 @@ on:
   pull_request:
     branches: [ master ]
 
+concurrency:
+  group: ci-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
     name: Tests
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v2
@@ -22,6 +26,7 @@ jobs:
   floating-dependencies:
     name: "Floating Dependencies"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v2
@@ -31,9 +36,8 @@ jobs:
 
   try-scenarios:
     name: "Try: ${{ matrix.ember-try-scenario }}"
-
     runs-on: ubuntu-latest
-
+    timeout-minutes: 10
     needs: test
 
     strategy:
@@ -47,8 +51,8 @@ jobs:
           - embroider-safe-with-mocha
           - embroider-optimized
           - embroider-optimized-with-mocha
-          - ember-lts-3.24
-          - ember-lts-3.20
+          - ember-lts-4.8
+          - ember-lts-4.12
           - ember-release
           - ember-beta
           - ember-canary

diff --git a/.gitignore b/.gitignore
@@ -1,16 +1,15 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
 /dist/
-/tmp/
+/declarations/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
-/.sass-cache
 /connect.lock
+/.env*
+/.pnp*
+/.eslintcache
 /coverage/
 /libpeerconnection.log
 /npm-debug.log*
@@ -19,6 +18,11 @@
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /.nyc_output/
+/package-lock.json.ember-try
+/yarn.lock.ember-try
+
+# broccoli-debug
+/DEBUG/
diff --git a/.npmignore b/.npmignore
@@ -2,14 +2,23 @@
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-
 # misc
-.eslintrc
-/.*
-/bin/
-/bower.json
+/.editorconfig
+/.ember-cli
+/.env*
+/.eslintcache
+/.eslintignore
+/.eslintrc.js
+/.git/
+/.github/
+/.gitignore
+/.prettierignore
+/.prettierrc.js
+/.stylelintignore
+/.stylelintrc.js
+/.template-lintrc.js
+/.travis.yml
+/.watchmanconfig
 /CHANGELOG.md
 /CONTRIBUTING.md
 /config/
@@ -24,7 +33,8 @@
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /.nyc_output/
-/config/addon-docs.js
+/package-lock.json.ember-try
+/yarn.lock.ember-try
diff --git a/.prettierignore b/.prettierignore
@@ -1,25 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /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
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,5 +1,12 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
+  overrides: [
+    {
+      files: '*.{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
 };
diff --git a/.stylelintignore b/.stylelintignore
@@ -0,0 +1,8 @@
+# unconventional files
+/blueprints/*/files/
+
+# compiled output
+/dist/
+
+# addons
+/.node_modules.ember-try/
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+  rules: {
+    "selector-class-pattern": null,
+  }
+};
diff --git a/.watchmanconfig b/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -14,14 +14,14 @@
 
 ## Running tests
 
-- `ember test` – Runs the test suite on the current Ember version
-- `ember test --server` – Runs the test suite in "watch mode"
+- `yarn test:ember` – Runs the test suite on the current Ember version
+- `yarn test:ember --server` – Runs the test suite in "watch mode"
 - `yarn test:node` - Runs the node tests
 - `yarn test:all` – Runs the test suite against multiple Ember versions
 
 ## Running the dummy application
 
-- `ember serve`
+- `yarn start`
 - Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ The [documentation website](https://ember-cli.github.io/ember-exam/) contains ex
 
 ## Table of Contents
 
+- [Compatibility](#compatibility)
 - [Installation](#installation)
 - [How To Use](#how-to-use)
   * [Version < `3.0.0`](#version--300)
@@ -29,6 +30,11 @@ The [documentation website](https://ember-cli.github.io/ember-exam/) contains ex
   * [Ember Try & CI Integration](#ember-try--ci-integration)
   * [Test Suite Segmentation](#test-suite-segmentation)
 
+## Compatibility
+
+* Ember.js v4.8 or above
+* Ember CLI v4.8 or above
+* Node.js v18 or above
 
 ## Installation
 
@@ -386,7 +392,7 @@ ok 1 Chrome 66.0 - Exam Partition 1 - browser Id 1 - some test
 ok 2 Chrome 66.0 - Exam Partition 1 - browser Id 2 - another test
 ok 3 Chrome 66.0 - Exam Partition 1 - browser Id 3 - some the other test
 ```
-However, if you change the amount of parallelization, or randomize across partitions, the output will change for the same test, which may be an issue if you are tracking test insights over time. 
+However, if you change the amount of parallelization, or randomize across partitions, the output will change for the same test, which may be an issue if you are tracking test insights over time.
 
 ```bash
 # ember exam --split=2 --partition=1 --parallel=2 --load-balance

diff --git a/config/environment.js b/config/environment.js