Skip to content

Commit 5ba7bdc

Browse files
elrrrrrrrclaude
andcommitted
merge: sync with next (unlock-deps fixes)
Take next branch's versions of files that already received fixes in the chore-unlock-deps PR (#5859): - StackUtil.ts (oxc virtual module id format) - HeaderUtil.ts (globalThis.Headers) - Loader.test.ts (oxc parser error format) - ORM tests (Vitest 4 nesting) - ajv export tests (targeted assertions) - vitest config (alias src/index.ts paths) - types.ts (export Application interface) Keep HEAD versions of CI workflow files (ci.yml, e2e-test.yml) which contain the ut migration changes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2 parents 6d481eb + 25d86b1 commit 5ba7bdc

File tree

10 files changed

+26
-17354
lines changed

10 files changed

+26
-17354
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,10 @@ jobs:
6969
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
7070
with:
7171
node-version: '24'
72-
cache: 'pnpm'
7372
registry-url: 'https://registry.npmjs.org'
7473

7574
- name: Install dependencies
76-
run: pnpm install --frozen-lockfile
75+
run: pnpm install --no-frozen-lockfile
7776

7877
- name: Configure Git
7978
run: |

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ package-lock.json
4141
.tshy*
4242
dist
4343
site/.dumi/
44-
!pnpm-lock.yaml
4544

4645
!packages/egg/test/fixtures/apps/loader-plugin/node_modules
4746
!packages/egg/test/fixtures/apps/app-ts/node_modules
@@ -117,5 +116,7 @@ tegg/plugin/tegg/test/fixtures/apps/**/*.js
117116
*.tgz
118117

119118
ecosystem-ci/cnpmcore
120-
ecosystem-ci/examples.utoo.toml
119+
ecosystem-ci/examples
120+
pnpm-lock.yaml
121+
.utoo.toml
121122
.claude/

0 commit comments

Comments
 (0)