Merge remote-tracking branch 'origin/master' into feat/config-function

SergeAstapov · SergeAstapov · commit 1d51aef773bc · 2023-03-28T14:22:46.000-04:00
diff --git a/.ember-cli b/.ember-cli
@@ -8,8 +8,8 @@
   "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.
+    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/.eslintrc.js b/.eslintrc.js
@@ -49,8 +49,7 @@ module.exports = {
         browser: false,
         node: true,
       },
-      plugins: ['node'],
-      extends: ['plugin:node/recommended'],
+      extends: ['plugin:n/recommended'],
     },
     {
       // test files
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,13 +16,14 @@ 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: 14.x # ember-cli-addon-docs requires Node.js 14
+          node-version: 14.x
           cache: yarn
 
       - name: Install Dependencies
@@ -37,6 +38,7 @@ jobs:
   floating:
     name: "Floating Dependencies"
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v3
@@ -73,14 +75,15 @@ jobs:
     name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
     needs: "test"
+    timeout-minutes: 10
 
     strategy:
       fail-fast: false
       matrix:
         try-scenario:
-          - ember-lts-3.20
-          - ember-lts-3.24
           - ember-lts-3.28
+          - ember-lts-4.4
+          - ember-lts-4.8
           - fastboot-1.2
           - fastboot-2.0
           - ember-release
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
 /dist/
 /tmp/
@@ -23,9 +22,10 @@
 # ember-try
 /.node_modules.ember-try/
 /bower.json.ember-try
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
-
-.DS_Store
+/package-lock.json.ember-try
+/yarn.lock.ember-try
 
 # broccoli-debug
 /DEBUG/
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,5 +1,12 @@
 'use strict';
 
 module.exports = {
-  singleQuote: true,
+  overrides: [
+    {
+      files: '*.{js,ts}',
+      options: {
+        singleQuote: true,
+      },
+    },
+  ],
 };
diff --git a/addon-test-support/index.js b/addon-test-support/index.js
@@ -16,7 +16,7 @@ export function setup(hooks) {
 }
 
 /**
- * TODO
+ * @todo
  *
  * @example
  * ```
@@ -32,7 +32,7 @@ export function setup(hooks) {
  * @param {Integer} [options.destroyAppInstanceInMs] whether to destroy the instance in the given number of ms. This is a failure mechanism to not wedge the Node process (See: https://github.com/ember-fastboot/fastboot/issues/90)
  * @param {ClientRequest} [options.request] Node's `ClientRequest` object is provided to the Ember application via the FastBoot service.
  * @param {ClientResponse} [options.response] Node's `ServerResponse` object is provided to the Ember application via the FastBoot service.
- * @returns {Promise<Result>} result
+ * @return {Promise<Result>} result
  */
 export async function fastboot(url, options = {}) {
   let response = await fetchFromEmberCli(url, options);
@@ -47,7 +47,7 @@ export async function fastboot(url, options = {}) {
 }
 
 /**
- * TODO
+ * @todo
  *
  * @example
  * ```
@@ -63,7 +63,7 @@ export async function fastboot(url, options = {}) {
  * @param {Integer} [options.destroyAppInstanceInMs] whether to destroy the instance in the given number of ms. This is a failure mechanism to not wedge the Node process (See: https://github.com/ember-fastboot/fastboot/issues/90)
  * @param {ClientRequest} [options.request] Node's `ClientRequest` object is provided to the Ember application via the FastBoot service.
  * @param {ClientResponse} [options.response] Node's `ServerResponse` object is provided to the Ember application via the FastBoot service.
- * @returns {Promise<Result>} result
+ * @return {Promise<Result>} result
  */
 export async function visit(url, options = {}) {
   let result = await fastboot(url, options);
diff --git a/config/environment.js b/config/environment.js
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -3,8 +3,15 @@
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     // Add options here
+    '@embroider/macros': {
+      setConfig: {
+        '@ember-data/store': {
+          polyfillUUID: true,
+        },
+      },
+    },
   });
 
   app.import('vendor/tailwind.min.css');
diff --git a/package.json b/package.json
@@ -15,21 +15,21 @@
   },
   "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",
     "start": "ember serve",
