Merge cec2899 into 04c4ab7

.ember-cli

@@ -1,12 +1,4 @@
 {
-  /**
-    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.
-  */
-  "disableAnalytics": false,
-
   /**
     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.

.eslintignore

@@ -1,25 +1,13 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
 !.*
 .*/
-.eslintcache
 
 # 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

.eslintrc.js

@@ -92,7 +92,6 @@ module.exports = {
         browser: false,
         node: true,
       },
-      plugins: ['n'],
       extends: ['plugin:n/recommended'],
     },
     {

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: yarn
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: yarn
       - name: Install Dependencies
         run: yarn install --no-lockfile
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: yarn
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -75,6 +75,7 @@ jobs:
         try-scenario:
           - ember-lts-4.4
           - ember-lts-4.8
+          - ember-lts-4.12
           - ember-release
           - ember-beta
           - ember-canary
@@ -92,7 +93,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: yarn
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -121,7 +122,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: yarn
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
@@ -142,7 +143,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: yarn
       - name: Install Dependencies
         run: yarn install --frozen-lockfile

.gitignore

@@ -1,26 +1,22 @@
 # compiled output
 /dist/
-/tmp/
+/declarations/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc
 /.env*
 /.pnp*
 /.sass-cache
 /.eslintcache
-/connect.lock
 /coverage/
-/libpeerconnection.log
 /npm-debug.log*
 /testem.log
 /yarn-error.log
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try

.npmignore

@@ -2,11 +2,7 @@
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-
 # misc
-/.bowerrc
 /.editorconfig
 /.ember-cli
 /.env*
@@ -23,7 +19,6 @@
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
-/bower.json
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
@@ -34,7 +29,6 @@
 
 # ember-try
 /.node_modules.ember-try/
-/bower.json.ember-try
 /npm-shrinkwrap.json.ember-try
 /package.json.ember-try
 /package-lock.json.ember-try

.prettierignore

@@ -1,14 +1,8 @@
 # unconventional js
 /blueprints/*/files/
-/vendor/
 
 # compiled output
 /dist/
-/tmp/
-
-# dependencies
-/bower_components/
-/node_modules/
 
 # misc
 /coverage/
@@ -17,8 +11,3 @@
 
 # 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

.watchmanconfig

@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }

package.json

@@ -36,27 +36,30 @@
     "nodetest": "mocha node-tests --recursive"
   },
   "dependencies": {
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.23.2",
     "@ember/render-modifiers": "^2.0.4",
     "@embroider/macros": "^1.8.0",
     "@embroider/util": "^1.12.0",
     "chalk": "^4.1.1",
-    "ember-cli-babel": "^8.0.0",
+    "ember-cli-babel": "^8.2.0",
     "ember-cli-build-config-editor": "0.5.1",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-typescript": "^5.1.0",
     "ember-truth-helpers": "^3.0.0",
     "fs-extra": "^10.0.0"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.22.10",
-    "@babel/plugin-proposal-decorators": "^7.22.10",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/plugin-proposal-decorators": "^7.23.2",
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.2.0",
-    "@embroider/test-setup": "^3.0.1",
+    "@embroider/test-setup": "^3.0.2",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
+    "@glint/core": "^1.0.2",
+    "@glint/environment-ember-loose": "^1.0.2",
+    "@glint/template": "^1.0.2",
     "@types/ember-resolver": "^5.0.11",
     "@types/ember__application": "^4.0.0",
     "@types/ember__array": "^4.0.1",
@@ -81,11 +84,11 @@
     "@typescript-eslint/parser": "^5.7.0",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.2.0",
+    "concurrently": "^8.2.2",
     "ember-auto-import": "^2.6.3",
-    "ember-cli": "~5.2.1",
+    "ember-cli": "~5.4.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
-    "ember-cli-clean-css": "^2.0.0",
+    "ember-cli-clean-css": "^3.0.0",
     "ember-cli-code-coverage": "^1.0.3",
     "ember-cli-dependency-checker": "^3.3.2",
     "ember-cli-inject-live-reload": "^2.1.0",
@@ -98,42 +101,39 @@
     "ember-models-table": "^5.0.0-beta.2",
     "ember-page-title": "^8.0.0",
     "ember-power-select": "^7.1.0",
-    "ember-qunit": "^7.0.0",
+    "ember-qunit": "^8.0.1",
     "ember-resolver": "^11.0.1",
-    "ember-source": "~5.2.0",
+    "ember-source": "~5.4.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^5.11.2",
     "ember-try": "^3.0.0",
-    "eslint": "^8.47.0",
+    "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-ember": "^11.10.0",
-    "eslint-plugin-n": "^16.0.1",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-qunit": "^8.0.0",
-    "@glint/core": "^1.0.2",
-    "@glint/environment-ember-loose": "^1.0.2",
-    "@glint/template": "^1.0.2",
+    "eslint-plugin-ember": "^11.11.1",
+    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-qunit": "^8.0.1",
     "lcov-result-merger": "^3.1.0",
     "loader.js": "^4.7.0",
     "mocha": "^10.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.0.2",
-    "qunit": "^2.19.4",
+    "prettier": "^3.0.3",
+    "qunit": "^2.20.0",
     "qunit-dom": "^2.0.0",
     "sass": "^1.53.0",
-    "stylelint": "^15.10.3",
+    "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-prettier": "^4.0.2",
     "typedoc": "^0.21.9",
     "typedoc-plugin-rename-defaults": "^0.3.0",
     "typescript": "^4.7.4",
-    "webpack": "^5.88.2"
+    "webpack": "^5.89.0"
   },
   "peerDependencies": {
     "ember-source": ">= 4.0.0"
   },
   "engines": {
-    "node": "16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"

tests/dummy/config/ember-cli-update.json

@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "5.2.1",
+      "version": "5.4.0",
       "blueprints": [
         {
           "name": "addon",

tests/dummy/config/ember-try.js

@@ -23,6 +23,14 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-lts-4.12',
+        npm: {
+          devDependencies: {
+            'ember-source': '~4.12.0',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {

tests/helpers/index.js

@@ -4,7 +4,7 @@ import {
   setupTest as upstreamSetupTest,
 } from 'ember-qunit';
 
-// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// This file exists to provide wrappers around ember-qunit's
 // test setup functions. This way, you can easily extend the setup that is
 // needed per test type.
 

vendor/ember-models-table-floating-filter/plain-html.css

@@ -28,7 +28,8 @@
   padding: 12px 16px;
 }
 
-.float-filter-dropdown-menu form select, .float-filter-dropdown-menu form input {
+.float-filter-dropdown-menu form select,
+.float-filter-dropdown-menu form input {
   margin-bottom: 5px;
 }