Skip to content

Commit 4734a34

Browse files
authored
Merge pull request #153 from zardoy/develop
2 parents d9a8238 + 57bab1f commit 4734a34

28 files changed

+827
-461
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,10 @@ jobs:
3636
- uses: GabrielBB/xvfb-action@v1.6
3737
with:
3838
run: pnpm integration-test
39+
- run: cd out && npx @vscode/vsce package --out ../extension.vsix
40+
- name: Archive production artifacts
41+
uses: actions/upload-artifact@v3
42+
with:
43+
name: extension
44+
path: |
45+
extension.vsix

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: VSCode Release
22
on:
33
push:
4-
branches: [main]
4+
branches: [release]
55

66
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
77
jobs:

buildTsPlugin.mjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
import buildTsPlugin from '@zardoy/vscode-utils/build/buildTypescriptPlugin.js'
33
import { build, analyzeMetafile } from 'esbuild'
44

5+
const enableWatch = process.argv.includes('--watch')
56
await build({
67
bundle: true,
78
external: ['typescript-essential-plugins'],
89
// minify: !watch,
10+
watch: enableWatch,
911
entryPoints: ['./typescript/src/volarConfig.ts'],
1012
outfile: './out/volarConfig.js',
1113
format: 'cjs',
@@ -18,7 +20,7 @@ await build({
1820
})
1921

2022
const result = await buildTsPlugin('typescript', undefined, undefined, {
21-
minify: !process.argv.includes('--watch'),
23+
minify: !enableWatch,
2224
metafile: true,
2325
define: {
2426
'import.meta': '{}',

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"tsm": "^2.3.0",
133133
"type-fest": "^2.13.1",
134134
"typed-jsonfile": "^0.2.1",
135-
"typescript": "5.1.1-rc",
135+
"typescript": "5.1.6",
136136
"vite": "^4.1.1",
137137
"vitest": "^0.26.0",
138138
"vitest-environment-ts-plugin": "./vitest-environment-ts-plugin",
@@ -149,11 +149,11 @@
149149
"@types/lodash": "^4.14.182",
150150
"@types/mocha": "^9.1.1",
151151
"@types/pluralize": "^0.0.29",
152-
"@volar/language-server": "1.3.0-alpha.3",
153-
"@volar/language-service": "1.6.9",
154-
"@volar/vue-language-core": "^1.2.0-patch.2",
155152
"@vscode/emmet-helper": "^2.8.4",
156153
"@vscode/test-electron": "^2.1.5",
154+
"@vue/language-core": "latest",
155+
"@vue/language-server": "latest",
156+
"@vue/language-service": "latest",
157157
"@zardoy/utils": "^0.0.9",
158158
"@zardoy/vscode-utils": "^0.0.47",
159159
"chai": "^4.3.6",
@@ -201,4 +201,4 @@
201201
"runTest": false
202202
}
203203
}
204-
}
204+
}

0 commit comments

Comments
 (0)