prepare 5.1.2

microsoft · Jan 22, 2024 · 4e37ac4 · 4e37ac4
1 parent 1030c1e
commit 4e37ac4
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 1,484 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -22,5 +22,5 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-      - run: yarn --frozen-lockfile
-      - run: yarn test
+      - run: npm ci
+      - run: npm test
diff --git a/README.md b/README.md
@@ -15,15 +15,15 @@ and the Monaco editor.
  - *doComplete* / *doComplete2* (async) provide completion proposals for a given location.
  - *setCompletionParticipants* allows participant to provide suggestions for specific tokens.
  - *doHover* provides hover information at a given location.
- 
+
  - *format* formats the code at the given range.
  - *findDocumentLinks* finds all links in the document.
  - *findDocumentSymbols* finds all the symbols in the document.
  - *getFoldingRanges* return folding ranges for the given document.
  - *getSelectionRanges* return the selection ranges for the given document.
  ...
 
- For the complete API see [htmlLanguageService.ts](./src/htmlLanguageService.ts) and [htmlLanguageTypes.ts](./src/htmlLanguageTypes.ts) 
+ For the complete API see [htmlLanguageService.ts](./src/htmlLanguageService.ts) and [htmlLanguageTypes.ts](./src/htmlLanguageTypes.ts)
 
 Installation
 ------------
@@ -33,8 +33,8 @@ Installation
 Development
 -----------
 
