From 5ad4a1ef42515b5475594a1a82c62be102d2fd5f Mon Sep 17 00:00:00 2001 From: Maruf Rasully Date: Fri, 14 Apr 2023 16:45:31 +0200 Subject: [PATCH] feat: use vsce --- package.json | 5 ++- .../.vscodeignore | 39 ++++++++++++------- .../vscode-ui5-language-assistant/esbuild.js | 5 ++- .../package.json | 14 ++++--- .../test/run-integration-tests.ts | 2 +- .../test/unit/.mocharc.js | 2 +- .../tsconfig.json | 2 +- 7 files changed, 44 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 886635a6c..868ec4de6 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,9 @@ "test-packages/*" ], "nohoist": [ - "vscode-ui5-language-assistant/@ui5-language-assistant/language-server", - "vscode-ui5-language-assistant/@ui5-language-assistant/language-server/**" + "vscode-ui5-language-assistant/prettier", + "vscode-ui5-language-assistant/@prettier/plugin-xml", + "vscode-ui5-language-assistant/@ui5-language-assistant/language-server" ] }, "scripts": { diff --git a/packages/vscode-ui5-language-assistant/.vscodeignore b/packages/vscode-ui5-language-assistant/.vscodeignore index 895c8f196..2dfbf557d 100644 --- a/packages/vscode-ui5-language-assistant/.vscodeignore +++ b/packages/vscode-ui5-language-assistant/.vscodeignore @@ -2,24 +2,37 @@ # We are bundling our extension so no need to include the dependencies separately. node_modules +!node_modules/prettier +# !../../node_modules/prettier +!node_modules/@prettier/plugin-xml +!node_modules/@ui5-language-assistant/language-server +# !../../node_modules/@prettier/plugin-xml + # Except a **subset** language-server package which is executed as a separate process -! **/@ui5-language-assistant/language-server/{api.d.ts,CHANGELOG.md,CONTRIBUTING.md,README.md,package.json} -! **/@ui5-language-assistant/language-server/dist/**/*.js -! **/@ui5-language-assistant/language-server/lib/src/**/*.{js,json} +# ! **/@ui5-language-assistant/language-server/{api.d.ts,CHANGELOG.md,CONTRIBUTING.md,README.md,package.json} +# ! **/@ui5-language-assistant/language-server/dist/**/*.js +# ! **/@ui5-language-assistant/language-server/lib/src/**/*.{js,json} + +# Except prttier and its plugsin and thier dependencies +# ! **/prettier +# ! **/@prettier/plugin-xml +# ! **/@xml-tools +# ! **/chevrotain +# ! **/regexp-to-ast # The VSCode Extension's dev artifacts # Exclude all -**/* +# **/* # Except mandatory set which should be included in the vsix -! CHANGELOG.md -! CONTRIBUTING.md -! LICENSE -! README.md -! LICENSES/* -! package.json +# ! CHANGELOG.md +# ! CONTRIBUTING.md +# ! LICENSE +# ! README.md +# ! LICENSES/* +# ! package.json -! dist/**/*.js -! lib/src/**/*.{js,json} -! resources/ui5-language-assistant.* +# ! dist/**/*.js +# ! lib/src/**/*.{js,json} +# ! resources/ui5-language-assistant.* # Readme gifs (resources/readme) linked via jsdeliver instead of part of vsix diff --git a/packages/vscode-ui5-language-assistant/esbuild.js b/packages/vscode-ui5-language-assistant/esbuild.js index 5b391b41a..11dad7f5c 100644 --- a/packages/vscode-ui5-language-assistant/esbuild.js +++ b/packages/vscode-ui5-language-assistant/esbuild.js @@ -2,9 +2,12 @@ const { join } = require("path"); const { builder } = require("../../esbuild"); builder({ - outfile: "dist/extension.js", + outfile: "dist/src/extension.js", entryPoints: [join(process.cwd(), "src/extension.ts")], external: [ "vscode", // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/ + "@ui5-language-assistant/language-server", + "prettier", + "@prettier/plugin-xml", ], }); diff --git a/packages/vscode-ui5-language-assistant/package.json b/packages/vscode-ui5-language-assistant/package.json index 6cd69e451..260bf5555 100644 --- a/packages/vscode-ui5-language-assistant/package.json +++ b/packages/vscode-ui5-language-assistant/package.json @@ -15,10 +15,10 @@ "Programming Languages" ], "license": "Apache-2.0", - "main": "./lib/src/extension", + "main": "./dist/src/extension", "activationEvents": [ "onFileSystem:manifest-schema", - "*" + "onFileSystem:xml" ], "contributes": { "jsonValidation": [ @@ -94,14 +94,16 @@ "lint": "eslint . --ext .ts --max-warnings=0 --ignore-path=../../.gitignore", "test:integration": "node lib/test/run-integration-tests.js", "test:unit": "mocha --config=./test/unit/.mocharc.js", - "coverage:integration": "nyc node lib/test/run-integration-tests.js", + "coverage:integration": "nyc node dist/test/run-integration-tests.js", "coverage:unit": "nyc mocha --config=./test/unit/.mocharc.js", "bundle": "node esbuild.js", - "package": "node ./scripts/package-vsix" + "package": "vsce package --yarn" }, "dependencies": { "@ui5-language-assistant/language-server": "4.0.9", - "vscode-languageclient": "8.0.2" + "vscode-languageclient": "8.0.2", + "prettier": "2.8.7", + "@prettier/plugin-xml": "2.2.0" }, "devDependencies": { "@types/lodash": "4.14.168", @@ -111,7 +113,7 @@ "@ui5-language-assistant/user-facing-text": "4.0.5", "lodash": "4.17.21", "proxyquire": "2.1.3", - "vsce": "1.83.0", + "vsce": "2.15.0", "vscode-languageserver": "8.0.2", "vscode-test": "1.6.1" } diff --git a/packages/vscode-ui5-language-assistant/test/run-integration-tests.ts b/packages/vscode-ui5-language-assistant/test/run-integration-tests.ts index d6b4dc866..cbf9c77cf 100644 --- a/packages/vscode-ui5-language-assistant/test/run-integration-tests.ts +++ b/packages/vscode-ui5-language-assistant/test/run-integration-tests.ts @@ -8,7 +8,7 @@ async function main(): Promise { const extensionDevelopmentPath = resolve(__dirname, "..", ".."); const testPkgFolder = resolve( extensionDevelopmentPath, - "lib", + "dist", "test", "suite" ); diff --git a/packages/vscode-ui5-language-assistant/test/unit/.mocharc.js b/packages/vscode-ui5-language-assistant/test/unit/.mocharc.js index 1479c1b00..771ba4be3 100644 --- a/packages/vscode-ui5-language-assistant/test/unit/.mocharc.js +++ b/packages/vscode-ui5-language-assistant/test/unit/.mocharc.js @@ -1,5 +1,5 @@ const baseConfig = require("../../../../.mocharc.js"); module.exports = { ...baseConfig, - spec: "./lib/test/unit/**/*spec.js", + spec: "./dist/test/unit/**/*spec.js", }; diff --git a/packages/vscode-ui5-language-assistant/tsconfig.json b/packages/vscode-ui5-language-assistant/tsconfig.json index 26407ddfb..0e77a05f0 100644 --- a/packages/vscode-ui5-language-assistant/tsconfig.json +++ b/packages/vscode-ui5-language-assistant/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", - "outDir": "lib", + "outDir": "dist", "baseUrl": "." }, "include": ["src/**/*", "test/**/*", "api.d.ts", "src/manifest/*.json"]