Update ember-cli to v4.4 (drops node v12) (#731)

* Run ember-cli-update --to 4.4 * Update ember-data to v4.4 * Update dependencies * Drop node v12
adopted-ember-addons · May 30, 2023 · 007c327 · 007c327
1 parent 9e99229
commit 007c327
Show file tree

Hide file tree

Showing 16 changed files with 2,916 additions and 2,262 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/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           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: 12.x
+          node-version: 14.x
           cache: yarn
       - name: Install Dependencies
         run: yarn install --no-lockfile
@@ -70,7 +70,7 @@ jobs:
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: Install Dependencies
         run: yarn install --frozen-lockfile

diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,6 @@
 /package.json.ember-try
 /package-lock.json.ember-try
 /yarn.lock.ember-try
+
+# broccoli-debug
+/DEBUG/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -22,4 +22,4 @@
 * `ember serve`
 * 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/config/ember-try.js b/config/ember-try.js
@@ -12,6 +12,7 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             'ember-source': '~3.28.0',
+            'ember-data': '~3.28.0',
           },
         },
       },
@@ -27,23 +28,29 @@ module.exports = async function () {
         name: 'ember-release',
         npm: {
           devDependencies: {
+            '@ember/string': '3.0.1',
             'ember-source': await getChannelURL('release'),
+            'ember-data': 'latest',
           },
         },
       },
       {
         name: 'ember-beta',
         npm: {
           devDependencies: {
+            '@ember/string': '3.0.1',
             'ember-source': await getChannelURL('beta'),
+            'ember-data': 'beta',
           },
         },
       },
       {
         name: 'ember-canary',
         npm: {
           devDependencies: {
+            '@ember/string': '3.0.1',
             'ember-source': await getChannelURL('canary'),
+            'ember-data': 'canary',
           },
         },
       },

diff --git a/package.json b/package.json
@@ -50,63 +50,63 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.26.10",
+    "ember-cli-babel": "^7.26.11",
     "ember-validators": "^4.1.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.6.0",
-    "@embroider/test-setup": "^0.48.1",
-    "@glimmer/component": "^1.0.4",
-    "@glimmer/tracking": "^1.0.4",
+    "@ember/test-helpers": "^2.7.0",
+    "@embroider/test-setup": "^1.6.0",
+    "@fortawesome/ember-fontawesome": "^1.0.0",
+    "@fortawesome/free-brands-svg-icons": "^6.4.0",
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
+    "@release-it-plugins/lerna-changelog": "^5.0.0",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^2.7.0",
     "ember-auto-import": "^2.4.2",
-    "ember-cli": "~4.0.1",
+    "ember-cli": "~4.4.1",
     "ember-cli-app-version": "^5.0.0",
-    "ember-cli-autoprefixer": "^0.7.0",
-    "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-github-pages": "^0.2.0",
+    "ember-cli-autoprefixer": "^2.0.0",
+    "ember-cli-dependency-checker": "^3.3.1",
+    "ember-cli-github-pages": "^0.2.2",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-inject-live-reload": "^2.1.0",
-    "ember-cli-moment-shim": "^3.3.3",
-    "ember-cli-sass": "^8.0.1",
+    "ember-cli-moment-shim": "^3.8.0",
+    "ember-cli-sass": "^11.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-cli-yuidoc": "^0.8.8",
     "ember-code-snippet": "^3.0.0",
-    "ember-data": "~3.28.0",
+    "ember-data": "~4.4.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
-    "ember-font-awesome": "^3.0.5",
     "ember-load-initializers": "^2.1.2",
-    "ember-prism": "^0.12.0",
+    "ember-prism": "^0.13.0",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
-    "ember-source": "~4.0.1",
+    "ember-source": "~4.4.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^3.15.0",
-    "ember-truth-helpers": "^3.0.0",
+    "ember-template-lint": "^4.8.0",
     "ember-try": "^2.0.0",
     "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^10.5.8",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-ember": "^10.6.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-qunit": "^7.2.0",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.5.1",
-    "qunit": "^2.17.2",
+    "prettier": "^2.6.2",
+    "qunit": "^2.19.1",
     "qunit-dom": "^2.0.0",
