Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: glimmer/component v2 #527

Closed
wants to merge 3 commits into from
Closed

chore: glimmer/component v2 #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4d7bf9
chore: drop unused node-sass, lockfile version update
Techn1x Nov 11, 2024
69ed155
chore: use and allow glimmer/component v2
Techn1x Nov 11, 2024
541985d
chore: CI to pnpm 9
Techn1x Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
lint:
name: Lint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- uses: actions/setup-node@v4
with:
Expand All @@ -30,63 +30,63 @@ jobs:

- name: 'Install dependencies'
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Lint
run: pnpm --filter ember-power-calendar lint

test:
name: "Tests"
name: 'Tests'
runs-on: ubuntu-latest
needs: lint

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
run: pnpm --filter test-app test:ember

floating:
name: "Floating Dependencies"
name: 'Floating Dependencies'
runs-on: ubuntu-latest
needs: lint

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- uses: actions/setup-node@v4
with:
node-version: 18.x
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
run: pnpm --filter test-app test:ember

Expand Down Expand Up @@ -114,23 +114,23 @@ jobs:

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: 'pnpm'

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
env:
EMBER_TRY_SCENARIO: ${{ matrix.try-scenario }}
Expand Down
40 changes: 20 additions & 20 deletions .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
contents: read
pages: write
id-token: write

jobs:
lint:
name: Lint
Expand All @@ -22,7 +22,7 @@ jobs:

- uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- uses: actions/setup-node@v4
with:
Expand All @@ -31,37 +31,37 @@ jobs:

- name: 'Install dependencies'
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Lint
run: pnpm --filter docs lint

test:
name: "Tests"
name: 'Tests'
runs-on: ubuntu-latest
needs: lint

steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
run: pnpm --filter docs test:ember

Expand All @@ -73,32 +73,32 @@ jobs:
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/master'))
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v3
with:
version: 8
version: 9

- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: pnpm

- name: Install Dependencies
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

- name: Run Tests
run: pnpm --filter docs build

- name: Copy 404 page
run: cp ./docs/404.html ./docs/dist/404.html

- name: Setup Pages
uses: actions/configure-pages@v5

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
Expand All @@ -114,4 +114,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
uses: actions/deploy-pages@v4
4 changes: 2 additions & 2 deletions .github/workflows/push-dist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8
version: 9
- uses: actions/setup-node@v4
with:
node-version: 18
cache: 'pnpm'
- name: Install Dependencies
run: pnpm install --frozen-lockfile

- run: pnpm build
- run: pnpm i -f # re-sync injected deps

Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@ember/test-helpers": "^4.0.4",
"@embroider/macros": "^1.16.6",
"@embroider/test-setup": "^4.0.0",
"@glimmer/component": "^1.1.2",
"@glimmer/component": "^2.0.0",
"@glimmer/tracking": "^1.1.2",
"@glint/core": "^1.4.0",
"@glint/environment-ember-loose": "^1.4.0",
Expand Down
5 changes: 2 additions & 3 deletions ember-power-calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"@glint/environment-ember-loose": "^1.4.0",
"@glint/environment-ember-template-imports": "^1.4.0",
"@glint/template": "^1.4.0",
"@glimmer/component": "^1.1.2",
"@glimmer/component": "^2.0.0",
"@glimmer/tracking": "^1.1.2",
"@rollup/plugin-babel": "^6.0.4",
"@tsconfig/ember": "^3.0.8",
Expand Down Expand Up @@ -120,7 +120,6 @@
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-n": "^17.10.2",
"eslint-plugin-prettier": "^5.2.1",
"node-sass": "^9.0.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one difference to the other EBD PR - power calendar already has sass devdep below, so I could drop node-sass here without issue

"postcss": "^8.4.45",
"prettier": "^3.3.3",
"prettier-plugin-ember-template-tag": "^2.0.2",
Expand Down Expand Up @@ -157,7 +156,7 @@
},
"peerDependencies": {
"@ember/test-helpers": "^2.9.4 || ^3.2.1 || ^4.0.4",
"@glimmer/component": "^1.1.2",
"@glimmer/component": "^1.1.2 || ^2.0.0",
"@glimmer/tracking": "^1.1.2",
"ember-concurrency": "^4.0.2",
"ember-source": "^3.28.0 || ^4.0.0 || >=5.0.0"
Expand Down
Loading
Loading