Skip to content

Commit 84663cc

Browse files
edison1105edison1105
committed
Merge branch 'main' into minor
2 parents 61604f6 + 5e776ae commit 84663cc

File tree

18 files changed

+395
-385
lines changed

18 files changed

+395
-385
lines changed

‎.github/workflows/autofix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515

1616
- name: Install pnpm
17-
uses: pnpm/action-setup@v4.0.0
17+
uses: pnpm/action-setup@v4.1.0
1818

1919
- name: Install Node.js
2020
uses: actions/setup-node@v4

‎.github/workflows/canary-minor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
ref: minor
1818

1919
- name: Install pnpm
20-
uses: pnpm/action-setup@v4.0.0
20+
uses: pnpm/action-setup@v4.1.0
2121

2222
- name: Install Node.js
2323
uses: actions/setup-node@v4

‎.github/workflows/canary.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616

1717
- name: Install pnpm
18-
uses: pnpm/action-setup@v4.0.0
18+
uses: pnpm/action-setup@v4.1.0
1919

2020
- name: Install Node.js
2121
uses: actions/setup-node@v4

‎.github/workflows/size-data.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- name: Install pnpm
28-
uses: pnpm/action-setup@v4.0.0
28+
uses: pnpm/action-setup@v4.1.0
2929

3030
- name: Install Node.js
3131
uses: actions/setup-node@v4

‎.github/workflows/size-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v4
2626

2727
- name: Install pnpm
28-
uses: pnpm/action-setup@v4.0.0
28+
uses: pnpm/action-setup@v4.1.0
2929

3030
- name: Install Node.js
3131
uses: actions/setup-node@v4

‎.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515

1616
- name: Install pnpm
17-
uses: pnpm/action-setup@v4.0.0
17+
uses: pnpm/action-setup@v4.1.0
1818

1919
- name: Install Node.js
2020
uses: actions/setup-node@v4
@@ -35,7 +35,7 @@ jobs:
3535
- uses: actions/checkout@v4
3636

3737
- name: Install pnpm
38-
uses: pnpm/action-setup@v4.0.0
38+
uses: pnpm/action-setup@v4.1.0
3939

4040
- name: Install Node.js
4141
uses: actions/setup-node@v4
@@ -63,7 +63,7 @@ jobs:
6363
key: chromium-${{ hashFiles('pnpm-lock.yaml') }}
6464

6565
- name: Install pnpm
66-
uses: pnpm/action-setup@v4.0.0
66+
uses: pnpm/action-setup@v4.1.0
6767

6868
- name: Install Node.js
6969
uses: actions/setup-node@v4
@@ -88,7 +88,7 @@ jobs:
8888
- uses: actions/checkout@v4
8989

9090
- name: Install pnpm
91-
uses: pnpm/action-setup@v4.0.0
91+
uses: pnpm/action-setup@v4.1.0
9292

9393
- name: Install Node.js
9494
uses: actions/setup-node@v4

‎.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22.14.0

‎package.json

+18-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"private": true,
33
"version": "3.5.13",
4-
"packageManager": "pnpm@9.15.4",
4+
"packageManager": "pnpm@10.4.1",
55
"type": "module",
66
"scripts": {
77
"dev": "node scripts/dev.js",
@@ -69,46 +69,46 @@
6969
"@rollup/plugin-json": "^6.1.0",
7070
"@rollup/plugin-node-resolve": "^16.0.0",
7171
"@rollup/plugin-replace": "5.0.4",
72-
"@swc/core": "^1.10.15",
72+
"@swc/core": "^1.10.16",
7373
"@types/hash-sum": "^1.0.2",
74-
"@types/node": "^22.12.0",
74+
"@types/node": "^22.13.4",
7575
"@types/semver": "^7.5.8",
7676
"@types/serve-handler": "^6.1.4",
7777
"@vitest/coverage-v8": "^3.0.5",
78+
"@vitest/eslint-plugin": "^1.1.31",
7879
"@vue/consolidate": "1.0.0",
7980
"conventional-changelog-cli": "^5.0.0",
8081
"enquirer": "^2.4.1",
8182
"esbuild": "^0.25.0",
8283
"esbuild-plugin-polyfill-node": "^0.3.0",
83-
"eslint": "^9.18.0",
84+
"eslint": "^9.20.1",
8485
"eslint-plugin-import-x": "^4.6.1",
85-
"@vitest/eslint-plugin": "^1.1.27",
8686
"estree-walker": "catalog:",
8787
"jsdom": "^26.0.0",
88-
"lint-staged": "^15.4.1",
88+
"lint-staged": "^15.4.3",
8989
"lodash": "^4.17.21",
9090
"magic-string": "^0.30.17",
9191
"markdown-table": "^3.0.4",
9292
"marked": "13.0.3",
9393
"npm-run-all2": "^7.0.2",
9494
"picocolors": "^1.1.1",
95-
"prettier": "^3.4.2",
95+
"prettier": "^3.5.1",
9696
"pretty-bytes": "^6.1.1",
9797
"pug": "^3.0.3",
98-
"puppeteer": "~24.2.0",
98+
"puppeteer": "~24.2.1",
9999
"rimraf": "^6.0.1",
100-
"rollup": "^4.34.6",
100+
"rollup": "^4.34.7",
101101
"rollup-plugin-dts": "^6.1.1",
102102
"rollup-plugin-esbuild": "^6.2.0",
103103
"rollup-plugin-polyfill-node": "^0.13.0",
104-
"semver": "^7.6.3",
104+
"semver": "^7.7.1",
105105
"serve": "^14.2.4",
106106
"serve-handler": "^6.1.6",
107107
"simple-git-hooks": "^2.11.1",
108108
"todomvc-app-css": "^2.4.3",
109109
"tslib": "^2.8.1",
110110
"typescript": "~5.6.2",
111-
"typescript-eslint": "^8.20.0",
111+
"typescript-eslint": "^8.24.0",
112112
"vite": "catalog:",
113113
"vitest": "^3.0.5"
114114
},
@@ -121,6 +121,12 @@
121121
"@typescript-eslint/type-utils>eslint": "^9.0.0",
122122
"@typescript-eslint/utils>eslint": "^9.0.0"
123123
}
124-
}
124+
},
125+
"onlyBuiltDependencies": [
126+
"@swc/core",
127+
"esbuild",
128+
"puppeteer",
129+
"simple-git-hooks"
130+
]
125131
}
126132
}

