Skip to content

Commit c0bd30d

Browse files
Merge pull request #661 from universal-ember/upgrade-random-demos
Upgrade random deps / internal infra
2 parents 8faf89b + e41f9d8 commit c0bd30d

130 files changed

Lines changed: 3099 additions & 7259 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
timeout-minutes: 10
2424
outputs:
2525
pending: ${{ steps.set-pending.outputs.pending }}
26+
matrix: ${{ steps.set-matrix.outputs.matrix }}
27+
2628
steps:
2729
- uses: wyvox/action@v1
2830
with:
@@ -31,6 +33,9 @@ jobs:
3133
- id: set-pending
3234
run: echo "pending=$(./cache-status.sh)" >> $GITHUB_OUTPUT
3335
- run: echo ${{ github.event.number }} > ./pr-number.txt
36+
- id: set-matrix
37+
run: echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT
38+
working-directory: test-app
3439

3540
# Every PR will need linting. Turbo's cache can optimize per-package
3641
lint:
@@ -57,7 +62,7 @@ jobs:
5762
- uses: wyvox/action@v1
5863
with:
5964
repo-token: ${{ secrets.GITHUB_TOKEN }}
60-
node-version: 18.18.1
65+
node-version: 22
6166
- run: pnpm build
6267
- run: pnpm i -f # sync for some reason isn't running before lint
6368
- run: pnpm turbo test --filter test-app
@@ -77,34 +82,30 @@ jobs:
7782
- run: pnpm i -f # sync for some reason isn't running before lint
7883
- run: pnpm turbo test --filter test-app
7984

80-
try-scenarios:
81-
name: ${{ matrix.try-scenario }}
85+
compatibility:
86+
needs: ["test", "setup"]
8287
runs-on: ubuntu-latest
83-
needs: [test]
8488
timeout-minutes: 10
85-
# if: ${{ fromJSON(needs.setup.outputs.pending).test-app.test.status == 'MISS' }}
8689
strategy:
8790
fail-fast: false
88-
matrix:
89-
try-scenario:
90-
- ember-lts-4.12
91-
- ember-5.1
92-
- ember-5.12
93-
- ember-6.4
94-
- ember-6.8
95-
- ember-release
96-
- ember-beta
97-
- ember-canary
91+
matrix: ${{fromJson(needs.setup.outputs.matrix)}}
92+
93+
name: "${{ matrix.name }}"
9894

9995
steps:
10096
- uses: wyvox/action@v1
10197
with:
10298
repo-token: ${{ secrets.GITHUB_TOKEN }}
103-
node-version: 18.18.1
10499
- run: pnpm build
105100
- run: pnpm i -f # sync for some reason isn't running before lint
101+
- name: Apply Scenario
102+
run: pnpm dlx @embroider/try apply ${{ matrix.name }}
103+
working-directory: test-app
104+
- name: Install Dependencies
105+
run: pnpm install --no-lockfile
106106
- name: Run Tests
107-
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }} --skip-cleanup
107+
run: pnpm test:ember
108+
env: ${{ matrix.env }}
108109
working-directory: test-app
109110

110111
# NOTE: Docs' types don't need checking because we check types in the

.vscode/mcp.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"servers": {
3+
"chrome-devtools": {
4+
"command": "pnpm",
5+
"args": ["dlx", "chrome-devtools-mcp@latest"]
6+
},
7+
"ember": {
8+
"command": "pnpm",
9+
"args": ["dlx", "ember-mcp"]
10+
}
11+
},
12+
"inputs": []
13+
}

dev/.prettierignore

Lines changed: 0 additions & 28 deletions
This file was deleted.

dev/bin/lint.js

Lines changed: 0 additions & 108 deletions
This file was deleted.

dev/bin/todo.js

Lines changed: 0 additions & 47 deletions
This file was deleted.

dev/eslint.config.mjs

Lines changed: 0 additions & 4 deletions
This file was deleted.

dev/package.json

Lines changed: 0 additions & 37 deletions
This file was deleted.

docs-app/.ember-cli

Lines changed: 0 additions & 16 deletions
This file was deleted.

docs-app/.prettierrc.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
'use strict';
2-
3-
module.exports = {
1+
export default {
42
printWidth: 100,
53
plugins: ['prettier-plugin-ember-template-tag'],
64
overrides: [

docs-app/app/app.ts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import 'decorator-transforms/globals';
22
import './styles/app.css';
33

4-
import Application from '@ember/application';
5-
import compatModules from '@embroider/virtual/compat-modules';
6-
7-
import loadInitializers from 'ember-load-initializers';
4+
import PageTitleService from 'ember-page-title/services/page-title';
85
import { sync } from 'ember-primitives/color-scheme';
9-
import Resolver from 'ember-resolver';
6+
import Application from 'ember-strict-application-resolver';
107

11-
import config from './config/environment';
128
import { install } from './icons';
139

1410
sync();
@@ -24,9 +20,10 @@ Object.assign(window, {
2420
});
2521

2622
export default class App extends Application {
27-
modulePrefix = config.modulePrefix;
28-
podModulePrefix = config.podModulePrefix;
29-
Resolver = Resolver.withModules(compatModules);
23+
modules = {
24+
...import.meta.glob('./router.ts', { eager: true }),
25+
...import.meta.glob('./templates/**/*.{gjs,gts,md}', { eager: true }),
26+
...import.meta.glob('./routes/**/*.{gjs,gts,js,ts,md}', { eager: true }),
27+
'./services/page-title': PageTitleService,
28+
};
3029
}
31-
32-
loadInitializers(App, config.modulePrefix, compatModules);

0 commit comments

Comments
 (0)