Skip to content

Commit

Permalink
Merge branch 'master' into test/inlay-hints
Browse files Browse the repository at this point in the history
  • Loading branch information
@so1ve
so1ve authored Nov 3, 2023
2 parents 9524d69 + 8d7dde4 commit 8da03cf
Show file tree
Hide file tree
Showing 41 changed files with 2,296 additions and 1,785 deletions.
3 changes: 0 additions & 3 deletions .npmrc
View file

This file was deleted.

112 changes: 59 additions & 53 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,64 @@
# Changelog

<table>
<tbody>
<tr>
<td align="center" colspan="6">
<br><a href="https://stackblitz.com/"><img
src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/StackBlitz.png"
height="80" /></a>
<br><a href="https://blog.stackblitz.com/posts/webcontainer-api-is-here/">WebContainer API is here.</a>
<br>In 2021 <a href="https://blog.stackblitz.com/posts/introducing-webcontainers/">we announced
WebContainers</a>, a novel WebAssembly-based operating system which enables Node.js to run entirely
inside the browser. Over the last two years, millions of developers have used WebContainers each month
as it powers, among others, the StackBlitz editor.
</td>
</tr>
<tr>
<td align="center" colspan="6"><b>Sponsors</b></td>
</tr>
<tr>
<td align="center"><a href="https://www.prefect.io/"><img
src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/prefect.svg"
height="40" /></a></td>
<td align="center" colspan="5">
<a href="https://nuxt.com/"><img
src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/nuxt.svg"
height="60" /></a>
<br>The Intuitive Vue Framework
</td>
</tr>
<tr>
<td align="center" colspan="5">
<a href="https://vuejs.org/"><img
src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/vue.png"
height="80" /></a>
<br>The Progressive JavaScript Framework
</td>
<td align="center"><a href="https://www.programmier.bar/"><img src="https://github.com/programmierbar.png"
height="60" /></a></td>
</tr>
<tr>
<td align="center"><a href="https://www.leniolabs.com/"><img src="https://github.com/leniolabs.png"
height="60" /></a></td>
<td align="center" colspan="5">
Support us via
<a href="https://github.com/sponsors/johnsoncodehk">GitHub Sponsors</a>
or
<a href="https://opencollective.com/volarjs">Open Collective</a>
</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>

## 1.8.22 (2023/10/27)

