deps(ember): upgrade to latest LTS (4.8.x) (#1011)

ConduitIO · Apr 26, 2023 · 096656f · 096656f
1 parent 1a21294
commit 096656f
Show file tree

Hide file tree

Showing 11 changed files with 1,165 additions and 692 deletions.
diff --git a/ui/.ember-cli b/ui/.ember-cli
@@ -6,5 +6,10 @@
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
   "disableAnalytics": false,
-  "outputPath": "../pkg/web/ui/dist"
+  "outputPath": "../pkg/web/ui/dist",
+  /**
+  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/ui/README.md b/ui/README.md
@@ -14,7 +14,8 @@ You will need the following things properly installed on your computer.
 - [Git](https://git-scm.com/)
 - [Node.js](https://nodejs.org/)
 - [Yarn](https://yarnpkg.com/)
-- [Ember CLI](https://ember-cli.com/)
+- [Ember CLI](https://cli.emberjs.com/release/)
+- [Google Chrome](https://google.com/chrome/)
 
 ## Installation
 
@@ -63,7 +64,7 @@ with the bundle.
 ## Further Reading / Useful Links
 
 - [ember.js](https://emberjs.com/)
-- [ember-cli](https://ember-cli.com/)
+- [ember-cli](https://cli.emberjs.com/release/)
 - Development Browser Extensions
   - [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   - [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -2,8 +2,7 @@
 <html class="h-full" lang="en">
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>ConduitUI</title>
+    <title>ConduitUi</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 

diff --git a/ui/config/ember-cli-update.json b/ui/config/ember-cli-update.json
@@ -3,7 +3,7 @@
   "packages": [
     {
       "name": "ember-cli",
-      "version": "4.0.1",
+      "version": "4.8.0",
       "blueprints": [
         {
           "name": "app",

diff --git a/ui/config/environment.js b/ui/config/environment.js
@@ -9,18 +9,14 @@ module.exports = function (environment) {
     modulePrefix: 'conduit-ui',
     environment,
     rootURL: '/ui/',
-    locationType: 'auto',
+    locationType: 'history',
     conduitAPIURL,
     isDevMirageEnabled: process.env.ENABLE_DEV_MIRAGE === 'true' || false,
     EmberENV: {
       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/ui/ember-cli-build.js b/ui/ember-cli-build.js
@@ -4,7 +4,7 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 const autoprefixer = require('autoprefixer');
 
 module.exports = function (defaults) {
-  let app = new EmberApp(defaults, {
+  const app = new EmberApp(defaults, {
     postcssOptions: {
       compile: {
         cacheInclude: [/.*\.(css|scss|hbs)$/, /.tailwind\.config\.js$/],

diff --git a/ui/package.json b/ui/package.json
@@ -12,15 +12,15 @@
   },
   "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:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
     "start": "ember s",
     "dev-mirage": "ENABLE_DEV_MIRAGE=true ember s",
-    "test": "npm-run-all lint test:*",
+    "test": "npm-run-all --print-name \"lint\" \"test:*\"",
     "test:ember": "ember test",
     "test-coverage": "COVERAGE=true ember test"
   },
@@ -41,7 +41,7 @@
     "ember-basic-dropdown": "^6.0.1",
     "ember-changeset": "^3.15.0",
     "ember-changeset-validations": "^3.16.0",
-    "ember-cli": "~4.1.1",
+    "ember-cli": "~4.8.0",
     "ember-cli-app-version": "^5.0.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-code-coverage": "^1.0.3",
@@ -57,8 +57,7 @@
     "ember-cli-terser": "^4.0.2",
     "ember-concurrency": "^2.3.7",
     "ember-css-transitions": "^4.2.0",
-    "ember-data": "~4.0.2",
-    "ember-export-application-global": "^2.0.1",
+    "ember-data": "~4.9.1",
     "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modifier": "^3.2.7",
@@ -67,8 +66,8 @@
     "ember-resolver": "^8.1.0",
     "ember-root-url": "^1.0.1",
     "ember-sortable": "^4.0.3",
-    "ember-source": "~4.0.1",
-    "ember-template-lint": "^4.14.0",
+    "ember-source": "~4.8.0",
+    "ember-template-lint": "^4.16.1",
     "ember-test-selectors": "^6.0.0",
     "ember-tooltips": "^3.6.0",
     "ember-truth-helpers": "^3.1.1",
@@ -89,12 +88,19 @@
     "webpack": "^5.76.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"
   },
   "dependencies": {
     "pretty-print-json": "^1.4.1"
+  },
+  "resolutions": {
+    "miragejs": "~0.1.47",
+    "@embroider/macros": "^1.10.0",
+    "@embroider/util": "^1.10.0",
+    "ember-cli-babel": "^7.26.11",
+    "ember-modifier": "^3.2.7"
   }
 }
diff --git a/ui/tests/helpers/.gitkeep b/ui/tests/helpers/.gitkeep
diff --git a/ui/tests/helpers/index.js b/ui/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/ui/tests/index.html b/ui/tests/index.html
@@ -2,8 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>ConduitUI Tests</title>
+    <title>ConduitUi Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">