Upgrade ember-cli to 5.4 (#1018)

adopted-ember-addons · Nov 11, 2023 · 7971a96 · 7971a96
1 parent 7f791a5
commit 7971a96
Show file tree

Hide file tree

Showing 17 changed files with 13,210 additions and 4,781 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test-app/.ember-cli b/test-app/.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.

diff --git a/test-app/.eslintignore b/test-app/.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
diff --git a/test-app/.gitignore b/test-app/.gitignore
@@ -1,28 +1,21 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # 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

diff --git a/test-app/.prettierignore b/test-app/.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/test-app/.watchmanconfig b/test-app/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }
diff --git a/test-app/config/ember-cli-update.json b/test-app/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.12.0",
+      "version": "5.4.0",
       "blueprints": [
         {
           "name": "app",

diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js
@@ -11,6 +11,7 @@ module.exports = async function () {
         name: 'ember-3.25',
         npm: {
           devDependencies: {
+            'ember-cli': '~4.12.2',
             'ember-source': '~3.25.4',
             '@ember/test-helpers': '^2.9.4',
             'ember-qunit': '~6.0.0',
@@ -21,6 +22,7 @@ module.exports = async function () {
         name: 'ember-lts-3.28',
         npm: {
           devDependencies: {
+            'ember-cli': '~4.12.2',
             'ember-source': '~3.28.12',
             '@ember/test-helpers': '^2.9.4',
             'ember-qunit': '~6.0.0',

diff --git a/test-app/package.json b/test-app/package.json
@@ -27,9 +27,10 @@
     "test:ember-try": "ember try:one"
   },
   "devDependencies": {
+    "@babel/core": "^7.23.2",
     "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.0.1",
-    "@ember/test-helpers": "^3.1.0",
+    "@ember/string": "^3.1.1",
+    "@ember/test-helpers": "^3.2.0",
     "@embroider/test-setup": "^3.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
@@ -42,13 +43,14 @@
     "@typescript-eslint/parser": "^6.0.0",
     "babel-plugin-dynamic-import-node": "^2.3.3",
     "broccoli-asset-rev": "^3.0.0",
-    "concurrently": "^8.0.1",
+    "concurrently": "^8.2.2",
     "ember-auto-import": "^2.6.3",
-    "ember-cli": "~4.12.2",
-    "ember-cli-app-version": "^6.0.0",
-    "ember-cli-babel": "^8.0.0",
-    "ember-cli-dependency-checker": "^3.3.1",
-    "ember-cli-htmlbars": "^6.2.0",
+    "ember-cli": "~5.4.0",
+    "ember-cli-app-version": "^6.0.1",
+    "ember-cli-babel": "^8.2.0",
+    "ember-cli-clean-css": "^3.0.0",
+    "ember-cli-dependency-checker": "^3.3.2",
+    "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-mirage": "^3.0.0",
     "ember-cli-sri": "^2.1.1",
@@ -59,39 +61,38 @@
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^8.0.0",
-    "ember-qunit": "^8.0.0",
-    "ember-resolver": "^11.0.0",
+    "ember-qunit": "^8.0.1",
+    "ember-resolver": "^11.0.1",
     "ember-source": "~5.4.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^5.7.2",
+    "ember-template-lint": "^5.11.2",
     "ember-try": "^3.0.0",
-    "eslint": "^8.37.0",
+    "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-ember": "^11.5.0",
-    "eslint-plugin-n": "^16.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-qunit": "^8.0.0",
+    "eslint-plugin-ember": "^11.11.1",
+    "eslint-plugin-n": "^16.2.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-qunit": "^8.0.1",
     "fake-xml-http-request": "^2.1.2",
     "loader.js": "^4.7.0",
     "miragejs": "^0.1.43",
     "prettier": "^3.0.3",
-    "qunit": "^2.19.4",
+    "qunit": "^2.20.0",
     "qunit-dom": "^3.0.0",
-    "stylelint": "^15.4.0",
-    "stylelint-config-prettier": "^9.0.5",
+    "stylelint": "^15.11.0",
     "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^4.0.0",
-    "tracked-built-ins": "^3.1.1",
+    "stylelint-prettier": "^4.0.2",
+    "tracked-built-ins": "^3.3.0",
     "typescript": "~5.2.0",
-    "webpack": "^5.78.0"
+    "webpack": "^5.89.0"
   },
   "dependenciesMeta": {
     "ember-file-upload": {
       "injected": true
     }
   },
   "engines": {
-    "node": "16.* || >= 18"
+    "node": ">= 18"
   },
   "ember": {
     "edition": "octane"

diff --git a/website/.ember-cli b/website/.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.

diff --git a/website/.eslintignore b/website/.eslintignore
@@ -1,26 +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
-/pnpm-lock.yaml.ember-try
diff --git a/website/.gitignore b/website/.gitignore
@@ -1,28 +1,21 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # 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

diff --git a/website/.prettierignore b/website/.prettierignore
@@ -1,27 +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
-/pnpm-lock.yaml.ember-try
-
diff --git a/website/.watchmanconfig b/website/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp", "dist"]
+  "ignore_dirs": ["dist"]
 }
diff --git a/website/config/ember-cli-update.json b/website/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.12.0",
+      "version": "5.4.0",
       "blueprints": [
         {
           "name": "app",