diff --git a/CHANGELOG.md b/CHANGELOG.md index cbc2202..21108da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +2.4.7 / 2022-07-02 +================== + +* 增加赞助链接 +* 更新依赖,将主分支`master`重命名为`main` + 2.4.6 / 2022-01-05 ================== diff --git a/README.md b/README.md index eee7460..040134f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## WXML - Language Service > 插件原名 `minapp`,现已更名为 `WXML - Language Service`,未来将持续专注微信原生小程序 wxml 的支持。 -[![CI Status](https://github.com/wx-minapp/minapp-vscode/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/wx-minapp/minapp-vscode/actions/workflows/ci.yml?query=branch%3Amaster) +[![CI Status](https://github.com/wx-minapp/minapp-vscode/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/wx-minapp/minapp-vscode/actions/workflows/ci.yml?query=branch%3Amaster) [![Deploy Status](https://github.com/wx-minapp/minapp-vscode/actions/workflows/deploy.yml/badge.svg)](https://github.com/wx-minapp/minapp-vscode/actions/workflows/deploy.yml) [![Visual Studio Marketplace](https://img.shields.io/visual-studio-marketplace/v/qiu8310.minapp-vscode?color=brightgreen&label=Visual%20Studio%20Marketplace)](https://marketplace.visualstudio.com/items?itemName=qiu8310.minapp-vscode) ![Marketplace Downloads](https://img.shields.io/visual-studio-marketplace/d/qiu8310.minapp-vscode) @@ -12,7 +12,7 @@ 微信小程序 .wxml 文件代码高亮,标签、属性的智能补全(同时支持原生小程序、mpvue 和 wepy 框架,并提供 code snippets)。 -### 最近更新 【[CHANGELOG.md](https://github.com/wx-minapp/minapp-vscode/blob/master/CHANGELOG.md)】 +### 最近更新 【[CHANGELOG.md](https://github.com/wx-minapp/minapp-vscode/blob/main/CHANGELOG.md)】 > [@iChenLei](https://github.com/ichenlei) 已接手维护本插件,欢迎大家在钉钉群或者 [Github issues](https://github.com/wx-minapp/minapp-vscode/issues) 提意见。 ### 用户交流钉钉群 @@ -137,7 +137,7 @@ vue 中的 template 板支持两个属性: > 注意,[mpvue 中指定 lang="wxml" 会报错](https://github.com/Meituan-Dianping/mpvue/issues/208),需要等待作者修复!不过 > 你可以临时使用 `xlang="wxml"`,但这样同时也会触发 vue 的自动补全 -指定为不同的 minapp 值会触发对应框架的自动补全,由于本人没有使用 wepy 和 mpvue 开发过,所以这些自动补全是根据官方文档说明而加上的,如果有错误,欢迎 PR(只需要修改文件 [src/plugin/lib/language.ts](https://github.com/wx-minapp/minapp-vscode/blob/master/src/plugin/lib/language.ts)) +指定为不同的 minapp 值会触发对应框架的自动补全,由于本人没有使用 wepy 和 mpvue 开发过,所以这些自动补全是根据官方文档说明而加上的,如果有错误,欢迎 PR(只需要修改文件 [src/plugin/lib/language.ts](https://github.com/wx-minapp/minapp-vscode/blob/main/src/plugin/lib/language.ts)) ![示例图片](https://n1image.hjfile.cn/res7/2018/04/09/0b4573624091b04566232c38df08e323.gif) @@ -181,7 +181,7 @@ vue 中的 template 板支持两个属性: ### 内置 snippets - - 自带 swiper/icon/button/picker time/picker date/picker region/checkbox-group/radio-group,见[文件](https://github.com/wx-minapp/minapp-vscode/blob/master/src/plugin/res/snippets.ts) + - 自带 swiper/icon/button/picker time/picker date/picker region/checkbox-group/radio-group,见[文件](https://github.com/wx-minapp/minapp-vscode/blob/main/src/plugin/res/snippets.ts) - 可以通过配置项 `minapp-vscode.snippets` 来定义你自己的 snippets _和官方的 Snippets 的区别时,这里的 Snippets 只需要指定 key 和 body 即可,组件描述自动会根据 key 来获取(另外后期可以让配置和内置的数据结合起来)_ diff --git a/package-lock.json b/package-lock.json index 771577a..a673f80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "minapp-vscode", - "version": "2.4.6", + "version": "2.4.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 01d67b0..54699ab 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "minapp-vscode", "displayName": "WXML - Language Service", - "description": "wechat miniprogram .wxml file syntax highlight,code autocomplete(support native miniprogram、mpvue and wepy framework,provide code snippets)", - "version": "2.4.6", + "description": "WXML Language Support", + "version": "2.4.7", "publisher": "qiu8310", "extensionKind": [ "workspace" diff --git a/src/utils/noderequire.ts b/src/utils/noderequire.ts index f185d94..47d0ea7 100644 --- a/src/utils/noderequire.ts +++ b/src/utils/noderequire.ts @@ -1,4 +1,4 @@ -// Source: https://github.com/microsoft/vscode-eslint/blob/master/server/src/eslintServer.ts +// Source: https://github.com/microsoft/vscode-eslint/blob/main/server/src/eslintServer.ts declare const __webpack_require__: typeof require; declare const __non_webpack_require__: typeof require; diff --git a/syntaxes/wxml-pug.tmLanguage.json b/syntaxes/wxml-pug.tmLanguage.json index 7116f84..7459287 100644 --- a/syntaxes/wxml-pug.tmLanguage.json +++ b/syntaxes/wxml-pug.tmLanguage.json @@ -1,6 +1,6 @@ { "information_for_contributors": [ - "This file was copy from https://github.com/Microsoft/vscode/blob/master/extensions/pug/syntaxes/pug.tmLanguage.json" + "This file was copy from https://github.com/Microsoft/vscode/blob/main/extensions/pug/syntaxes/pug.tmLanguage.json" ], "version": "https://github.com/davidrios/jade-tmbundle/commit/f311a516bb29296fcebfdc7da8149b1c79dfb0a1", "name": "Jade",