Merge pull request #106 from ember-cli/merge-beta-main

Merge beta into main

Author: mansona

.github/workflows/ci.yml

@@ -16,20 +16,32 @@ jobs:
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           cache: pnpm
       - run: pnpm install --frozen-lockfile
       - run: pnpm lint
 
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: pnpm
+      - name: Set TEMP to D:/Temp on windows
+        if: ${{matrix.os}} == windows-latest
+        run: |
+          mkdir "D:\\Temp"
+          echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
       - run: pnpm install --frozen-lockfile
       - run: pnpm test

files/README.md

@@ -11,7 +11,6 @@ You will need the following things properly installed on your computer.
 - [Node.js](https://nodejs.org/)<% if (pnpm) { %>
 - [pnpm](https://pnpm.io/)<% } else if (yarn) { %>
 - [Yarn](https://yarnpkg.com/)<% } else { %> (with npm)<% } %>
-- [Ember CLI](https://cli.emberjs.com/release/)
 - [Google Chrome](https://google.com/chrome/)
 
 ## Installation
@@ -28,12 +27,11 @@ You will need the following things properly installed on your computer.
 
 ### Code Generators
 
-Make use of the many generators for code, try `ember help generate` for more details
+Make use of the many generators for code, try `<%= execBinPrefix %> ember help generate` for more details
 
 ### Running Tests
 
 - `<%= invokeScriptPrefix %> test`
-- `<%= invokeScriptPrefix %> test <% if (npm) { %>-- <% } %>--server`
 
 ### Linting
 
@@ -42,7 +40,7 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 ### Building
 
-- `<%= execBinPrefix %> ember build` (development)
+- `<%= execBinPrefix %> vite build --mode development` (development)
 - `<%= invokeScriptPrefix %> build` (production)
 
 ### Deploying
@@ -52,7 +50,7 @@ Specify what it takes to deploy your app.
 ## Further Reading / Useful Links
 
 - [ember.js](https://emberjs.com/)
-- [ember-cli](https://cli.emberjs.com/release/)
+- [Vite](https://vite.dev)
 - Development Browser Extensions
   - [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
   - [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)

files/app/app.ts

@@ -4,6 +4,7 @@ import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from '<%= modulePrefix %>/config/environment';
 import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
+import setupInspector from '@embroider/legacy-inspector-support/ember-source-4.12';
 
 if (macroCondition(isDevelopingApp())) {
   importSync('./deprecation-workflow');
@@ -13,6 +14,7 @@ export default class App extends Application {
   modulePrefix = config.modulePrefix;
   podModulePrefix = config.podModulePrefix;
   Resolver = Resolver.withModules(compatModules);
+  inspector = setupInspector(this);
 }
 
 loadInitializers(App, config.modulePrefix, compatModules);

files/app/config/environment.ts

@@ -26,6 +26,7 @@ assert(
 
 export default config as {
   modulePrefix: string;
+  podModulePrefix?: string;
   locationType: string;
   rootURL: string;
   APP: Record<string, unknown>;

files/app/services/.gitkeep

@@ -24,18 +24,18 @@
     "lint:js:fix": "eslint . --fix<% if (typescript) { %>",
     "lint:types": "glint<% } %>",
     "start": "vite",
-    "test": "vite build --mode development && testem ci"
+    "test": "vite build --mode development && ember test --path dist"
   },
   "exports": {
     "./tests/*": "./tests/*",
     "./*": "./app/*"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.3",
-    "@babel/runtime": "^7.28.3",
+    "@babel/core": "^7.28.4",
+    "@babel/runtime": "^7.28.4",
     "@babel/plugin-transform-runtime": "^7.28.3<% if (typescript) { %>",
     "@babel/plugin-transform-typescript": "^7.28.0<% } %>",
-    "@babel/eslint-parser": "^7.28.0<% if (typescript && emberData) { %>",
+    "@babel/eslint-parser": "^7.28.4<% if (typescript && emberData) { %>",
     "@ember-data/adapter": "~5.6.0",
     "@ember-data/graph": "~5.6.0",
     "@ember-data/json-api": "~5.6.0",
@@ -48,20 +48,21 @@
     "@ember/app-tsconfig": "^1.0.3<% } %>",
     "@ember/optional-features": "^2.2.0",
     "@ember/string": "^4.0.1",
-    "@ember/test-helpers": "^5.2.2",
+    "@ember/test-helpers": "^5.3.0",
     "@ember/test-waiters": "^4.1.1",
-    "@embroider/macros": "^1.18.1",
-    "@embroider/core": "^4.1.3",
-    "@embroider/vite": "^1.2.0",
-    "@embroider/compat": "^4.1.3",
-    "@embroider/router": "^3.0.3",
+    "@embroider/macros": "^1.19.1",
+    "@embroider/core": "^4.2.4",
+    "@embroider/vite": "^1.3.2",
+    "@embroider/compat": "^4.1.7",
+    "@embroider/router": "^3.0.4",
     "@embroider/config-meta-loader": "^1.0.0",
-    "@eslint/js": "^9.34.0",
+    "@embroider/legacy-inspector-support": "^0.1.3",
+    "@eslint/js": "^9.37.0",
     "@glimmer/component": "^2.0.0<% if (typescript) { %>",
     "@glint/core": "^1.5.2",
     "@glint/environment-ember-loose": "^1.5.2",
     "@glint/environment-ember-template-imports": "^1.5.2",
-    "@glint/template": "^1.5.2<% } %>",
+    "@glint/template": "^1.6.1<% } %>",
     "@rollup/plugin-babel": "^6.0.4<% if (typescript) { %>",
     "@types/qunit": "^2.19.13",
     "@types/rsvp": "^4.0.9<% if (emberData) {%>",
@@ -70,36 +71,36 @@
     "babel-plugin-ember-template-compilation": "^2.4.1",
     "concurrently": "^9.2.1",
     "decorator-transforms": "^2.3.0",
-    "ember-auto-import": "^2.10.0",
-    "ember-cli": "^6.6.0",
+    "ember-auto-import": "^2.11.1",
+    "ember-cli": "~6.9.0-alpha.1",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-deprecation-workflow": "^3.4.0<% if (emberData) { %>",
     "ember-data": "~5.6.0<% } %>",
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "^4.2.2",
     "ember-page-title": "^9.0.3",
-    "ember-qunit": "^9.0.3",
+    "ember-qunit": "^9.0.4",
     "ember-resolver": "^13.1.1",
-    "ember-source": "~6.8.0-alpha.7",
+    "ember-source": "~6.9.0-alpha.6",
     "ember-template-lint": "^7.9.3<% if (welcome) { %>",
     "ember-welcome-page": "^7.0.2<% } %>",
-    "eslint": "^9.34.0",
+    "eslint": "^9.37.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-ember": "^12.7.3",
-    "eslint-plugin-n": "^17.21.3",
+    "eslint-plugin-ember": "^12.7.4",
+    "eslint-plugin-n": "^17.23.1",
     "eslint-plugin-qunit": "^8.2.5",
-    "globals": "^16.3.0",
+    "globals": "^16.4.0",
     "prettier": "^3.6.2",
     "prettier-plugin-ember-template-tag": "^2.1.0",
-    "qunit": "^2.24.1",
+    "qunit": "^2.24.2",
     "qunit-dom": "^3.5.0",
-    "stylelint": "^16.23.1",
+    "stylelint": "^16.25.0",
     "stylelint-config-standard": "^38.0.0",
     "testem": "^3.16.0",
     "tracked-built-ins": "^4.0.0<% if (typescript) { %>",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.42.0<% } %>",
-    "vite": "^6.3.5"
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.0<% } %>",
+    "vite": "^7.1.9"
   },
   "engines": {
     "node": ">= 18"

files/package.json

@@ -3,7 +3,6 @@
 if (typeof module !== 'undefined') {
   module.exports = {
     test_page: 'tests/index.html?hidepassed',
-    cwd: 'dist',
     disable_watching: true,
     launch_in_ci: ['Chrome'],
     launch_in_dev: ['Chrome'],

files/testem.cjs

@@ -49,7 +49,7 @@
     "release-plan": "^0.16.0",
     "strip-ansi": "^7.1.0",
     "tmp-promise": "^3.0.3",
-    "vitest": "^3.1.2"
+    "vitest": "^4.0.0-beta.17"
   },
   "packageManager": "[email protected]"
 }