From 88d49aa11aca06605a31f7ec44ea143e61ecf837 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Tue, 27 Feb 2024 22:09:59 +0000 Subject: [PATCH 1/2] fix(icons-v1): Display icons for all resources Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .vscode/extension.json | 3 --- .vscode/settings.json | 1 - package-lock.json | 5 +++-- packages/vsce/CHANGELOG.md | 5 +++++ packages/vsce/src/utils/getIconPath.ts | 6 ++++-- 5 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 .vscode/extension.json diff --git a/.vscode/extension.json b/.vscode/extension.json deleted file mode 100644 index c83e2634..00000000 --- a/.vscode/extension.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "recommendations": ["esbenp.prettier-vscode"] -} diff --git a/.vscode/settings.json b/.vscode/settings.json index 2c21f322..faa9492c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,7 +20,6 @@ // Standardize on the Prettier formatter "editor.defaultFormatter": "esbenp.prettier-vscode", // Enforce prettier on save - "editor.formatOnSave": true, "npm.packageManager": "npm", "eslint.packageManager": "npm" } diff --git a/package-lock.json b/package-lock.json index 5751d8ed..1de9da24 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12576,8 +12576,9 @@ } }, "node_modules/ip": { - "version": "2.0.0", - "license": "MIT" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==" }, "node_modules/is-arrayish": { "version": "0.2.1", diff --git a/packages/vsce/CHANGELOG.md b/packages/vsce/CHANGELOG.md index e03d65a6..3255f115 100644 --- a/packages/vsce/CHANGELOG.md +++ b/packages/vsce/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to the "cics-extension-for-zowe" extension will be documented in this file. +## Recent Changes + +- BugFix: Fixed icons not displaying.[#112](https://github.com/zowe/cics-for-zowe-client/issues/112) +- BugFix: Updated dependencies for technical currency + ## `1.3.1` - BugFix: Updated dependencies for technical currency diff --git a/packages/vsce/src/utils/getIconPath.ts b/packages/vsce/src/utils/getIconPath.ts index 38ed63d1..c1266f0b 100644 --- a/packages/vsce/src/utils/getIconPath.ts +++ b/packages/vsce/src/utils/getIconPath.ts @@ -13,7 +13,9 @@ import { join } from "path"; export function getIconPathInResources(iconFileNameLight: string, iconFileNameDark: string) { return { - light: join(__dirname, "..", "..", "resources", "imgs", iconFileNameLight), - dark: join(__dirname, "..", "..", "resources", "imgs", iconFileNameDark), + // We bundle the extension into a single `dist/extension.js` + // `__dirname/../resources/imgs === `/path/to/dist/../resources/imgs` + light: join(__dirname, "..", "resources", "imgs", iconFileNameLight), + dark: join(__dirname, "..", "resources", "imgs", iconFileNameDark), }; } From 56c1209a070dee59bfbb8f0bdb428bc4070df363 Mon Sep 17 00:00:00 2001 From: zFernand0 <37381190+zFernand0@users.noreply.github.com> Date: Thu, 29 Feb 2024 13:27:49 +0000 Subject: [PATCH 2/2] add prettier config Signed-off-by: zFernand0 <37381190+zFernand0@users.noreply.github.com> --- .prettierignore | 8 ++++++++ .vscode/extension.json | 3 +++ .vscode/settings.json | 1 + prettier.config.js | 1 + 4 files changed, 13 insertions(+) create mode 100644 .prettierignore create mode 100644 .vscode/extension.json create mode 100644 prettier.config.js diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..034fd378 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,8 @@ +.github +.husky +.vscode +dist +lib +node_modules +scripts +package-lock.json \ No newline at end of file diff --git a/.vscode/extension.json b/.vscode/extension.json new file mode 100644 index 00000000..9edd4f1d --- /dev/null +++ b/.vscode/extension.json @@ -0,0 +1,3 @@ +{ + "recommendations": ["esbenp.prettier-vscode"] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index faa9492c..2c21f322 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -20,6 +20,7 @@ // Standardize on the Prettier formatter "editor.defaultFormatter": "esbenp.prettier-vscode", // Enforce prettier on save + "editor.formatOnSave": true, "npm.packageManager": "npm", "eslint.packageManager": "npm" } diff --git a/prettier.config.js b/prettier.config.js new file mode 100644 index 00000000..1bcc440b --- /dev/null +++ b/prettier.config.js @@ -0,0 +1 @@ +module.exports = { printWidth: 150 };