Skip to content

Commit

Permalink
Merge pull request #294 from ember-cli/nvp/fix-ci
Browse files Browse the repository at this point in the history
Fix CI, only test against embroider.
  • Loading branch information
NullVoxPopuli authored Feb 18, 2025
2 parents af2428b + a20a3b3 commit 8112627
Show file tree
Hide file tree
Showing 13 changed files with 2,339 additions and 480 deletions.
15 changes: 10 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
with:
fetch-depth: 1
- uses: wyvox/action-setup-pnpm@v3
- run: pnpm build
- name: Lint
run: pnpm lint

Expand All @@ -36,6 +37,7 @@ jobs:
with:
fetch-depth: 1
- uses: wyvox/action-setup-pnpm@v3
- run: pnpm build
- name: Test
run: pnpm test:ember --launch ${{ matrix.browser }}
working-directory: test-app
Expand All @@ -58,6 +60,7 @@ jobs:
- uses: wyvox/action-setup-pnpm@v3
with:
pnpm-args: '--no-lockfile'
- run: pnpm build
- name: Test
run: pnpm test:ember --launch ${{ matrix.browser }}
working-directory: test-app
Expand Down Expand Up @@ -116,14 +119,13 @@ jobs:
matrix:
ember-try-scenario:
[
ember-lts-3.28,
minimum-supported
ember-lts-4.4,
ember-lts-4.12,
ember-lts-5.12,
ember-release,
ember-beta,
ember-classic,
embroider-safe,
embroider-optimized,
ember-beta
ember-canary
]
allow-failure: [false]
include:
Expand All @@ -135,6 +137,7 @@ jobs:
with:
fetch-depth: 1
- uses: wyvox/action-setup-pnpm@v3
- run: pnpm build
- name: Test
env:
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
Expand All @@ -151,6 +154,8 @@ jobs:
with:
fetch-depth: 1
- uses: wyvox/action-setup-pnpm@v3
- run: pnpm build

- name: Test
run: pnpm test:ember
working-directory: docs
21 changes: 19 additions & 2 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
resolution-mode=highest

####################
# super strict mode
####################
auto-install-peers=false
strict-peer-dependents=true
resolve-peers-from-workspace-root=false

################
# Optimizations
################
# Less strict, but required for tooling to not barf on duplicate peer trees.
# (many libraries declare the same peers, which resolve to the same
# versions)
dedupe-peer-dependents=true
public-hoist-pattern[]=ember-source

################
# Compatibility
################
# highest is what everyone is used to, but
# not ensuring folks are actually compatible with declared ranges.
resolution-mode=highest
12 changes: 6 additions & 6 deletions addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,21 @@
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.23.6",
"@embroider/addon-dev": "^4.1.3",
"@glint/core": "^1.2.1",
"@glint/environment-ember-loose": "^1.2.1",
"@glint/environment-ember-template-imports": "^1.2.1",
"@glint/template": "^1.2.1",
"@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",
"@rollup/plugin-babel": "^6.0.4",
"@tsconfig/ember": "^3.0.3",
"@types/rsvp": "^4.0.8",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"concurrently": "^8.2.2",
"ember-source": "^5.5.0",
"ember-template-lint": "^5.13.0",
"ember-template-lint": "^6.1.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-ember": "^12.5.0",
"eslint-plugin-jsonc": "^2.11.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^5.1.2",
Expand Down
1 change: 1 addition & 0 deletions addon/src/services/page-title.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ export default class PageTitleService extends Service {
}

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

Expand Down
1 change: 1 addition & 0 deletions docs/app/templates/docs.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@

<label>
Page Title
{{!-- template-lint-disable no-builtin-form-components --}}
<Input @type='text' @value={{@model.title}} placeholder='My App' data-test-edit-title />
</label>
</div>
Expand Down
16 changes: 8 additions & 8 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
"@ember/test-helpers": "^3.2.1",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"@glint/core": "^1.2.1",
"@glint/environment-ember-loose": "^1.2.1",
"@glint/environment-ember-template-imports": "^1.2.1",
"@glint/template": "^1.2.1",
"@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",
"@tsconfig/ember": "^3.0.3",
"@types/qunit": "^2.19.9",
"@types/rsvp": "^4.0.8",
Expand All @@ -72,12 +72,12 @@
"ember-resolver": "^11.0.1",
"ember-source": "~5.5.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-imports": "3",
"ember-template-lint": "^5.13.0",
"ember-template-imports": "^4.0.0",
"ember-template-lint": "^6.1.0",
"ember-truth-helpers": "^4.0.3",
"eslint": "^8.56.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-ember": "^12.5.0",
"eslint-plugin-jsonc": "^2.11.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^5.1.2",
Expand All @@ -103,4 +103,4 @@
"extends": "../package.json"
},
"private": true
}
}
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"build": "pnpm --filter 'ember-page-title' build",
"lint": "pnpm --filter '*' lint",
"lint:fix": "pnpm --filter '*' lint:fix",
"prepare": "pnpm build",
"test": "pnpm --filter '*' test"
},
"devDependencies": {
Expand All @@ -23,9 +22,6 @@
"registry": "https://registry.npmjs.org"
},
"pnpm": {
"patchedDependencies": {
"ember-cli-fastboot@4.1.2": "patches/ember-cli-fastboot@4.1.2.patch"
},
"peerDependencyRules": {
"ignoreMissing": [
"rsvp",
Expand Down
13 changes: 0 additions & 13 deletions patches/ember-cli-fastboot@4.1.2.patch

This file was deleted.

Loading

0 comments on commit 8112627

Please sign in to comment.