use vscode-emmet-helper isnetad of vscode-emmet-helper2

aeschli · aeschli · commit 6f5ebbaafb69 · 2020-08-14T13:56:34.000+02:00
diff --git a/extensions/emmet/extension.webpack.config.js b/extensions/emmet/extension.webpack.config.js
@@ -21,6 +21,6 @@ module.exports = withDefaults({
 		filename: 'emmetNodeMain.js'
 	},
 	externals: {
-		'vscode-emmet-helper2': 'commonjs vscode-emmet-helper2',
+		'vscode-emmet-helper': 'commonjs vscode-emmet-helper',
 	},
 });
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
@@ -422,7 +422,7 @@
     "scripts": {
         "watch": "gulp watch-extension:emmet",
         "compile": "gulp compile-extension:emmet",
-        "deps": "yarn add vscode-emmet-helper2"
+        "deps": "yarn add vscode-emmet-helper"
     },
     "devDependencies": {
         "@types/node": "^12.11.7",
@@ -435,7 +435,7 @@
         "@emmetio/html-matcher": "^0.3.3",
         "@emmetio/math-expression": "^0.1.1",
         "image-size": "^0.5.2",
-        "vscode-emmet-helper2": "^2.0.0-next.0",
+        "vscode-emmet-helper": "^2.0.0",
         "vscode-html-languageservice": "^3.0.3"
     }
 }
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
@@ -8,7 +8,7 @@ import parse from '@emmetio/html-matcher';
 import parseStylesheet from '@emmetio/css-parser';
 import { Node, HtmlNode, CssToken, Property, Rule, Stylesheet } from 'EmmetNode';
 import { DocumentStreamReader } from './bufferStream';
-import * as EmmetHelper from 'vscode-emmet-helper2';
+import * as EmmetHelper from 'vscode-emmet-helper';
 import { TextDocument as LSTextDocument } from 'vscode-html-languageservice';
 
 let _emmetHelper: typeof EmmetHelper;
@@ -26,7 +26,7 @@ export function getEmmetHelper() {
 	// Lazy load vscode-emmet-helper instead of importing it
 	// directly to reduce the start-up time of the extension
 	if (!_emmetHelper) {
-		_emmetHelper = require('vscode-emmet-helper2');
+		_emmetHelper = require('vscode-emmet-helper');
 	}
 	updateEmmetExtensionsPath();
 	return _emmetHelper;
diff --git a/extensions/emmet/yarn.lock b/extensions/emmet/yarn.lock
@@ -2469,10 +2469,10 @@ vinyl@~2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vscode-emmet-helper2@^2.0.0-next.0:
-  version "2.0.0-next.0"
-  resolved "https://registry.yarnpkg.com/vscode-emmet-helper2/-/vscode-emmet-helper2-2.0.0-next.0.tgz#86eb4c2e581a577e7eb56a51f662e72fb1c63b47"
-  integrity sha512-ccm6Fb5dkbdEDNLIAebWwVcb8X3AXZDsACLi4KYdCxyFSMV+pOoNokBf4rsu+rSYWNe+fMqxjXZs9z0G2CxPGg==
+vscode-emmet-helper@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/vscode-emmet-helper/-/vscode-emmet-helper-2.0.0.tgz#0057ec2d4af8ac83b1f7937383714ffdc56fcc07"
+  integrity sha512-ytR+Ajxs6zeYI0b4bPsl+nPU8xm852piJUtIwO1ajp1Pw7lwn3VeR+f4ynmxOl9IjfOdF2kW9T/qIkeFbKLwYw==
   dependencies:
     "@emmetio/extract-abbreviation" "^0.2.0"
     jsonc-parser "^2.3.0"