‎packages-private/sfc-playground/src/App.vue

+3-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,9 @@ onMounted(() => {
165165
166166
body {
167167
font-size: 13px;
168-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
169-
Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
168+
font-family:
169+
-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
170+
Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
170171
margin: 0;
171172
--base: #444;
172173
--nav-height: 50px;

‎packages-private/template-explorer/style.css

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
body {
22
margin: 0;
33
overflow: hidden;
4-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen,
5-
Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
4+
font-family:
5+
-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
6+
Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
67
--bg: #1d1f21;
78
--border: #333;
89
}

‎packages/compiler-sfc/__tests__/parse.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ font-weight: bold;
8181

8282
const consumer = new SourceMapConsumer(script!.map!)
8383
consumer.eachMapping(mapping => {
84-
expect(mapping.originalLine - mapping.generatedLine).toBe(padding)
84+
expect(mapping.originalLine! - mapping.generatedLine).toBe(padding)
8585
})
8686
})
8787

@@ -100,8 +100,8 @@ font-weight: bold;
100100

101101
const consumer = new SourceMapConsumer(template.map!)
102102
consumer.eachMapping(mapping => {
103-
expect(mapping.originalLine - mapping.generatedLine).toBe(padding)
104-
expect(mapping.originalColumn - mapping.generatedColumn).toBe(2)
103+
expect(mapping.originalLine! - mapping.generatedLine).toBe(padding)
104+
expect(mapping.originalColumn! - mapping.generatedColumn).toBe(2)
105105
})
106106
})
107107

@@ -115,7 +115,7 @@ font-weight: bold;
115115

116116
const consumer = new SourceMapConsumer(custom!.map!)
117117
consumer.eachMapping(mapping => {
118-
expect(mapping.originalLine - mapping.generatedLine).toBe(padding)
118+
expect(mapping.originalLine! - mapping.generatedLine).toBe(padding)
119119
})
120120
})
121121
})

‎packages/compiler-sfc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@
6262
"postcss-modules": "^6.0.1",
6363
"postcss-selector-parser": "^7.0.0",
6464
"pug": "^3.0.3",
65-
"sass": "^1.83.4"
65+
"sass": "^1.85.0"
6666
}
6767
}

‎packages/compiler-sfc/src/compileTemplate.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ function mapLines(oldMap: RawSourceMap, newMap: RawSourceMap): RawSourceMap {
289289

290290
const origPosInOldMap = oldMapConsumer.originalPositionFor({
291291
line: m.originalLine,
292-
column: m.originalColumn,
292+
column: m.originalColumn!,
293293
})
294294

295295
if (origPosInOldMap.source == null) {
@@ -305,7 +305,7 @@ function mapLines(oldMap: RawSourceMap, newMap: RawSourceMap): RawSourceMap {
305305
line: origPosInOldMap.line, // map line
306306
// use current column, since the oldMap produced by @vue/compiler-sfc
307307
// does not
308-
column: m.originalColumn,
308+
column: m.originalColumn!,
309309
},
310310
source: origPosInOldMap.source,
311311
name: origPosInOldMap.name,

‎packages/reactivity/__tests__/reactive.spec.ts

+7
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,13 @@ describe('reactivity/reactive', () => {
301301
expect(() => markRaw(obj)).not.toThrowError()
302302
})
303303

304+
test('should not markRaw object as reactive', () => {
305+
const a = reactive({ a: 1 })
306+
const b = reactive({ b: 2 }) as any
307+
b.a = markRaw(toRaw(a))
308+
expect(b.a === a).toBe(false)
309+
})
310+
304311
test('should not observe non-extensible objects', () => {
305312
const obj = reactive({
306313
foo: Object.preventExtensions({ a: 1 }),

‎packages/reactivity/src/reactive.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -279,16 +279,16 @@ function createReactiveObject(
279279
) {
280280
return target
281281
}
282-
// target already has corresponding Proxy
283-
const existingProxy = proxyMap.get(target)
284-
if (existingProxy) {
285-
return existingProxy
286-
}
287282
// only specific value types can be observed.
288283
const targetType = getTargetType(target)
289284
if (targetType === TargetType.INVALID) {
290285
return target
291286
}
287+
// target already has corresponding Proxy
288+
const existingProxy = proxyMap.get(target)
289+
if (existingProxy) {
290+
return existingProxy
291+
}
292292
const proxy = new Proxy(
293293
target,
294294
targetType === TargetType.COLLECTION ? collectionHandlers : baseHandlers,

0 commit comments

Comments
 (0)