Only use embroider in the test app (#46)

* Only use embroider * Update lockfile * Remove embroider scenarios * Remove embroider scenarios * Declare peer * Cleanup some deps * Update more deps * Update more deps * ope
universal-ember · Nov 7, 2024 · ad918c8 · ad918c8
1 parent 669d33d
commit ad918c8
Show file tree

Hide file tree

Showing 7 changed files with 1,026 additions and 1,686 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,10 +19,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: wyvox/action-setup-pnpm@v3
-      - name: Lint
-        run: pnpm lint
-      - name: Run Tests
-        run: pnpm test:ember
+      - run: pnpm i -f # force sync (injected dep)
+      - run: pnpm lint
+      - run: pnpm test:ember
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
@@ -38,12 +37,11 @@ jobs:
           - ember-release
           - ember-beta
           - ember-canary
-          - embroider-safe
-          - embroider-optimized
 
     steps:
       - uses: actions/checkout@v4
       - uses: wyvox/action-setup-pnpm@v3
+      - run: pnpm i -f # force sync (injected dep)
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup
         working-directory: test-app
diff --git a/package.json b/package.json
@@ -24,10 +24,5 @@
     "prettier-plugin-ember-template-tag": "^1.1.0",
     "release-plan": "^0.8.0"
   },
-  "packageManager": "[email protected]",
-  "pnpm": {
-    "overrides": {
-      "@types/eslint": "^9.0.0"
-    }
-  }
+  "packageManager": "[email protected]"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
-
 module.exports = async function () {
   return {
     usePnpm: true,
@@ -46,8 +44,6 @@ module.exports = async function () {
           },
         },
       },
-      embroiderSafe(),
-      embroiderOptimized(),
     ],
   };
 };
diff --git a/test-app/ember-cli-build.js b/test-app/ember-cli-build.js
@@ -10,6 +10,13 @@ module.exports = function (defaults) {
     },
   });
 
-  const { maybeEmbroider } = require('@embroider/test-setup');
-  return maybeEmbroider(app);
+  const { Webpack } = require('@embroider/webpack');
+  return require('@embroider/compat').compatBuild(app, Webpack, {
+    staticAddonTestSupportTrees: true,
+    staticAddonTrees: true,
+    staticHelpers: true,
+    staticModifiers: true,
+    staticComponents: true,
+    staticEmberSource: true,
+  });
 };
diff --git a/test-app/package.json b/test-app/package.json
@@ -13,8 +13,6 @@
   "scripts": {
     "build": "ember build --environment=production",
     "lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
-    "lint:css": "stylelint \"**/*.css\"",
-    "lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
     "lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
@@ -28,9 +26,12 @@
   "devDependencies": {
     "@babel/core": "^7.23.7",
     "@ember/optional-features": "^2.0.0",
-    "@ember/string": "^3.1.1",
-    "@ember/test-helpers": "^3.2.1",
-    "@embroider/test-setup": "^3.0.1",
+    "@ember/string": "^4.0.0",
+    "@ember/test-helpers": "^4.0.4",
+    "@embroider/compat": "^3.7.0",
+    "@embroider/core": "^3.4.19",
+    "@embroider/test-setup": "^4.0.0",
+    "@embroider/webpack": "^4.0.8",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "@glint/environment-ember-loose": "^1.3.0",
@@ -66,12 +67,11 @@
     "@types/rsvp": "^4.0.9",
     "@typescript-eslint/eslint-plugin": "^6.19.1",
     "@typescript-eslint/parser": "^6.19.1",
-    "@universal-ember/test-support": "workspace:*",
     "broccoli-asset-rev": "^3.0.0",
     "concurrently": "^8.2.2",
-    "ember-auto-import": "^2.7.2",
-    "ember-cli": "~5.6.0",
-    "ember-cli-app-version": "^6.0.1",
+    "ember-auto-import": "^2.10.0",
+    "ember-cli": "~5.12.0",
+    "ember-cli-app-version": "^7.0.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-clean-css": "^3.0.0",
     "ember-cli-dependency-checker": "^3.3.2",
@@ -81,13 +81,13 @@
     "ember-cli-terser": "^4.0.2",
     "ember-data": "~5.3.0",
     "ember-fetch": "^8.1.2",
-    "ember-load-initializers": "^2.1.2",
+    "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.1.0",
     "ember-page-title": "^8.2.0",
     "ember-qunit": "^8.0.2",
-    "ember-resolver": "^11.0.1",
-    "ember-source": "~5.6.0",
-    "ember-template-lint": "^5.13.0",
+    "ember-resolver": "^13.0.2",
+    "ember-source": "~5.12.0",
+    "ember-template-lint": "^6.0.0",
     "ember-try": "^3.0.0",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
@@ -98,10 +98,7 @@
     "loader.js": "^4.7.0",
     "prettier": "^3.2.4",
     "qunit": "^2.20.0",
-    "qunit-dom": "^2.0.0",
-    "stylelint": "^15.11.0",
-    "stylelint-config-standard": "^34.0.0",
-    "stylelint-prettier": "^4.1.0",
+    "qunit-dom": "^3.2.1",
     "tracked-built-ins": "^3.3.0",
     "typescript": "^5.3.3",
     "webpack": "^5.89.0"
@@ -113,7 +110,13 @@
     "edition": "octane"
   },
   "dependencies": {
+    "@universal-ember/test-support": "workspace:*",
     "ember-primitives": "^0.11.3",
     "expect-type": "^0.18.0"
+  },
+  "dependenciesMeta": {
+    "@universal-ember/test-support": {
+      "injected": true
+    }
   }
 }
diff --git a/test-support/package.json b/test-support/package.json
@@ -49,7 +49,7 @@
     "test": "echo 'A v2 addon does not have tests, run tests in test-app'"
   },
   "dependencies": {
-    "@ember/test-helpers": "^3.2.1",
+    "@ember/test-helpers": "^4.0.4",
     "@embroider/addon-shim": "^1.8.7",
     "decorator-transforms": "^1.0.1"
   },
@@ -90,7 +90,7 @@
     "@typescript-eslint/parser": "^6.14.0",
     "babel-plugin-ember-template-compilation": "^2.2.1",
     "concurrently": "^8.2.2",
-    "ember-template-lint": "^5.13.0",
+    "ember-template-lint": "^6.0.0",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-ember": "^11.12.0",
@@ -99,7 +99,7 @@
     "prettier": "^3.1.1",
     "prettier-plugin-ember-template-tag": "^1.1.0",
     "qunit": "^2.20.1",
-    "rollup": "^4.9.1",
+    "rollup": "^4.24.4",
     "rollup-plugin-copy": "^3.5.0",
     "typescript": "^5.3.3"
   },
@@ -116,6 +116,7 @@
     "app-js": {}
   },
   "peerDependencies": {
+    "ember-source": ">= 3.28",
     "qunit": "^2.20.1"
   }
 }