-    "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",
     "test:separate-build": "yarn build --environment test && yarn test:ember --path=dist --filter 'Fastboot | basic'"
   },
   "dependencies": {
     "body-parser": "^1.20.0",
-    "ember-auto-import": "^2.4.1",
+    "ember-auto-import": "^2.6.1",
     "ember-cli-babel": "^7.26.11",
     "fastboot": "^3.0.3",
     "json-fn": "^1.1.1",
@@ -42,14 +42,16 @@
     "@babel/eslint-parser": "^7.17.0",
     "@babel/plugin-proposal-decorators": "^7.17.9",
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.7.0",
-    "@embroider/test-setup": "^1.6.0",
+    "@ember/string": "^3.0.1",
+    "@ember/test-helpers": "^2.9.3",
+    "@embroider/test-setup": "^2.1.1",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-plugin": "^4.0.7",
     "broccoli-stew": "^3.0.0",
-    "ember-cli": "~4.3.0",
+    "concurrently": "^7.6.0",
+    "ember-cli": "~4.11.0",
     "ember-cli-addon-docs": "github:ember-learn/ember-cli-addon-docs#eb825bcc1e721dbebc73e5dbd98db2ebb3026dd3",
     "ember-cli-addon-docs-yuidoc": "^1.0.0",
     "ember-cli-dependency-checker": "^3.3.1",
@@ -59,41 +61,41 @@
     "ember-cli-deploy-git-ci": "^1.0.1",
     "ember-cli-fastboot": "^3.3.0",
     "ember-cli-head": "^2.0.0",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-mirage": "^3.0.0-alpha.3",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
-    "ember-data": "~4.3.0",
-    "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
+    "ember-data": "~4.11.0",
     "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-qunit": "^5.1.5",
-    "ember-resolver": "^8.0.3",
-    "ember-source": "~4.3.0",
+    "ember-qunit": "^6.2.0",
+    "ember-resolver": "^10.0.0",
+    "ember-source": "~4.11.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^4.6.0",
+    "ember-template-lint": "^5.6.0",
     "ember-try": "^2.0.0",
     "eslint": "^8.15.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^10.6.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.2.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-plugin-ember": "^11.4.7",
+    "eslint-plugin-n": "^15.6.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-qunit": "^7.3.4",
     "loader.js": "^4.7.0",
     "miragejs": "^0.1.43",
     "najax": "^1.0.7",
-    "npm-run-all": "^4.1.5",
     "pretender": "~3.4.7",
-    "prettier": "^2.6.2",
-    "qunit": "^2.18.2",
+    "prettier": "^2.8.4",
+    "qunit": "^2.19.4",
     "qunit-dom": "^2.0.0",
     "semver": "^7.3.7",
-    "webpack": "^5.72.0"
+    "webpack": "^5.75.0"
+  },
+  "peerDependencies": {
+    "ember-source": "^3.28.0 || ^4.0.0 || ^5.0.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "12.* || 14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"
@@ -104,5 +106,8 @@
       "ember-cli-fastboot"
     ],
     "after": []
-  }
+  },
+  "fastbootDependencies": [
+    "crypto"
+  ]
 }
diff --git a/tests/dummy/config/addon-docs.js b/tests/dummy/config/addon-docs.js
@@ -0,0 +1,9 @@
+/* eslint-env node */
+'use strict';
+
+const AddonDocsConfig = require('ember-cli-addon-docs/lib/config');
+
+module.exports = class extends AddonDocsConfig {
+  // See https://ember-learn.github.io/ember-cli-addon-docs/docs/deploying
+  // for details on configuration you can override here.
+};
diff --git a/tests/dummy/config/deploy.js b/tests/dummy/config/deploy.js
@@ -0,0 +1,29 @@
+/* eslint-env node */
+'use strict';
+
+module.exports = function (deployTarget) {
+  let ENV = {
+    build: {},
+    // include other plugin configuration that applies to all deploy targets here
+  };
+
+  if (deployTarget === 'development') {
+    ENV.build.environment = 'development';
+    // configure other plugins for development deploy target here
+  }
+
+  if (deployTarget === 'staging') {
+    ENV.build.environment = 'production';
+    // configure other plugins for staging deploy target here
+  }
+
+  if (deployTarget === 'production') {
+    ENV.build.environment = 'production';
+    // configure other plugins for production deploy target here
+  }
+
+  // Note: if you need to build some configuration asynchronously, you can return
+  // a promise that resolves with the ENV object instead of returning the
+  // ENV object synchronously.
+  return ENV;
+};
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.3.0",
+      "version": "4.11.0",
       "blueprints": [
         {
           "name": "addon",
diff --git a/tests/dummy/config/ember-try.js b/tests/dummy/config/ember-try.js
@@ -8,28 +8,26 @@ module.exports = async function () {
     useYarn: true,
     scenarios: [
       {
-        name: 'ember-lts-3.20',
+        name: 'ember-lts-3.28',
         npm: {
           devDependencies: {
-            'ember-source': '~3.20.7',
-            'ember-data': '~3.20.5',
+            'ember-source': '~3.28.0',
           },
         },
       },
       {
-        name: 'ember-lts-3.24',
+        name: 'ember-lts-4.4',
         npm: {
           devDependencies: {
-            'ember-source': '~3.24.3',
-            'ember-data': '~3.24.2',
+            'ember-source': '~4.4.0',
           },
         },
       },
       {
-        name: 'ember-lts-3.28',
+        name: 'ember-lts-4.8',
         npm: {
           devDependencies: {
-            'ember-source': '~3.28.0',
+            'ember-source': '~4.8.0',
           },
         },
       },
@@ -42,6 +40,7 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': '~3.20.7',
             'ember-data': '~3.20.5',
+            'ember-qunit': '^5.1.5',
           },
         },
       },
@@ -54,6 +53,7 @@ module.exports = async function () {
           devDependencies: {
             'ember-source': '~3.20.7',
             'ember-data': '~3.20.5',
+            'ember-qunit': '^5.1.5',
           },
         },
       },
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
diff --git a/vendor/.gitkeep b/vendor/.gitkeep
diff --git a/yarn.lock b/yarn.lock
