Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"build-preview": "vite build -c vite.preview.config.ts",
"format": "prettier --write .",
"lint": "eslint .",
"test": "node --test test/*.test.mjs",
"typecheck": "vue-tsc --noEmit",
"release": "bumpp --all",
"version": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
Expand Down
17 changes: 11 additions & 6 deletions src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@ export function useStore(
setImportMap(importMap)
}

function applyDefaultTsConfig(targetFiles: Record<string, File>) {
if (!targetFiles[tsconfigFile]) {
targetFiles[tsconfigFile] = new File(
tsconfigFile,
JSON.stringify(tsconfig, undefined, 2),
)
}
}

function init() {
watchEffect(() => {
compileFile(store, activeFile.value).then((errs) => (errors.value = errs))
Expand Down Expand Up @@ -142,12 +151,7 @@ export function useStore(
)

// init tsconfig
if (!files.value[tsconfigFile]) {
files.value[tsconfigFile] = new File(
tsconfigFile,
JSON.stringify(tsconfig, undefined, 2),
)
}
applyDefaultTsConfig(files.value)

// compile rest of the files
errors.value = []
Expand Down Expand Up @@ -339,6 +343,7 @@ export function useStore(
for (const [filename, file] of Object.entries(newFiles)) {
setFile(files, filename, file)
}
applyDefaultTsConfig(files)

const errors = []
for (const file of Object.values(files)) {
Expand Down
41 changes: 41 additions & 0 deletions test/store.test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import assert from 'node:assert/strict'
import { after, test } from 'node:test'
import { ref } from 'vue'
import { createServer } from 'vite'

const vite = await createServer({
appType: 'custom',
logLevel: 'silent',
server: { middlewareMode: true },
})
after(() => vite.close())

const { tsconfigFile, useStore } = await vite.ssrLoadModule('/src/store.ts')

function createStore() {
return useStore({ builtinImportMap: ref({ imports: {} }) })
}

test('setFiles applies the default tsconfig when none is provided', async () => {
const store = createStore()
store.init()
const defaultTsConfig = store.files[tsconfigFile].code

await store.setFiles({
'src/App.vue': '<template><div /></template>',
})

assert.equal(store.files[tsconfigFile].code, defaultTsConfig)
})

test('setFiles keeps a provided tsconfig', async () => {
const store = createStore()
const customTsConfig = JSON.stringify({ compilerOptions: { strict: true } })

await store.setFiles({
'src/App.vue': '<template><div /></template>',
[tsconfigFile]: customTsConfig,
})

assert.equal(store.files[tsconfigFile].code, customTsConfig)
})