chore: update to ember v4

BREAKING CHANGE: - Ember.js v3.28 or above - Ember CLI v3.28 or above - Node.js v16 or above
projectcaluma · Jul 4, 2023 · 04865f1 · 04865f1
1 parent 7ac04b3
commit 04865f1
Show file tree

Hide file tree

Showing 23 changed files with 872 additions and 268 deletions.
diff --git a/.ember-cli b/.ember-cli
@@ -5,5 +5,11 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": false
+  "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.
+  */
+  "isTypeScriptProject": false
 }
diff --git a/.eslintignore b/.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
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,79 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request: {}
+
+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@v3
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+      - name: Lint
+        run: yarn lint
+      - name: Run Tests
+        run: yarn test:ember
+
+  floating:
+    name: "Floating Dependencies"
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --no-lockfile
+      - name: Run Tests
+        run: yarn test:ember
+
+  try-scenarios:
+    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-beta
+          - ember-canary
+          - ember-classic
+          - embroider-safe
+          - embroider-optimized
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: yarn
+      - name: Install Dependencies
+        run: yarn install --frozen-lockfile
+      - name: Run Tests
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,10 @@
 # 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
+
+# broccoli-debug
+/DEBUG/
diff --git a/.npmignore b/.npmignore
@@ -14,14 +14,14 @@
 /.eslintignore
 /.eslintrc.js
 /.git/
+/.github/
 /.gitignore
 /.prettierignore
 /.prettierrc.js
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
 /bower.json
-/config/ember-try.js
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
@@ -33,4 +33,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
diff --git a/.prettierignore b/.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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,8 +8,8 @@
 
 ## Linting
 
-* `yarn lint`
-* `yarn lint:fix`
+- `yarn lint`
+- `yarn lint:fix`
 
 ## Running tests
 