- fix: `experimentalResolveStyleCssClasses: "always"` not working ([#3689](https://github.com/vuejs/language-tools/issues/3689)) - thanks @maIIady
Expand Down Expand Up @@ -28,59 +87,6 @@
- chore: rename `volar` to `vue` in diagnostics ([#3667](https://github.com/vuejs/language-tools/issues/3667)) - thanks @so1ve
- chore: publish ts plugin to open-vsx ([#3589](https://github.com/vuejs/language-tools/issues/3589)) - thanks @brc-dd

### Full-time Support by

<table>
<tbody>
<tr>
<td>
<a href="https://stackblitz.com/"><img src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/StackBlitz.png" height="80" /></a>
</td>
<td><h4><a href="https://blog.stackblitz.com/posts/webcontainer-api-is-here/">WebContainer API is here.</a></h4></td>
</tr>
</tbody>
</table>

### Our Platinum Sponsors

<table>
<tbody>
<tr>
<td>
<a href="https://nuxt.com/"><img src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/nuxt.svg" height="60" /></a>
</td>
<td>The Intuitive Web Framework</td>
</tr>
<tr>
<td>
<a href="https://vuejs.org/"><img src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/vue.png" height="80" /></a>
</td>
<td>The Progressive JavaScript Framework</td>
</tr>
</tbody>
</table>

### Our Silver Sponsors

<table>
<tbody>
<tr>
<td>
<p align="center">
<a href="https://www.prefect.io/"><img src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/prefect.svg" height="40" /></a>
</p>
</td>
</tr>
</tbody>
</table>

<h5>
Add you via
<a href="https://github.com/sponsors/johnsoncodehk">GitHub Sponsors</a>
or
<a href="https://opencollective.com/volarjs">Open Collective</a>
</h5>

## 1.8.19 (2023/10/11)

- feat: no longer checking save time ([#3650](https://github.com/vuejs/language-tools/issues/3650))
Expand Down
70 changes: 59 additions & 11 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,65 @@
Discord: https://discord.gg/5bnSSSSBbK

<table>
<tbody>
<tr>
<td align="center" colspan="6">
<br><a href="https://stackblitz.com/"><img
src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/StackBlitz.png"
height="80" /></a>
<br><a href="https://blog.stackblitz.com/posts/webcontainer-api-is-here/">WebContainer API is here.</a>
<br>In 2021 <a href="https://blog.stackblitz.com/posts/introducing-webcontainers/">we announced
WebContainers</a>, a novel WebAssembly-based operating system which enables Node.js to run entirely
inside the browser. Over the last two years, millions of developers have used WebContainers each month
as it powers, among others, the StackBlitz editor.
</td>
</tr>
<tr>
<td align="center" colspan="6"><b>Sponsors</b></td>
</tr>
<tr>
<td align="center"><a href="https://www.prefect.io/"><img
src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/prefect.svg"
height="40" /></a></td>
<td align="center" colspan="5">
<a href="https://nuxt.com/"><img
src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/nuxt.svg"
height="60" /></a>
<br>The Intuitive Vue Framework
</td>
</tr>
<tr>
<td align="center" colspan="5">
<a href="https://vuejs.org/"><img
src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/vue.png"
height="80" /></a>
<br>The Progressive JavaScript Framework
</td>
<td align="center"><a href="https://www.programmier.bar/"><img src="https://github.com/programmierbar.png"
height="60" /></a></td>
</tr>
<tr>
<td align="center"><a href="https://www.leniolabs.com/"><img src="https://github.com/leniolabs.png"
height="60" /></a></td>
<td align="center" colspan="5">
Support us via
<a href="https://github.com/sponsors/johnsoncodehk">GitHub Sponsors</a>
or
<a href="https://opencollective.com/volarjs">Open Collective</a>
</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>

## Packages

- [Vue Language Features](https://github.com/vuejs/language-tools/tree/master/extensions/vscode) \
Expand Down Expand Up @@ -228,17 +287,6 @@ flowchart LR

---

<h3 align="center">Full-time Support by</h3>
<br />

<p align="center">
<span>
<a href="https://stackblitz.com/"><img src="https://raw.githubusercontent.com/vuejs/language-tools/HEAD/.github/sponsors/StackBlitz.png" height="80" /></a>
<h4 align="center">Just click, and start coding.</h4>
</span>
</p>
<br />

<p align="center">
<a href="https://cdn.jsdelivr.net/gh/johnsoncodehk/sponsors/sponsors.svg">
<img src="https://cdn.jsdelivr.net/gh/johnsoncodehk/sponsors/sponsors.png"/>
Expand Down
2 changes: 1 addition & 1 deletion extensions/vscode-typescript-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"release:next": "vsce publish --pre-release"
},
"devDependencies": {
"esbuild": "0.15.18",
"esbuild": "latest",
"typescript-vue-plugin": "1.8.22",
"vsce": "latest"
}
Expand Down
17 changes: 14 additions & 3 deletions extensions/vscode-typescript-plugin/scripts/build.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
require('esbuild').build({
// @ts-check

require('esbuild').context({
entryPoints: ['./node_modules/typescript-vue-plugin/out/index.js'],
bundle: true,
outfile: './node_modules/typescript-vue-plugin-bundle/index.js',
Expand All @@ -10,7 +12,6 @@ require('esbuild').build({
platform: 'node',
tsconfig: './tsconfig.json',
minify: process.argv.includes('--minify'),
watch: process.argv.includes('--watch'),
plugins: [{
name: 'umd2esm',
setup(build) {
Expand All @@ -21,4 +22,14 @@ require('esbuild').build({
})
},
}],
}).catch(() => process.exit(1))
}).then(async ctx => {
console.log('building...');
if (process.argv.includes('--watch')) {
await ctx.watch();
console.log('watching...');
} else {
await ctx.rebuild();
await ctx.dispose();
console.log('finished.');
}
})
4 changes: 2 additions & 2 deletions extensions/vscode/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -737,10 +737,10 @@
"devDependencies": {
"@types/semver": "^7.5.3",
"@types/vscode": "^1.82.0",
"@volar/vscode": "~1.10.5",
"@volar/vscode": "~1.10.10",
"@vue/language-core": "1.8.22",
"@vue/language-server": "1.8.22",
"esbuild": "0.15.18",
"esbuild": "latest",
"esbuild-plugin-copy": "latest",
"esbuild-visualizer": "latest",
"semver": "^7.5.4",
Expand Down
23 changes: 16 additions & 7 deletions extensions/vscode/scripts/build.js
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
// @ts-check

const path = require('path');
const fs = require('fs');

require('esbuild').build({
require('esbuild').context({
entryPoints: {
client: './out/nodeClientMain.js',
server: './node_modules/@vue/language-server/out/nodeServer.js',
},
bundle: true,
metafile: process.argv.includes('--metafile'),
outdir: './dist',
external: [
'vscode',
'typescript', // vue-component-meta
],
external: ['vscode'],
format: 'cjs',
platform: 'node',
tsconfig: './tsconfig.json',
define: { 'process.env.NODE_ENV': '"production"' },
minify: process.argv.includes('--minify'),
watch: process.argv.includes('--watch'),
plugins: [
{
name: 'umd2esm',
Expand All @@ -37,6 +35,7 @@ require('esbuild').build({
from: ['./node_modules/@vue/language-core/schemas/**/*'],
to: ['./dist/schemas'],
},
// @ts-expect-error
keepStructure: true,
}),
{
Expand All @@ -53,4 +52,14 @@ require('esbuild').build({
},
},
],
}).catch(() => process.exit(1))
}).then(async ctx => {
console.log('building...');
if (process.argv.includes('--watch')) {
await ctx.watch();
console.log('watching...');
} else {
await ctx.rebuild();
await ctx.dispose();
console.log('finished.');
}
})
2 changes: 2 additions & 0 deletions extensions/vscode/src/common.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { config } from './config';
import * as componentMeta from './features/componentMeta';
import * as doctor from './features/doctor';
import * as nameCasing from './features/nameCasing';
import * as dragImport from './features/dragImport';
import * as splitEditors from './features/splitEditors';

let semanticClient: lsp.BaseLanguageClient;
Expand Down Expand Up @@ -93,6 +94,7 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
splitEditors.register(context, syntacticClient);
doctor.register(context, semanticClient);
componentMeta.register(context, semanticClient);
dragImport.register(context, semanticClient);

const supportedLanguages: Record<string, boolean> = {
vue: true,
Expand Down
Loading

0 comments on commit 8da03cf

Please sign in to comment.