From 7ce5552f730ba6d90e853a916ec4d46eac0403ed Mon Sep 17 00:00:00 2001 From: Maruf Rasully Date: Tue, 24 Jan 2023 16:23:06 +0100 Subject: [PATCH 1/2] feat: create new module for bas extension --- .../package.json | 43 +++++++++++++++++++ .../scripts/copy.js | 30 +++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 packages/vscode-ui5-language-assistant-bas-ext/package.json create mode 100644 packages/vscode-ui5-language-assistant-bas-ext/scripts/copy.js diff --git a/packages/vscode-ui5-language-assistant-bas-ext/package.json b/packages/vscode-ui5-language-assistant-bas-ext/package.json new file mode 100644 index 000000000..1f79df939 --- /dev/null +++ b/packages/vscode-ui5-language-assistant-bas-ext/package.json @@ -0,0 +1,43 @@ +{ + "name": "@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext", + "displayName": "UI5 Language Assistant", + "description": "Language Support For SAPUI5", + "publisher": "SAPOSS", + "license": "Apache-2.0", + "version": "3.3.1", + "main": "index.js", + "categories": [ + "Programming Languages" + ], + "keywords": [ + "UI5", + "OpenUI5", + "SAPUI5" + ], + "private": false, + "bugs": { + "url": "https://github.com/SAP/ui5-language-assistant/issues" + }, + "repository": { + "type": "git", + "url": "private" + }, + "engines": { + "vscode": "^1.47.0" + }, + "scripts": { + "ci": "node ./scripts/copy" + }, + "dependencies": { + "fs-extra": "10.1.0" + }, + "devDependencies": { + "vscode-ui5-language-assistant": "3.3.1" + }, + "files": [ + "*.vsix", + "README.md", + ".reuse", + "LICENSES" + ] +} diff --git a/packages/vscode-ui5-language-assistant-bas-ext/scripts/copy.js b/packages/vscode-ui5-language-assistant-bas-ext/scripts/copy.js new file mode 100644 index 000000000..2bc05f75e --- /dev/null +++ b/packages/vscode-ui5-language-assistant-bas-ext/scripts/copy.js @@ -0,0 +1,30 @@ +const { copySync, readdirSync } = require("fs-extra"); +const { join } = require("path"); + +const getBaseSrc = () => + join(__dirname, "..", "..", "vscode-ui5-language-assistant"); +const getBaseDes = () => join(__dirname, ".."); + +const srcReadme = join(getBaseSrc(), "README.md"); +const destinationReadme = join(getBaseDes(), "README.md"); +console.log(`Copying from ${srcReadme} to ${destinationReadme}`); +copySync(srcReadme, destinationReadme); +console.log("Copying finished successfully"); + +const vsixFiles = []; +readdirSync(getBaseSrc()).forEach((item) => { + if (item.endsWith(".vsix")) { + vsixFiles.push(item); + return item; + } +}); +const vsixFile = vsixFiles.pop(); +if (!vsixFile) { + console.log(`There is not vsix under ${getBaseSrc()}`); + return; +} +const srcVsix = join(getBaseSrc(), vsixFile); +const destinationVsix = join(getBaseDes(), vsixFile); +console.log(`Copying from ${srcVsix} to ${destinationVsix}`); +copySync(srcVsix, destinationVsix); +console.log("Copying finished successfully"); From 865dab18aa4011f65c95cb5bea4b67baf337384d Mon Sep 17 00:00:00 2001 From: Maruf Rasully Date: Wed, 25 Jan 2023 13:02:51 +0100 Subject: [PATCH 2/2] fix: review comments --- .../.gitignore | 1 + .../README.md | 3 ++ .../package.json | 33 +++++-------------- .../scripts/copy.js | 30 +++++++++-------- 4 files changed, 29 insertions(+), 38 deletions(-) create mode 100644 packages/vscode-ui5-language-assistant-bas-ext/.gitignore create mode 100644 packages/vscode-ui5-language-assistant-bas-ext/README.md diff --git a/packages/vscode-ui5-language-assistant-bas-ext/.gitignore b/packages/vscode-ui5-language-assistant-bas-ext/.gitignore new file mode 100644 index 000000000..dfacd4d5b --- /dev/null +++ b/packages/vscode-ui5-language-assistant-bas-ext/.gitignore @@ -0,0 +1 @@ +*.vsix \ No newline at end of file diff --git a/packages/vscode-ui5-language-assistant-bas-ext/README.md b/packages/vscode-ui5-language-assistant-bas-ext/README.md new file mode 100644 index 000000000..065e34c9a --- /dev/null +++ b/packages/vscode-ui5-language-assistant-bas-ext/README.md @@ -0,0 +1,3 @@ +# A wrapper module for BAS simple extension + +This is a wrapper module for BAS simple extension around Language Support For SAPUI5. diff --git a/packages/vscode-ui5-language-assistant-bas-ext/package.json b/packages/vscode-ui5-language-assistant-bas-ext/package.json index 1f79df939..c7ae8f284 100644 --- a/packages/vscode-ui5-language-assistant-bas-ext/package.json +++ b/packages/vscode-ui5-language-assistant-bas-ext/package.json @@ -1,43 +1,28 @@ { "name": "@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext", - "displayName": "UI5 Language Assistant", - "description": "Language Support For SAPUI5", - "publisher": "SAPOSS", + "description": "A wrapper module for BAS simple extension around Language Support For SAPUI5", "license": "Apache-2.0", "version": "3.3.1", - "main": "index.js", - "categories": [ - "Programming Languages" - ], - "keywords": [ - "UI5", - "OpenUI5", - "SAPUI5" - ], "private": false, - "bugs": { - "url": "https://github.com/SAP/ui5-language-assistant/issues" - }, "repository": { "type": "git", - "url": "private" - }, - "engines": { - "vscode": "^1.47.0" + "url": "https://github.com/SAP/ui5-language-assistant" }, "scripts": { "ci": "node ./scripts/copy" }, - "dependencies": { - "fs-extra": "10.1.0" - }, + "dependencies": {}, "devDependencies": { - "vscode-ui5-language-assistant": "3.3.1" + "vscode-ui5-language-assistant": "3.3.1", + "fs-extra": "10.1.0" }, "files": [ "*.vsix", "README.md", ".reuse", "LICENSES" - ] + ], + "publishConfig": { + "access": "public" + } } diff --git a/packages/vscode-ui5-language-assistant-bas-ext/scripts/copy.js b/packages/vscode-ui5-language-assistant-bas-ext/scripts/copy.js index 2bc05f75e..b708f5cd9 100644 --- a/packages/vscode-ui5-language-assistant-bas-ext/scripts/copy.js +++ b/packages/vscode-ui5-language-assistant-bas-ext/scripts/copy.js @@ -1,30 +1,32 @@ const { copySync, readdirSync } = require("fs-extra"); const { join } = require("path"); -const getBaseSrc = () => - join(__dirname, "..", "..", "vscode-ui5-language-assistant"); -const getBaseDes = () => join(__dirname, ".."); - -const srcReadme = join(getBaseSrc(), "README.md"); -const destinationReadme = join(getBaseDes(), "README.md"); -console.log(`Copying from ${srcReadme} to ${destinationReadme}`); -copySync(srcReadme, destinationReadme); -console.log("Copying finished successfully"); +const baseSrc = join(__dirname, "..", "..", "vscode-ui5-language-assistant"); +const baseDes = join(__dirname, ".."); const vsixFiles = []; -readdirSync(getBaseSrc()).forEach((item) => { +readdirSync(baseSrc).forEach((item) => { if (item.endsWith(".vsix")) { vsixFiles.push(item); return item; } }); +if (vsixFiles.length > 1) { + throw new Error( + `Detected more than one ".vsix" files. There should be only one ".vsix" file. Please cross check and try again.`, + { cause: vsixFiles } + ); +} const vsixFile = vsixFiles.pop(); if (!vsixFile) { - console.log(`There is not vsix under ${getBaseSrc()}`); - return; + console.log(`There is not vsix under ${baseSrc}`); + throw new Error( + `There is no ".vsix" file. Please make sure a recent ".vsix" file is build under ${baseSrc} and try again.`, + { cause: vsixFiles } + ); } -const srcVsix = join(getBaseSrc(), vsixFile); -const destinationVsix = join(getBaseDes(), vsixFile); +const srcVsix = join(baseSrc, vsixFile); +const destinationVsix = join(baseDes, vsixFile); console.log(`Copying from ${srcVsix} to ${destinationVsix}`); copySync(srcVsix, destinationVsix); console.log("Copying finished successfully");