Skip to content

Commit

Permalink
Update base workflows and lockfile for pnpm 9, set packageManager (#45
Browse files Browse the repository at this point in the history
)

* Update base workflows and lockfile for pnpm 9

* npx create-release-plan-setup@latest --update

* Update some build dependencies to try to get 4.4 and 3.28 passing

* Re-roll lockfile

* Resolve peer issues in ember-try 4.4 and lower

* Don't use get-source-channel-url

* Downgrade @ember/test-helpers for 4.4 and 3.28

* Pin more ember-try deps

* Update ember-resolver and ember-data for 4.4 and 3.28

* Can I not read? bump ember-resolver down again

* Update npmrc settings

* Update scripts

* Update npmrc

* We have to inject due to peer
  • Loading branch information
NullVoxPopuli authored Nov 14, 2024
1 parent cc6d153 commit 207378e
Show file tree
Hide file tree
Showing 10 changed files with 10,590 additions and 7,537 deletions.
15 changes: 3 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand All @@ -40,12 +37,9 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
- name: Install Dependencies
run: pnpm install --no-lockfile
Expand Down Expand Up @@ -75,12 +69,9 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/plan-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
needs: check-plan
permissions:
contents: write
issues: read
pull-requests: write
outputs:
explanation: ${{ steps.explanation.outputs.text }}
Expand All @@ -54,19 +55,13 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: 18

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4
- run: pnpm install --frozen-lockfile

- name: "Generate Explanation and Prep Changelogs"
id: explanation
run: |
set +e
pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
if [ $? -ne 0 ]; then
echo 'text<<EOF' >> $GITHUB_OUTPUT
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,10 @@ jobs:
node-version: 18
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
registry-url: 'https://registry.npmjs.org'

- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4
- run: pnpm install --frozen-lockfile
- name: npm publish
run: pnpm release-plan publish

env:
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
5 changes: 1 addition & 4 deletions .github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v3
with:
version: 8
- uses: pnpm/action-setup@v4
- uses: actions/setup-node@v4
with:
node-version: 18
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
Expand Down
28 changes: 28 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
registry = https://registry.npmjs.org
# can't ignore scripts right now because
# we rely on "prepare" for CI
ignore-scripts = false

####################
# super strict mode
####################
auto-install-peers=false
strict-peer-dependents=true
resolve-peers-from-workspace-root=false
hoist-workspace-packages=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
dedupe-direct-deps=true

################
# Compatibility
################
# highest is what everyone is used to, but
# not ensuring folks are actually compatible with declared ranges.
resolution-mode=highest
4 changes: 2 additions & 2 deletions ember-mirage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"dependencies": {
"@ember/test-helpers": "^2.0.0",
"@embroider/addon-shim": "^1.8.7",
"decorator-transforms": "^1.0.1",
"active-inflector": "^0.1.0",
"decorator-transforms": "^1.0.1",
"lodash-es": "^4.17.21"
},
"peerDependencies": {
Expand All @@ -46,7 +46,7 @@
"@babel/runtime": "^7.17.0",
"@embroider/addon-dev": "^4.1.0",
"@rollup/plugin-babel": "^6.0.4",
"babel-plugin-ember-template-compilation": "^2.2.1",
"babel-plugin-ember-template-compilation": "^2.3.0",
"concurrently": "^8.2.2",
"ember-template-lint": "^5.13.0",
"eslint": "^8.56.0",
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"lint": "pnpm --filter '*' lint",
"lint:fix": "pnpm --filter '*' lint:fix",
"prepare": "pnpm build",
"start": "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
"start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
"start:addon": "pnpm --filter ember-mirage start --no-watch.clearScreen",
"start:test-app": "pnpm --filter test-app start",
"test": "pnpm --filter '*' test",
Expand All @@ -19,9 +19,13 @@
"prettier-plugin-ember-template-tag": "^1.1.0",
"release-plan": "^0.9.0"
},
"packageManager": "[email protected]",
"pnpm": {
"overrides": {
"@types/eslint": "^7.0.0"
},
"peerDependencyRules": {
"ignoreMissing": ["webpack"]
}
}
}
Loading

0 comments on commit 207378e

Please sign in to comment.