Merge pull request #575 from ef4/fix-canary

Update blueprints for ember canary compat
embroider-build · Apr 3, 2023 · 22ffabc · 22ffabc
2 parents a0a29b2 + fe4f849
commit 22ffabc
Show file tree

Hide file tree

Showing 8 changed files with 9,640 additions and 7,685 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -74,21 +74,21 @@ jobs:
         run: npm run test:node
         working-directory: packages/ember-auto-import
 
-  ie:
-    name: ie11 safety
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: volta-cli/action@v4
-        with:
-          node-version: '14'
-      - uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-      - run: npm install
-      - name: test
-        run: 'npm run test -- --filter browser-targets-transpiled:'
-        working-directory: test-scenarios
+  # ie:
+  #   name: ie11 safety
+  #   runs-on: windows-latest
+  #   steps:
+  #     - uses: actions/checkout@v1
+  #     - uses: volta-cli/action@v4
+  #       with:
+  #         node-version: '14'
+  #     - uses: actions/cache@v2
+  #       with:
+  #         path: ~/.npm
+  #         key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-node-
+  #     - run: npm install
+  #     - name: test
+  #       run: 'npm run test -- --filter browser-targets-transpiled:'
+  #       working-directory: test-scenarios
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "scripts": {
     "test": "cd test-scenarios && npm run test",
     "watch": "cd packages/ember-auto-import && npm run compile -- --watch",
-    "prepare": "cd packages/ember-auto-import && npm run compile",
-    "nom": "rm -rf node_modules packages/*/node_modules test-scenarios/node_modules types/*/node_modules"
+    "nom": "rm -rf node_modules packages/*/node_modules test-scenarios/node_modules types/*/node_modules",
+    "postinstall": "patch-package"
   },
   "workspaces": [
     "packages/*",
@@ -20,10 +20,11 @@
     "eslint-plugin-ember": "^5.0.0",
     "eslint-plugin-node": "^6.0.1",
     "eslint-plugin-prettier": "^3.3.0",
+    "patch-package": "^6.5.1",
     "prettier": "^2.2.1"
   },
   "volta": {
-    "node": "14.16.0",
+    "node": "14.21.3",
     "npm": "8.3.0"
   },
   "dependencies": {

diff --git a/packages/addon-template/package.json b/packages/addon-template/package.json
@@ -31,6 +31,7 @@
   "devDependencies": {
     "@babel/core": "^7.19.3",
     "@ember/optional-features": "^2.0.0",
+    "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.6.0",
     "@embroider/test-setup": "npm:@embroider/test-setup@latest",
     "@glimmer/component": "^1.0.4",
@@ -43,7 +44,6 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",

diff --git a/packages/app-template/package.json b/packages/app-template/package.json
@@ -24,6 +24,7 @@
   "devDependencies": {
     "@babel/core": "^7.19.3",
     "@ember/optional-features": "^2.0.0",
+    "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.6.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
@@ -38,7 +39,6 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-decorators": "^3.1.0",
-    "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
     "ember-qunit": "^5.1.5",
     "ember-resolver": "^8.0.3",
@@ -64,7 +64,7 @@
     "edition": "octane"
   },
   "volta": {
-    "node": "14.16.0",
+    "node": "14.21.3",
     "npm": "8.3.0"
   }
 }
diff --git a/packages/ember-auto-import/package.json b/packages/ember-auto-import/package.json
@@ -114,7 +114,7 @@
     ]
   },
   "volta": {
-    "node": "14.16.0",
+    "node": "14.21.3",
     "npm": "8.3.0"
   }
 }
diff --git a/patches/fastboot+4.1.0.patch b/patches/fastboot+4.1.0.patch
@@ -0,0 +1,11 @@
+diff --git a/node_modules/fastboot/src/fastboot-info.js b/node_modules/fastboot/src/fastboot-info.js
+index 50b181b..f330596 100644
+--- a/node_modules/fastboot/src/fastboot-info.js
++++ b/node_modules/fastboot/src/fastboot-info.js
+@@ -38,6 +38,5 @@ module.exports = class FastBootInfo {
+    */
+   register(instance) {
+     instance.register('info:-fastboot', this, { instantiate: false });
+-    instance.inject('service:fastboot', '_fastbootInfo', 'info:-fastboot');
+   }
+ };
diff --git a/test-scenarios/package.json b/test-scenarios/package.json
@@ -33,7 +33,7 @@
     "ember-cli-latest": "npm:ember-cli@latest",
     "ember-cli-beta": "npm:ember-cli@beta",
     "ember-cli": "git+https://github.com/ember-cli/ember-cli#master",
-    "ember-cli-fastboot": "npm:ember-cli-fastboot@3.2.0-beta.5",
+    "ember-cli-fastboot": "npm:ember-cli-fastboot@^4.1.0",
     "ember-cli-typescript-2": "npm:ember-cli-typescript@^2.0.0-beta.3",
     "ember-cli-typescript-3": "npm:ember-cli-typescript@^3.0.0",
     "ember-cli-typescript-4": "npm:ember-cli-typescript@^4.0.0-alpha.1",
@@ -51,7 +51,7 @@
     "webpack": "^5.31.0"
   },
   "volta": {
-    "node": "14.16.0",
+    "node": "14.21.3",
     "npm": "8.3.0"
   }
 }