Merge branch 'mainmatter:master' into chore/drop-ie11-targets

mainmatter · Jun 23, 2023 · aa853de · aa853de
2 parents 0a74333 + 013e56b
commit aa853de
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 35 deletions.
diff --git a/packages/classic-test-app/package.json b/packages/classic-test-app/package.json
@@ -32,7 +32,7 @@
     "ember-cli": "~4.3.0",
     "ember-cli-babel": "^7.20.1",
     "ember-cli-content-security-policy": "~1.1.1",
-    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-fastboot": "^4.0.0",
     "ember-cli-htmlbars": "^6.0.0",
     "ember-cli-inject-live-reload": "^2.0.1",
@@ -41,15 +41,15 @@
     "ember-data": "~4.10.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-engines": "^0.9.0",
-    "ember-fetch": "^8.0.1",
+    "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "6.0.0",
     "ember-resolver": "^10.0.0",
     "ember-simple-auth": "6.0.0-rc.1",
     "ember-source": "~4.4.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-try": "^2.0.0",
+    "ember-try": "3.0.0-beta.1",
     "eslint": "^8.14.0",
     "eslint-config-simplabs": "^0.4.0",
     "eslint-plugin-ember": "^10.6.0",

diff --git a/packages/ember-simple-auth/config/ember-try.js b/packages/ember-simple-auth/config/ember-try.js
@@ -61,8 +61,7 @@ module.exports = function() {
             devDependencies: {
               'ember-cli': '~4.12.0',
               'ember-source': '~4.12.0',
-              // ember-data >=4.12 breaks under fastboot
-              // 'ember-data': '~4.12.0',
+              'ember-data': '~4.12.0',
             },
           },
         },
