Skip to content

Commit c6944e5

Browse files
authored
Merge branch 'main' into feat/add-transform-entry
2 parents f113e28 + 68855cf commit c6944e5

8 files changed

+40
-19
lines changed

.github/workflows/release-continuous.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@ jobs:
99
- name: Checkout code
1010
uses: actions/checkout@v4
1111

12-
- run: corepack enable
13-
- uses: actions/setup-node@v4
12+
- name: Install pnpm
13+
uses: pnpm/action-setup@v4
14+
15+
- name: Install Node.js
16+
uses: actions/setup-node@v4
1417
with:
15-
node-version: lts/*
18+
node-version-file: '.node-version'
1619
cache: 'pnpm'
1720

1821
- name: Install dependencies

.github/workflows/release.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ jobs:
1717
with:
1818
fetch-depth: 0
1919

20-
- run: corepack enable
20+
- name: Install pnpm
21+
uses: pnpm/action-setup@v4
2122

22-
- name: Set node
23+
- name: Install Node.js
2324
uses: actions/setup-node@v4
2425
with:
25-
node-version: lts/*
26+
node-version-file: '.node-version'
2627
cache: pnpm
2728
registry-url: 'https://registry.npmjs.org'
2829

.node-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lts/*

CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# [4.5.0](https://github.com/vuejs/repl/compare/v4.4.3...v4.5.0) (2025-02-03)
2+
3+
4+
### Features
5+
6+
* pass on descriptor vapor flag when compiling template ([adaaceb](https://github.com/vuejs/repl/commit/adaaceb24984435ae02ab3eda071f10dba9e0362))
7+
8+
9+
110
## [4.4.3](https://github.com/vuejs/repl/compare/v4.4.2...v4.4.3) (2025-01-02)
211

312

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue/repl",
3-
"version": "4.4.3",
3+
"version": "4.5.0",
44
"description": "Vue component for editing Vue components",
55
"packageManager": "[email protected]",
66
"type": "module",

src/SplitPane.vue

+10-11
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const containerRef = useTemplateRef('container')
99
const previewRef = inject(injectKeyPreviewRef)!
1010
1111
// mobile only
12-
const { store, splitPaneOptions } = inject(injectKeyProps)!
12+
const { store, layoutReverse, splitPaneOptions } = inject(injectKeyProps)!
1313
1414
const state = reactive({
1515
dragging: false,
@@ -66,6 +66,7 @@ function changeViewSize() {
6666
:class="{
6767
dragging: state.dragging,
6868
'show-output': store.showOutput,
69+
reverse: layoutReverse,
6970
vertical: isVertical,
7071
}"
7172
@mousemove="dragMove"
@@ -201,21 +202,19 @@ function changeViewSize() {
201202
.split-pane .toggler {
202203
display: block;
203204
}
204-
.split-pane .right {
205+
.split-pane .right,
206+
.split-pane.show-output.reverse .right,
207+
.split-pane.show-output .left,
208+
.split-pane.reverse .left {
205209
z-index: -1;
206210
pointer-events: none;
207211
}
208-
.split-pane .left {
212+
.split-pane .left,
213+
.split-pane.show-output.reverse .left,
214+
.split-pane.show-output .right,
215+
.split-pane.reverse .right {
209216
z-index: 0;
210217
pointer-events: all;
211218
}
212-
.split-pane.show-output .right {
213-
z-index: 0;
214-
pointer-events: all;
215-
}
216-
.split-pane.show-output .left {
217-
z-index: -1;
218-
pointer-events: none;
219-
}
220219
}
221220
</style>

src/store.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,11 @@ export function useStore(
142142
}
143143
}
144144

145-
function setImportMap(map: ImportMap) {
145+
function setImportMap(map: ImportMap, merge = false) {
146+
if (merge) {
147+
map = mergeImportMap(getImportMap(), map)
148+
}
149+
146150
if (map.imports)
147151
for (const [key, value] of Object.entries(map.imports)) {
148152
if (value) {
@@ -368,6 +372,7 @@ export function useStore(
368372
deleteFile,
369373
renameFile,
370374
getImportMap,
375+
setImportMap,
371376
getTsConfig,
372377
serialize,
373378
deserialize,
@@ -436,6 +441,7 @@ export interface ReplStore extends UnwrapRef<StoreState> {
436441
deleteFile(filename: string): void
437442
renameFile(oldFilename: string, newFilename: string): void
438443
getImportMap(): ImportMap
444+
setImportMap(map: ImportMap, merge?: boolean): void
439445
getTsConfig(): Record<string, any>
440446
serialize(): string
441447
deserialize(serializedState: string): void

src/transform.ts

+2
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,8 @@ async function doCompileTemplate(
340340
let { code, errors } = store.compiler.compileTemplate({
341341
isProd: false,
342342
...store.sfcOptions?.template,
343+
// @ts-expect-error TODO remove expect-error after 3.6
344+
vapor: descriptor.vapor,
343345
ast: descriptor.template!.ast,
344346
source: descriptor.template!.content,
345347
filename: descriptor.filename,

0 commit comments

Comments
 (0)