@@ -27,4 +27,4 @@
 - set up `emeis` (see [docs](https://github.com/projectcaluma/emeis))
 - `yarn start-proxy`
 
-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
@@ -9,14 +9,14 @@ The frontend for the [emeis](https://github.com/projectcaluma/emeis) user manage
 
 ## Compatibility
 
-- Ember.js v3.20 or above
-- Ember CLI v3.20 or above
-- Node.js v10 or above
+- Ember.js v3.28 or above
+- Ember CLI v3.28 or above
+- Node.js v14 or above
 
 ## Installation
 
 ```bash
-$ ember install ember-emeis
+ember install ember-emeis
 ```
 
 Then add the following lines to your `app/styles/app.scss`:
@@ -230,5 +230,3 @@ See the [Contributing](CONTRIBUTING.md) guide for details.
 # License
 
 This project is licensed under the [LGPL-3.0-or-later license](LICENSE).
-
-<3
diff --git a/config/environment.js b/config/environment.js
@@ -2,7 +2,7 @@
 
 module.exports = function (environment) {
   const ENV = {
-    modulePrefix: "ember-emeis",
+    modulePrefix: require("./../package").name,
     environment,
   };
 

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -15,5 +15,11 @@ module.exports = function (defaults) {
   */
 
   const { maybeEmbroider } = require("@embroider/test-setup");
-  return maybeEmbroider(app);
+  return maybeEmbroider(app, {
+    skipBabel: [
+      {
+        package: "qunit",
+      },
+    ],
+  });
 };
diff --git a/index.js b/index.js
@@ -2,9 +2,9 @@
 
 /* eslint-disable ember/avoid-leaking-state-in-ember-objects, n/no-unpublished-require */
 
-const EngineAddon = require("ember-engines/lib/engine-addon");
+const { buildEngine } = require("ember-engines/lib/engine-addon");
 
-module.exports = EngineAddon.extend({
+module.exports = buildEngine({
   name: require("./package").name,
   lazyLoading: { enabled: false },
 });
diff --git a/package.json b/package.json
@@ -16,16 +16,16 @@
   },
   "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": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
+    "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "lint:pkg": "npmPkgJsonLint .",
     "start": "ember serve",
     "start-proxy": "ember server --proxy http://localhost:8000",
-    "test": "npm-run-all lint test:*",
+    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each",
     "prepare": "husky install"
@@ -76,23 +76,22 @@
     "@embroider/test-setup": "3.0.1",
     "@faker-js/faker": "6.2.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.6",
+    "concurrently": "7.6.0",
+    "ember-cli": "4.9.2",
     "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
     "ember-cli-mirage": "3.0.0-alpha.3",
     "ember-cli-sass": "11.0.1",
     "ember-cli-sri": "2.1.1",
     "ember-cli-uglify": "3.0.0",
-    "ember-disable-prototype-extensions": "1.1.3",
     "ember-engines": "0.9.0",
-    "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
     "ember-maybe-import-regenerator": "1.0.0",
     "ember-qunit": "6.2.0",
     "ember-resolver": "8.0.3",
-    "ember-source": "3.28.9",
+    "ember-source": "4.9.1",
     "ember-source-channel-url": "3.0.0",
-    "ember-template-lint": "4.10.1",
+    "ember-template-lint": "5.2.0",
     "ember-template-lint-plugin-prettier": "4.1.0",
     "ember-try": "3.0.0-beta.1",
     "eslint": "8.39.0",
@@ -115,6 +114,9 @@
     "sass": "1.56.1",
     "webpack": "5.81.0"
   },
+  "peerDependencies": {
+    "ember-source": "^3.28.0 || ^4.0.0"
+  },
   "engines": {
     "node": ">= 18.*"
   },

diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Dummy</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">

diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json
@@ -3,17 +3,14 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "3.27.0",
+      "version": "4.9.2",
       "blueprints": [
         {
           "name": "addon",
           "outputRepo": "https://github.com/ember-cli/ember-addon-output",
           "codemodsSource": "ember-addon-codemods-manifest@1",
           "isBaseBlueprint": true,
-          "options": [
-            "--yarn",
-            "--no-welcome"
-          ]
+          "options": ["--yarn", "--no-welcome"]
         }
       ]
     }

diff --git a/config/ember-try.js → tests/dummy/config/ember-try.js b/config/ember-try.js → tests/dummy/config/ember-try.js
@@ -15,25 +15,35 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: "ember-lts-4.4",
+        npm: {
+          devDependencies: {
+            "ember-source": "~4.4.0",
+          },
+        },
+      },
       {
         name: "ember-release",
-        allowedToFail: true,
         npm: {
           devDependencies: {
             "ember-source": await getChannelURL("release"),
           },
         },
       },
       {
-        name: "ember-default-with-jquery",
-        env: {
-          EMBER_OPTIONAL_FEATURES: JSON.stringify({
-            "jquery-integration": true,
-          }),
+        name: "ember-beta",
+        npm: {
+          devDependencies: {
+            "ember-source": await getChannelURL("beta"),
+          },
         },
+      },
+      {
+        name: "ember-canary",
         npm: {
           devDependencies: {
-            "@ember/jquery": "^1.1.0",
+            "ember-source": await getChannelURL("canary"),
           },
         },
       },
@@ -47,6 +57,9 @@ module.exports = async function () {
           }),
         },
         npm: {
+          devDependencies: {
+            "ember-source": "~3.28.0",
+          },
           ember: {
             edition: "classic",
           },

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -5,16 +5,13 @@ module.exports = function (environment) {
     modulePrefix: "dummy",
     environment,
     rootURL: "/",
-    locationType: "auto",
+    locationType: "history",
     EmberENV: {
+      EXTEND_PROTOTYPES: false,
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
       },
-      EXTEND_PROTOTYPES: {
-        // Prevent Ember Data from overriding Date.parse.
-        Date: false,
-      },
     },
 
     APP: {

diff --git a/tests/dummy/config/targets.js b/tests/dummy/config/targets.js
@@ -6,13 +6,6 @@ const browsers = [
   "last 1 Safari versions",
 ];
 
-const isCI = !!process.env.CI;
-const isProduction = process.env.EMBER_ENV === "production";
-
-if (isCI || isProduction) {
-  browsers.push("ie 11");
-}
-
 module.exports = {
   browsers,
 };
diff --git a/tests/helpers/.gitkeep b/tests/helpers/.gitkeep