@@ -71,8 +70,7 @@ module.exports = function() {
           npm: {
             devDependencies: {
               'ember-cli': 'latest',
-              // ember-data >=4.12 breaks under fastboot
-              // 'ember-data': 'latest',
+              'ember-data': 'latest',
               'ember-source': releaseUrl,
               torii: null,
             },
@@ -83,8 +81,7 @@ module.exports = function() {
           npm: {
             devDependencies: {
               'ember-cli': 'beta',
-              // ember-data >=4.12 breaks under fastboot
-              // 'ember-data': 'beta',
+              'ember-data': 'beta',
               'ember-source': betaUrl,
               torii: null,
             },
@@ -95,8 +92,7 @@ module.exports = function() {
           npm: {
             devDependencies: {
               'ember-cli': 'beta',
-              // ember-data >=4.12 breaks under fastboot
-              // 'ember-data': 'canary',
+              'ember-data': 'canary',
               'ember-source': canaryUrl,
               torii: null,
             },

diff --git a/packages/ember-simple-auth/package.json b/packages/ember-simple-auth/package.json
@@ -43,22 +43,22 @@
     "ember-cli": "~4.3.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-content-security-policy": "~1.1.1",
-    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-htmlbars": "^6.0.0",
     "ember-cli-inject-live-reload": "^2.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-fetch": "^8.0.1",
+    "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "6.0.0",
     "ember-resolver": "^10.0.0",
     "ember-source": "~4.4.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-test-selectors": "^6.0.0",
-    "ember-try": "^2.0.0",
+    "ember-try": "3.0.0-beta.1",
     "eslint": "^8.14.0",
     "eslint-config-simplabs": "^0.4.0",
     "eslint-plugin-ember": "^10.6.0",
@@ -87,7 +87,7 @@
     }
   },
   "peerDependencies": {
-    "ember-fetch": "^8.0.1"
+    "ember-fetch": "^8"
   },
   "ember": {
     "edition": "octane"

diff --git a/packages/test-app/package.json b/packages/test-app/package.json
@@ -32,7 +32,7 @@
     "ember-cli": "~4.3.0",
     "ember-cli-babel": "^7.20.1",
     "ember-cli-content-security-policy": "~1.1.1",
-    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-fastboot": "^4.0.0",
     "ember-cli-fastboot-testing": "^0.6.0",
     "ember-cli-htmlbars": "^6.0.0",
@@ -42,15 +42,15 @@
     "ember-data": "~4.4.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-engines": "^0.9.0",
-    "ember-fetch": "^8.0.1",
+    "ember-fetch": "^8.1.2",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^1.0.0",
     "ember-qunit": "6.0.0",
     "ember-resolver": "^10.0.0",
     "ember-simple-auth": "6.0.0-rc.1",
     "ember-source": "~4.4.0",
     "ember-source-channel-url": "^3.0.0",
-    "ember-try": "^2.0.0",
+    "ember-try": "3.0.0-beta.1",
     "eslint": "^8.14.0",
     "eslint-config-simplabs": "^0.4.0",
     "eslint-plugin-ember": "^10.6.0",

diff --git a/yarn.lock b/yarn.lock
@@ -4152,7 +4152,7 @@ chalk@^1.0.0, chalk@^1.1.1:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -5248,16 +5248,16 @@ ember-cli-content-security-policy@~1.1.1:
     body-parser "^1.17.0"
     chalk "^2.0.0"
 
-ember-cli-dependency-checker@^3.2.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.3.1.tgz#16b44d7a1a1e946f59859fad97f32e616d78323a"
-  integrity sha512-Tg6OeijjXNKWkDm6057Tr0N9j9Vlz/ITewXWpn1A/+Wbt3EowBx5ZKfvoupqz05EznKgL1B/ecG0t+JN7Qm6MA==
+ember-cli-dependency-checker@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.3.2.tgz#94ed7e8e3d47e494082eb9ccfaa489d603ab6017"
+  integrity sha512-PwkrW5oYsdPWwt+0Tojufmv/hxVETTjkrEdK7ANQB2VSnqpA5UcYubwpQM9ONuR2J8wyNDMwEHlqIrk/FYtBsQ==
   dependencies:
-    chalk "^2.3.0"
-    find-yarn-workspace-root "^1.1.0"
+    chalk "^2.4.2"
+    find-yarn-workspace-root "^1.2.1"
     is-git-url "^1.0.0"
-    resolve "^1.5.0"
-    semver "^5.3.0"
+    resolve "^1.22.0"
+    semver "^5.7.1"
 
 ember-cli-fastboot-testing@^0.6.0:
   version "0.6.0"
@@ -5750,7 +5750,7 @@ ember-engines@^0.9.0:
     ember-cli-version-checker "^5.1.2"
     lodash "^4.17.11"
 
-ember-fetch@^8.0.1:
+ember-fetch@^8.1.2:
   version "8.1.2"
   resolved "https://registry.yarnpkg.com/ember-fetch/-/ember-fetch-8.1.2.tgz#651839780519319309127054786bf35cd4b84543"
   integrity sha512-TVx24/jrvDIuPL296DV0hBwp7BWLcSMf0I8464KGz01sPytAB+ZAePbc9ooBTJDkKZEGFgatJa4nj3yF1S9Bpw==
@@ -5890,18 +5890,18 @@ ember-try-config@^4.0.0:
     remote-git-tags "^3.0.0"
     semver "^7.3.2"
 
-ember-try@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-2.0.0.tgz#2671c221f5a0335fa2c189d00db7146e2e72a1dd"
-  integrity sha512-2N7Vic45sbAegA5fhdfDjVbEVS4r+ze+tTQs2/wkY+8fC5yAGHfCM5ocyoTfBN5m7EhznC3AyMsOy4hLPzHFSQ==
+ember-try@3.0.0-beta.1:
+  version "3.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-3.0.0-beta.1.tgz#2809d95ac48f72d989516e20ea589b6ca856ea91"
+  integrity sha512-L8Nuy1iJZQmaEvxycTXCKe67K85f44DLRvwZL5ow8WtPdaZQuAHs9fJmYEGI1uyymf4MJChu6wwyh3tLSHiCag==
   dependencies:
     chalk "^4.1.2"
     cli-table3 "^0.6.0"
     core-object "^3.1.5"
     debug "^4.3.2"
     ember-try-config "^4.0.0"
     execa "^4.1.0"
-    fs-extra "^9.0.1"
+    fs-extra "^6.0.1"
     resolve "^1.20.0"
     rimraf "^3.0.2"
     walk-sync "^2.2.0"
@@ -6860,7 +6860,7 @@ find-up@^4.0.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-yarn-workspace-root@^1.1.0:
+find-yarn-workspace-root@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
   integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
@@ -7101,6 +7101,15 @@ fs-extra@^5.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@^7.0.0, fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -11940,7 +11949,7 @@ semver-diff@^4.0.0:
   dependencies:
     semver "^7.3.5"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==