Upgrade torii to 1.0.0-beta.1

mainmatter · Jan 30, 2023 · bb4e962 · bb4e962
1 parent a7e583c
commit bb4e962
Show file tree

Hide file tree

Showing 6 changed files with 289 additions and 1,120 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
-      
+
       - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
         id: yarn-cache
         with:
@@ -57,13 +57,11 @@ jobs:
           - classic-test-app
           - test-app
         test-suite:
-          - test:one ember-lts-3.12
-          - test:one ember-lts-3.16
-          - test:one ember-lts-3.20
           - test:one ember-lts-3.24
           - test:one ember-lts-3.28
           - test:one ember-4.0
           - test:one ember-lts-4.4
+          - test:one ember-lts-4.8
         allow-failure: [false]
         include:
           - workspace: ember-simple-auth
@@ -98,7 +96,7 @@ jobs:
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
-      
+
       - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
         id: yarn-cache
         with:
@@ -133,7 +131,7 @@ jobs:
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
-      
+
       - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
         id: yarn-cache
         with:
@@ -161,7 +159,7 @@ jobs:
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
-      
+
       - uses: actions/cache@56461b9eb0f8438fd15c7a9968e3c9ebb18ceff1 # tag=v3
         id: yarn-cache
         with:

diff --git a/packages/classic-test-app/package.json b/packages/classic-test-app/package.json
@@ -37,7 +37,7 @@
     "pretender": "3.4.7",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "~3.17.0",
+    "ember-data": "~4.4.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-engines": "^0.8.22",
     "ember-export-application-global": "^2.0.1",
@@ -63,7 +63,7 @@
     "npm-run-all": "^4.1.5",
     "qunit": "^2.17.2",
     "qunit-dom": "^2.0.0",
-    "torii": "^0.10.0",
+    "torii": "^1.0.0-beta.1",
     "webpack": "^5.74.0"
   },
   "fastbootDependencies": [

diff --git a/packages/ember-simple-auth/config/ember-try.js b/packages/ember-simple-auth/config/ember-try.js
@@ -15,33 +15,6 @@ module.exports = function() {
     return {
       useYarn: true,
       scenarios: [
-        {
-          name: 'ember-lts-3.12',
-          npm: {
-            devDependencies: {
-              'ember-data': '~3.12.0',
-              'ember-source': '~3.12.0',
-            },
-          },
-        },
-        {
-          name: 'ember-lts-3.16',
-          npm: {
-            devDependencies: {
-              'ember-data': '~3.16.0',
-              'ember-source': '~3.16.0',
-            },
-          },
-        },
-        {
-          name: 'ember-lts-3.20',
-          npm: {
-            devDependencies: {
-              'ember-data': '~3.20.0',
-              'ember-source': '~3.20.0',
-            },
-          },
-        },
         {
           name: 'ember-lts-3.24',
           npm: {
@@ -58,7 +31,6 @@ module.exports = function() {
               'ember-cli': '~3.28.0',
               'ember-data': '~3.28.0',
               'ember-source': '~3.28.0',
-              torii: null,
             },
           },
         },
@@ -74,7 +46,6 @@ module.exports = function() {
               '@ember/test-helpers': '^2.4.2',
               'ember-qunit': '^5.1.4',
               qunit: '^2.17.2',
-              torii: null,
               'ember-cli-app-version': '~5.0.0',
               '@ember/legacy-built-in-components': "~0.4.0",
             },
@@ -92,7 +63,23 @@ module.exports = function() {
               '@ember/test-helpers': '^2.4.2',
               'ember-qunit': '^5.1.4',
               qunit: '^2.17.2',
-              torii: null,
+              'ember-cli-app-version': '~5.0.0',
+              '@ember/legacy-built-in-components': "~0.4.0",
+            },
+          },
+        },
+        {
+          name: 'ember-lts-4.8',
+          npm: {
+            devDependencies: {
+              'ember-cli': '~3.28.0',
+              'ember-data': '~4.8.0',
+              'ember-source': '~4.8.0',
+              'ember-auto-import': '^2.2.3',
+              webpack: '^5.0.0',
+              '@ember/test-helpers': '^2.4.2',
+              'ember-qunit': '^5.1.4',
+              qunit: '^2.17.2',
               'ember-cli-app-version': '~5.0.0',
               '@ember/legacy-built-in-components': "~0.4.0",
             },
@@ -112,7 +99,6 @@ module.exports = function() {
               qunit: '^2.17.2',
               'ember-cli-app-version': '~5.0.0',
               '@ember/legacy-built-in-components': "~0.4.0",
-              torii: null,
             },
           },
         },
@@ -130,7 +116,6 @@ module.exports = function() {
               qunit: '^2.17.2',
               'ember-cli-app-version': '~5.0.0',
               '@ember/legacy-built-in-components': "~0.4.0",
-              torii: null,
             },
           },
         },
@@ -148,7 +133,6 @@ module.exports = function() {
               qunit: '^2.17.2',
               'ember-cli-app-version': '~5.0.0',
               '@ember/legacy-built-in-components': "~0.4.0",
-              torii: null,
             },
           },
         },
@@ -161,7 +145,6 @@ module.exports = function() {
         embroiderSafe({
           npm: {
             devDependencies: {
-              torii: null,
               'ember-data': '~4.4.0',
             }
           }

diff --git a/packages/ember-simple-auth/package.json b/packages/ember-simple-auth/package.json
@@ -49,7 +49,7 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-cli-yuidoc": "^0.9.1",
-    "ember-data": "~3.18.0",
+    "ember-data": "~4.4.0",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.1",
@@ -75,7 +75,7 @@
     "qunit": "^2.17.2",
     "qunit-dom": "^2.0.0",
     "sinon": "15.0.0",
-    "torii": "^0.10.0",
+    "torii": "^1.0.0-beta.1",
     "webpack": "^5.74.0"
   },
   "engines": {

diff --git a/packages/test-app/package.json b/packages/test-app/package.json
@@ -38,7 +38,7 @@
     "pretender": "3.4.7",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "~3.17.0",
+    "ember-data": "~4.4.0",
     "ember-disable-prototype-extensions": "^1.1.2",
     "ember-engines": "^0.8.22",
     "ember-export-application-global": "^2.0.1",
@@ -66,7 +66,7 @@
     "npm-run-all": "^4.1.5",
     "qunit": "^2.17.2",
     "qunit-dom": "^2.0.0",
-    "torii": "^0.10.0",
+    "torii": "^1.0.0-beta.1",
     "webpack": "^5.74.0"
   },
   "fastbootDependencies": [