Skip to content

Commit 8112627

Browse files
Merge pull request #294 from ember-cli/nvp/fix-ci
Fix CI, only test against embroider.
2 parents af2428b + a20a3b3 commit 8112627

13 files changed

Lines changed: 2339 additions & 480 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
with:
1818
fetch-depth: 1
1919
- uses: wyvox/action-setup-pnpm@v3
20+
- run: pnpm build
2021
- name: Lint
2122
run: pnpm lint
2223

@@ -36,6 +37,7 @@ jobs:
3637
with:
3738
fetch-depth: 1
3839
- uses: wyvox/action-setup-pnpm@v3
40+
- run: pnpm build
3941
- name: Test
4042
run: pnpm test:ember --launch ${{ matrix.browser }}
4143
working-directory: test-app
@@ -58,6 +60,7 @@ jobs:
5860
- uses: wyvox/action-setup-pnpm@v3
5961
with:
6062
pnpm-args: '--no-lockfile'
63+
- run: pnpm build
6164
- name: Test
6265
run: pnpm test:ember --launch ${{ matrix.browser }}
6366
working-directory: test-app
@@ -116,14 +119,13 @@ jobs:
116119
matrix:
117120
ember-try-scenario:
118121
[
119-
ember-lts-3.28,
122+
minimum-supported
120123
ember-lts-4.4,
121124
ember-lts-4.12,
125+
ember-lts-5.12,
122126
ember-release,
123-
ember-beta,
124-
ember-classic,
125-
embroider-safe,
126-
embroider-optimized,
127+
ember-beta
128+
ember-canary
127129
]
128130
allow-failure: [false]
129131
include:
@@ -135,6 +137,7 @@ jobs:
135137
with:
136138
fetch-depth: 1
137139
- uses: wyvox/action-setup-pnpm@v3
140+
- run: pnpm build
138141
- name: Test
139142
env:
140143
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
@@ -151,6 +154,8 @@ jobs:
151154
with:
152155
fetch-depth: 1
153156
- uses: wyvox/action-setup-pnpm@v3
157+
- run: pnpm build
158+
154159
- name: Test
155160
run: pnpm test:ember
156161
working-directory: docs

.npmrc

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
1-
resolution-mode=highest
2-
1+
####################
32
# super strict mode
3+
####################
44
auto-install-peers=false
5+
strict-peer-dependents=true
56
resolve-peers-from-workspace-root=false
7+
8+
################
9+
# Optimizations
10+
################
11+
# Less strict, but required for tooling to not barf on duplicate peer trees.
12+
# (many libraries declare the same peers, which resolve to the same
13+
# versions)
14+
dedupe-peer-dependents=true
15+
public-hoist-pattern[]=ember-source
16+
17+
################
18+
# Compatibility
19+
################
20+
# highest is what everyone is used to, but
21+
# not ensuring folks are actually compatible with declared ranges.
22+
resolution-mode=highest

addon/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,21 @@
7575
"@babel/plugin-proposal-class-properties": "^7.18.6",
7676
"@babel/plugin-proposal-decorators": "^7.23.6",
7777
"@embroider/addon-dev": "^4.1.3",
78-
"@glint/core": "^1.2.1",
79-
"@glint/environment-ember-loose": "^1.2.1",
80-
"@glint/environment-ember-template-imports": "^1.2.1",
81-
"@glint/template": "^1.2.1",
78+
"@glint/core": "^1.5.2",
79+
"@glint/environment-ember-loose": "^1.5.2",
80+
"@glint/environment-ember-template-imports": "^1.5.2",
81+
"@glint/template": "^1.5.2",
8282
"@rollup/plugin-babel": "^6.0.4",
8383
"@tsconfig/ember": "^3.0.3",
8484
"@types/rsvp": "^4.0.8",
8585
"@typescript-eslint/eslint-plugin": "^6.15.0",
8686
"@typescript-eslint/parser": "^6.15.0",
8787
"concurrently": "^8.2.2",
8888
"ember-source": "^5.5.0",
89-
"ember-template-lint": "^5.13.0",
89+
"ember-template-lint": "^6.1.0",
9090
"eslint": "^8.56.0",
9191
"eslint-config-prettier": "^9.1.0",
92-
"eslint-plugin-ember": "^11.12.0",
92+
"eslint-plugin-ember": "^12.5.0",
9393
"eslint-plugin-jsonc": "^2.11.2",
9494
"eslint-plugin-node": "^11.1.0",
9595
"eslint-plugin-prettier": "^5.1.2",

addon/src/services/page-title.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ export default class PageTitleService extends Service {
223223
}
224224

225225
scheduleTitleUpdate = () => {
226+
// eslint-disable-next-line ember/no-runloop
226227
scheduleOnce('afterRender', this, this._updateTitle);
227228
};
228229

docs/app/templates/docs.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262

6363
<label>
6464
Page Title
65+
{{!-- template-lint-disable no-builtin-form-components --}}
6566
<Input @type='text' @value={{@model.title}} placeholder='My App' data-test-edit-title />
6667
</label>
6768
</div>

docs/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
"@ember/test-helpers": "^3.2.1",
4444
"@glimmer/component": "^1.0.4",
4545
"@glimmer/tracking": "^1.0.4",
46-
"@glint/core": "^1.2.1",
47-
"@glint/environment-ember-loose": "^1.2.1",
48-
"@glint/environment-ember-template-imports": "^1.2.1",
49-
"@glint/template": "^1.2.1",
46+
"@glint/core": "^1.5.2",
47+
"@glint/environment-ember-loose": "^1.5.2",
48+
"@glint/environment-ember-template-imports": "^1.5.2",
49+
"@glint/template": "^1.5.2",
5050
"@tsconfig/ember": "^3.0.3",
5151
"@types/qunit": "^2.19.9",
5252
"@types/rsvp": "^4.0.8",
@@ -72,12 +72,12 @@
7272
"ember-resolver": "^11.0.1",
7373
"ember-source": "~5.5.0",
7474
"ember-source-channel-url": "^3.0.0",
75-
"ember-template-imports": "3",
76-
"ember-template-lint": "^5.13.0",
75+
"ember-template-imports": "^4.0.0",
76+
"ember-template-lint": "^6.1.0",
7777
"ember-truth-helpers": "^4.0.3",
7878
"eslint": "^8.56.0",
7979
"eslint-config-prettier": "^9.1.0",
80-
"eslint-plugin-ember": "^11.12.0",
80+
"eslint-plugin-ember": "^12.5.0",
8181
"eslint-plugin-jsonc": "^2.11.2",
8282
"eslint-plugin-node": "^11.1.0",
8383
"eslint-plugin-prettier": "^5.1.2",
@@ -103,4 +103,4 @@
103103
"extends": "../package.json"
104104
},
105105
"private": true
106-
}
106+
}

package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"build": "pnpm --filter 'ember-page-title' build",
1010
"lint": "pnpm --filter '*' lint",
1111
"lint:fix": "pnpm --filter '*' lint:fix",
12-
"prepare": "pnpm build",
1312
"test": "pnpm --filter '*' test"
1413
},
1514
"devDependencies": {
@@ -23,9 +22,6 @@
2322
"registry": "https://registry.npmjs.org"
2423
},
2524
"pnpm": {
26-
"patchedDependencies": {
27-
28-
},
2925
"peerDependencyRules": {
3026
"ignoreMissing": [
3127
"rsvp",

patches/[email protected]

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

0 commit comments

Comments
 (0)