-- clone this repo, run yarn
-- `yarn test` to compile and run tests
+- clone this repo, run `npm i``
+- `npm test` to compile and run tests
 
 
 How can I run and debug the service?
@@ -49,8 +49,8 @@ How can I run and debug the service inside an instance of VSCode?
 
 - run VSCode out of sources setup as described here: https://github.com/Microsoft/vscode/wiki/How-to-Contribute
 - link the folder of the `vscode-html-languageservice` repo to `vscode/extensions/html-language-features/server` to run VSCode with the latest changes from that folder:
-  - cd `vscode-html-languageservice`, `yarn link`
-  - cd `vscode/extensions/html-language-features/server`, `yarn link vscode-html-languageservice`
+  - cd `vscode-html-languageservice`, `npm link`
+  - cd `vscode/extensions/html-language-features/server`, `npm link vscode-html-languageservice`
 - run VSCode out of source (`vscode/scripts/code.sh|bat`) and open a `.html` file
 - in VSCode window that is open on the `vscode-html-languageservice` sources, run command `Debug: Attach to Node process` and pick the `code-oss` process with the `html-language-features` path
 ![image](https://user-images.githubusercontent.com/6461412/94239296-dfa6d100-ff11-11ea-8e30-6444cf5defb8.png)

diff --git a/build/pipeline.yml b/build/pipeline.yml
@@ -35,15 +35,15 @@ extends:
       - name: vscode-html-languageservice
 
         buildSteps:
-          - script: yarn --frozen-lockfile
+          - script: npm ci
             displayName: Install dependencies
 
-          # the rest of the build steps are part of the 'prepack' script, automatically run when the pipeline invokes 'yarn pack'
+          # the rest of the build steps are part of the 'prepack' script, automatically run when the pipeline invokes 'npm run pack'
 
         tag: ${{ parameters.quality }}
         preReleaseTag: next
         preReleaseTagAddToLatest: true
-        publishPackage: ${{ parameters.publishPackage }} 
+        publishPackage: ${{ parameters.publishPackage }}
 
         testPlatforms:
           - name: Linux
@@ -54,10 +54,10 @@ extends:
               - 16.x
           - name: Windows
             nodeVersions:
-              - 16.x                   
+              - 16.x
 
         testSteps:
-          - script: yarn --frozen-lockfile
-            displayName: Install dependencies        
-          - script: yarn test
+          - script: npm ci
+            displayName: Install dependencies
+          - script: npm test
             displayName: Test npm package
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vscode-html-languageservice",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "Language service for HTML",
   "main": "./lib/umd/htmlLanguageService.js",
   "typings": "./lib/umd/htmlLanguageService",
@@ -15,19 +15,19 @@
     "url": "https://github.com/Microsoft/vscode-html-languageservice"
   },
   "devDependencies": {
-    "@types/mocha": "^10.0.3",
+    "@types/mocha": "^10.0.6",
     "@types/node": "16.x",
-    "@typescript-eslint/eslint-plugin": "^6.9.0",
-    "@typescript-eslint/parser": "^6.9.0",
-    "@vscode/web-custom-data": "^0.4.8",
-    "eslint": "^8.52.0",
-    "js-beautify": "^1.14.9",
+    "@typescript-eslint/eslint-plugin": "^6.19.1",
+    "@typescript-eslint/parser": "^6.19.1",
+    "@vscode/web-custom-data": "^0.4.9",
+    "eslint": "^8.56.0",
+    "js-beautify": "^1.14.11",
     "mocha": "^10.2.0",
     "rimraf": "^5.0.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@vscode/l10n": "^0.0.16",
+    "@vscode/l10n": "^0.0.18",
     "vscode-languageserver-textdocument": "^1.0.11",
     "vscode-languageserver-types": "^3.17.5",
     "vscode-uri": "^3.0.8"
@@ -41,10 +41,10 @@
     "remove-sourcemap-refs": "node ./build/remove-sourcemap-refs.js",
     "test": "npm run compile && mocha --timeout 5000 ./lib/umd/test/*.js && npm run lint",
     "lint": "eslint src/**/*.ts",
-    "install-types-next": "yarn add vscode-languageserver-types@next -f -S && yarn add vscode-languageserver-textdocument@next -f -S",
+    "install-types-next": "npm i vscode-languageserver-types@next -f -S && npm i vscode-languageserver-textdocument@next -f -S",
     "copy-jsbeautify": "node ./build/copy-jsbeautify.js",
-    "update-jsbeautify": "yarn add js-beautify && node ./build/update-jsbeautify.js",
-    "update-jsbeautify-next": "yarn add js-beautify@next && node ./build/update-jsbeautify.js",
-    "update-data": "yarn add @vscode/web-custom-data -D && node ./build/generateData.js"
+    "update-jsbeautify": "npm i js-beautify && node ./build/update-jsbeautify.js",
+    "update-jsbeautify-next": "npm i js-beautify@next && node ./build/update-jsbeautify.js",
+    "update-data": "npm i @vscode/web-custom-data -D && node ./build/generateData.js"
   }
 }
diff --git a/src/beautify/beautify-css.js b/src/beautify/beautify-css.js
@@ -1,5 +1,5 @@
 // copied from js-beautify/js/lib/beautify-css.js
-// version: 1.14.9
+// version: 1.14.11
 /* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
@@ -1283,13 +1283,11 @@ Beautifier.prototype.beautify = function() {
 
       if (variable.match(/[ :]$/)) {
         // we have a variable or pseudo-class, add it and insert one space before continuing
-        variable = this.eatString(": ").replace(/\s$/, '');
+        variable = this.eatString(": ").replace(/\s+$/, '');
         this.print_string(variable);
         this._output.space_before_token = true;
       }
 
-      variable = variable.replace(/\s$/, '');
-
       // might be sass variable
       if (parenLevel === 0 && variable.indexOf(':') !== -1) {
         insidePropertyValue = true;
@@ -1309,13 +1307,11 @@ Beautifier.prototype.beautify = function() {
 
         if (variableOrRule.match(/[ :]$/)) {
           // we have a variable or pseudo-class, add it and insert one space before continuing
-          variableOrRule = this.eatString(": ").replace(/\s$/, '');
+          variableOrRule = this.eatString(": ").replace(/\s+$/, '');
           this.print_string(variableOrRule);
           this._output.space_before_token = true;
         }
 
-        variableOrRule = variableOrRule.replace(/\s$/, '');
-
         // might be less variable
         if (parenLevel === 0 && variableOrRule.indexOf(':') !== -1) {
           insidePropertyValue = true;

diff --git a/src/beautify/beautify-html.js b/src/beautify/beautify-html.js
@@ -1,5 +1,5 @@
 // copied from js-beautify/js/lib/beautify-html.js
-// version: 1.14.9
+// version: 1.14.11
 /* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 

diff --git a/src/beautify/esm/beautify-css.js b/src/beautify/esm/beautify-css.js
@@ -1,5 +1,5 @@
 // copied from js-beautify/js/lib/beautify-css.js
-// version: 1.14.9
+// version: 1.14.11
 /* AUTO-GENERATED. DO NOT MODIFY. */
 /*
 
@@ -1280,13 +1280,11 @@ Beautifier.prototype.beautify = function() {
 
       if (variable.match(/[ :]$/)) {
         // we have a variable or pseudo-class, add it and insert one space before continuing
-        variable = this.eatString(": ").replace(/\s$/, '');
+        variable = this.eatString(": ").replace(/\s+$/, '');
         this.print_string(variable);
         this._output.space_before_token = true;
       }
 
-      variable = variable.replace(/\s$/, '');
-
       // might be sass variable
       if (parenLevel === 0 && variable.indexOf(':') !== -1) {
         insidePropertyValue = true;
@@ -1306,13 +1304,11 @@ Beautifier.prototype.beautify = function() {
 
         if (variableOrRule.match(/[ :]$/)) {
           // we have a variable or pseudo-class, add it and insert one space before continuing
-          variableOrRule = this.eatString(": ").replace(/\s$/, '');
+          variableOrRule = this.eatString(": ").replace(/\s+$/, '');
           this.print_string(variableOrRule);
           this._output.space_before_token = true;
         }
 
-        variableOrRule = variableOrRule.replace(/\s$/, '');
-
         // might be less variable
         if (parenLevel === 0 && variableOrRule.indexOf(':') !== -1) {
           insidePropertyValue = true;

diff --git a/src/beautify/esm/beautify-html.js b/src/beautify/esm/beautify-html.js
@@ -1,5 +1,5 @@
 // copied from js-beautify/js/lib/beautify-html.js
-// version: 1.14.9
+// version: 1.14.11
 /* AUTO-GENERATED. DO NOT MODIFY. */
 /*