-    "release-it": "^14.2.1",
-    "release-it-lerna-changelog": "^3.1.0",
-    "sass": "^1.15.3",
-    "webpack": "^5.65.0",
-    "yuidoc-ember-theme": "^2.0.1"
+    "release-it": "^15.10.3",
+    "sass": "^1.62.1",
+    "webpack": "^5.72.1"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "14.* || >= 16"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -120,7 +120,7 @@
   },
   "release-it": {
     "plugins": {
-      "release-it-lerna-changelog": {
+      "@release-it-plugins/lerna-changelog": {
         "infile": "CHANGELOG.md",
         "launchEditor": true
       }

diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -1,11 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset='utf-8'>
-    <meta http-equiv='X-UA-Compatible' content='IE=edge'>
+    <meta charset="utf-8">
     <title>Ember CP Validations</title>
-    <meta name='description' content=''>
-    <meta name='viewport' content='width=device-width, initial-scale=1'>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
     {{content-for 'head'}}
 

diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
@@ -6,7 +6,9 @@
     <span>CP Validations</span>
   </LinkTo>
 
-  <a href='https://github.com/adopted-ember-addons/ember-cp-validations' class='fa fa-github github'></a>
+  <a href='https://github.com/adopted-ember-addons/ember-cp-validations'>
+    <FaIcon @icon="github" @prefix="fab" class="github" />
+  </a>
 </div>
 
 <div class='content'>

diff --git a/tests/dummy/app/templates/components/validated-input.hbs b/tests/dummy/app/templates/components/validated-input.hbs
@@ -14,7 +14,7 @@
     />
 
     {{#if this.isValid}}
-      <span class='valid-input fa fa-check'></span>
+      <FaIcon @icon="check" class="valid-input" />
     {{/if}}
 
     <div class='input-error'>

diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs
@@ -7,7 +7,7 @@
 
       {{#if this.showAlert}}
         <div class='alert'>
-          <div class='fa fa-times icon-remove' {{action 'toggleProperty' 'showAlert'}}></div>
+          <FaIcon @icon="times" class="icon-remove" {{on "click" (fn this.toggleProperty 'showAlert')}} />
           Please fix all the errors below before continuing.
         </div>
       {{/if}}
@@ -56,16 +56,19 @@
   {{else}}
     <div class='registered'>
       {{!-- <img class='tomster' src='images/tomsterzilla.jpeg' alt='' data-test-tomster> --}}
-      <div class='fa fa-check-circle icon-success'></div>
+      <FaIcon @icon="check-circle" class="icon-success" />
       <h2 class='success'>Success</h2>
     </div>
   {{/unless}}
   <footer>
     {{#unless this.isRegistered}}
-      <a class='show-code bottom' {{action 'toggleProperty' 'showCode'}}><i class='fa fa-code'></i> {{if this.showCode 'Hide Code' 'Show Code'}}
-        <i class='fa fa-code'></i></a>
+      <a class='show-code bottom' {{action 'toggleProperty' 'showCode'}}>
+        <FaIcon @icon="code" />
+        {{if this.showCode 'Hide Code' 'Show Code'}}
+        <FaIcon @icon="code" />
+      </a>
     {{else}}
-      <a class='show-code bottom' {{action 'reset'}}>Reset Form</a>
+      <a class='show-code bottom' {{on "click" (fn this.toggleProperty "isRegistered")}}>Reset Form</a>
     {{/unless}}
   </footer>
 </div>

diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.0.1",
+      "version": "4.4.1",
       "blueprints": [
         {
           "name": "addon",

diff --git a/tests/dummy/config/icons.js b/tests/dummy/config/icons.js
@@ -0,0 +1,6 @@
+module.exports = function () {
+  return {
+    'free-brands-svg-icons': ['github'],
+    'free-solid-svg-icons': ['check', 'check-circle', 'code', 'times'],
+  };
+};
diff --git a/tests/helpers/.gitkeep b/tests/helpers/.gitkeep
diff --git a/tests/helpers/index.js b/tests/helpers/index.js
@@ -0,0 +1,42 @@
+import {
+  setupApplicationTest as upstreamSetupApplicationTest,
+  setupRenderingTest as upstreamSetupRenderingTest,
+  setupTest as upstreamSetupTest,
+} from 'ember-qunit';
+
+// This file exists to provide wrappers around ember-qunit's / ember-mocha's
+// test setup functions. This way, you can easily extend the setup that is
+// needed per test type.
+
+function setupApplicationTest(hooks, options) {
+  upstreamSetupApplicationTest(hooks, options);
+
+  // Additional setup for application tests can be done here.
+  //
+  // For example, if you need an authenticated session for each
+  // application test, you could do:
+  //
+  // hooks.beforeEach(async function () {
+  //   await authenticateSession(); // ember-simple-auth
+  // });
+  //
+  // This is also a good place to call test setup functions coming
+  // from other addons:
+  //
+  // setupIntl(hooks); // ember-intl
+  // setupMirage(hooks); // ember-cli-mirage
+}
+
+function setupRenderingTest(hooks, options) {
+  upstreamSetupRenderingTest(hooks, options);
+
+  // Additional setup for rendering tests can be done here.
+}
+
+function setupTest(hooks, options) {
+  upstreamSetupTest(hooks, options);
+
+  // Additional setup for unit tests can be done here.
+}
+
+export { setupApplicationTest, setupRenderingTest, setupTest };
diff --git a/tests/index.html b/tests/index.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>Dummy Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">