diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 3ac9aeb..1f7ca45 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,6 +2,7 @@ // See http://go.microsoft.com/fwlink/?LinkId=827846 // for the documentation about the extensions.json format "recommendations": [ - "dbaeumer.vscode-eslint" + "dbaeumer.vscode-eslint", + "eamodio.tsl-problem-matcher" ] -} +} \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index b2fdfa3..a65fc10 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -28,7 +28,7 @@ "outFiles": [ "${workspaceFolder}/out/test/**/*.js" ], - "preLaunchTask": "npm: compile" + "preLaunchTask": "npm: test-watch" } ] -} +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4c67d6a..6c649c8 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -5,8 +5,11 @@ "tasks": [ { "type": "npm", - "script": "webpack", - "problemMatcher": "$tsc-watch", + "script": "compile", + "problemMatcher": [ + "$ts-webpack-watch", + "$tslint-webpack-watch" + ], "isBackground": false, "presentation": { "reveal": "never" @@ -15,6 +18,16 @@ "kind": "build", "isDefault": true } + }, + { + "type": "npm", + "script": "test-watch", + "problemMatcher": "$tsc-watch", + "isBackground": true, + "presentation": { + "reveal": "never" + }, + "group": "build" } ] -} +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 13dd8b0..6f2b55a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the extension will be documented in this file. -## [1.10.0] - 2021-02-08 +## [1.10.0] - 2021-02-10 - Update dependencies for VS Code 1.53 diff --git a/package-lock.json b/package-lock.json index d039ec8..3e30c57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -174,9 +174,9 @@ "dev": true }, "@types/node-fetch": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz", - "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==", + "version": "2.5.8", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.8.tgz", + "integrity": "sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==", "dev": true, "requires": { "@types/node": "*", diff --git a/package.json b/package.json index fa41c78..7f01f1e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-html-css", "displayName": "HTML CSS Support", "description": "CSS Intellisense for HTML", - "version": "1.9.1", + "version": "1.10.0", "publisher": "ecmel", "license": "MIT", "homepage": "https://github.com/ecmel/vscode-html-css", @@ -13,7 +13,7 @@ "url": "https://github.com/ecmel/vscode-html-css.git" }, "engines": { - "vscode": "^1.52.0" + "vscode": "^1.53.0" }, "categories": [ "Programming Languages", @@ -68,36 +68,36 @@ }, "main": "./dist/extension.js", "scripts": { - "compile": "tsc -p ./", - "deploy": "vsce publish", + "vscode:prepublish": "npm run package", + "compile": "webpack", + "watch": "webpack --watch", + "package": "webpack --mode production --devtool hidden-source-map", + "test-compile": "tsc -p ./", + "test-watch": "tsc -watch -p ./", + "pretest": "npm run test-compile && npm run lint", "lint": "eslint src --ext ts", - "package": "vsce package", - "pretest": "npm run compile && npm run lint", "test": "node ./out/test/runTest.js", - "vscode:prepublish": "webpack --mode production", - "watch": "tsc -watch -p ./", - "webpack-dev": "webpack --mode development --watch", - "webpack": "webpack --mode development" + "release": "vsce package" }, "devDependencies": { - "@types/css-tree": "^1.0.4", + "@types/vscode": "^1.53.0", "@types/glob": "^7.1.3", "@types/mocha": "^8.0.4", - "@types/node-fetch": "^2.5.7", "@types/node": "^12.11.7", - "@types/vscode": "^1.52.0", - "@typescript-eslint/eslint-plugin": "^4.9.0", - "@typescript-eslint/parser": "^4.9.0", - "css-tree": "^1.1.2", - "eslint": "^7.15.0", + "eslint": "^7.19.0", + "@typescript-eslint/eslint-plugin": "^4.14.1", + "@typescript-eslint/parser": "^4.14.1", "glob": "^7.1.6", - "mocha": "^8.1.3", + "mocha": "^8.2.1", + "typescript": "^4.1.3", + "vscode-test": "^1.5.0", + "ts-loader": "^8.0.14", + "webpack": "^5.19.0", + "webpack-cli": "^4.4.0", + "@types/css-tree": "^1.0.5", + "@types/node-fetch": "^2.5.8", + "css-tree": "^1.1.2", "node-fetch": "^2.6.1", - "ts-loader": "^8.0.11", - "typescript": "^4.1.2", - "vsce": "^1.83.0", - "vscode-test": "^1.4.1", - "webpack-cli": "^4.2.0", - "webpack": "^5.10.0" + "vsce": "^1.85.0" } } diff --git a/webpack.config.js b/webpack.config.js index 907fb84..6fb184b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,17 +4,18 @@ const path = require("path"); +/**@type {import('webpack').Configuration}*/ const config = { target: "node", + mode: "none", entry: "./src/extension.ts", output: { path: path.resolve(__dirname, "dist"), filename: "extension.js", - libraryTarget: "commonjs2", - devtoolModuleFilenameTemplate: "../[resource-path]" + libraryTarget: "commonjs2" }, - devtool: "source-map", + devtool: "nosources-source-map", externals: { vscode: "commonjs vscode" },