update to v4.8 with ember-cli-update

# Conflicts: # .github/workflows/ci.yml # README.md # ember-cli-build.js
empress · Mar 8, 2024 · 65356da · 65356da
1 parent fe39f3f
commit 65356da
Show file tree

Hide file tree

Showing 8 changed files with 349 additions and 1,662 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,6 +15,7 @@ jobs:
   test:
     name: "Tests"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v4
@@ -37,6 +38,7 @@ jobs:
   floating:
     name: "Floating Dependencies"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v4
@@ -57,12 +59,14 @@ jobs:
     name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
     needs: "test"
+    timeout-minutes: 10
 
     strategy:
       fail-fast: false
       matrix:
         try-scenario:
           - ember-lts-3.28
+          - ember-lts-4.4
           - ember-release
           - ember-classic
           - embroider-safe

diff --git a/README.md b/README.md
@@ -15,8 +15,8 @@ You do not need to be a web developer to be able to use this system. You just wr
 
 ## Compatibility
 
-* Ember.js v3.16 or above
-* Ember CLI v3.16 or above
+* Ember.js v3.28 or above
+* Ember CLI v3.28 or above
 * Node.js v18 or above
 
 Super Quick Start

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -15,6 +15,14 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-lts-4.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~4.4.0',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -22,14 +22,7 @@ const webpackConfig = {
 };
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
-    'ember-cli-uglify': {
-      uglify: {
-        compress: {
-          collapse_vars: false
-        }
-      }
-    },
+  const app = new EmberAddon(defaults, {
     autoImport: {
       webpack: webpackConfig,
     },

diff --git a/package.json b/package.json
@@ -16,12 +16,12 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
-    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+    "lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
+    "lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "start": "ember serve",
-    "test": "npm-run-all lint test:*",
+    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
     "test:ember": "ember test",
     "test:node": "mocha node-tests",
     "ember-compatibility-tests": "ember try:each"
@@ -32,10 +32,10 @@
     "broccoli-merge-trees": "^4.1.0",
     "broccoli-static-site-json": "^4.5.0",
     "compare-versions": "^3.5.0",
-    "ember-auto-import": "^2.4.2",
+    "ember-auto-import": "^2.4.3",
     "ember-body-class": "^3.0.0",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.1.1",
     "ember-cli-showdown": "^9.0.0",
     "ember-get-config": "^2.1.1",
     "ember-meta": "^2.0.0",
@@ -50,46 +50,45 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.7.0",
+    "@ember/test-helpers": "^2.8.1",
     "@embroider/test-setup": "^1.8.3",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "chai": "^4.2.0",
-    "ember-cli": "~4.4.1",
+    "ember-cli": "~4.8.1",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-fastboot": "^4.1.2",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.4.0",
+    "ember-data": "~4.8.0",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^7.0.0",
-    "ember-qunit": "^5.1.5",
+    "ember-qunit": "^6.0.0",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.4.0",
+    "ember-source": "~4.8.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^4.8.0",
+    "ember-template-lint": "^4.16.1",
     "ember-try": "^3.0.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^10.6.1",
+    "eslint-plugin-ember": "^11.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.2.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-qunit": "^7.3.1",
     "guidemaker-default-template": "^7.0.0",
     "lint-to-the-future": "^1.1.0",
     "lint-to-the-future-eslint": "^1.0.0",
     "loader.js": "^4.7.0",
     "mocha": "^7.0.0",
     "npm-run-all": "^4.1.5",
     "prember": "^2.0.0",
-    "prettier": "^2.6.2",
-    "qunit": "^2.19.1",
+    "prettier": "^2.7.1",
+    "qunit": "^2.19.2",
     "qunit-dom": "^2.0.0",
     "release-plan": "^0.8.0",
     "webpack": "^5.74.0"