Merge pull request #204 from Power-Maverick/main

Release v2.2.2
Power-Maverick · Dec 16, 2024 · 8094cfe · 8094cfe
2 parents 6fdfe25 + ef33c46
commit 8094cfe
Show file tree

Hide file tree

Showing 14 changed files with 2,085 additions and 1,221 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+    target-branch: "dependencies"
+    # Specify labels for npm pull requests
+    labels:
+      - "dependencies"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,11 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [v2.2.1](https://github.com/Power-Maverick/DataverseDevTools-VSCode/compare/v2.1.9...v2.2.1)
+## [v2.2.2](https://github.com/Power-Maverick/DataverseDevTools-VSCode/compare/v2.2.1...v2.2.2)
 
 ### Merged
 
+- Resolving Bug 200 [`#203`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/203)
+- Merge Dependencies [`#202`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/202)
+- Bump glob from 7.2.3 to 11.0.0 [`#184`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/184)
+- Bump typescript from 5.3.3 to 5.7.2 [`#196`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/196)
+- Bump @typescript-eslint/eslint-plugin from 6.16.0 to 8.17.0 [`#199`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/199)
+- Bump eslint from 8.56.0 to 9.16.0 [`#195`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/195)
+- Bump @azure/msal-node from 1.18.4 to 2.16.2 [`#198`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/198)
+
+### Commits
+
+- Fix XML attribute version (bug #200) and refactored code for upgraded package version [`a2cced4`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/a2cced4a42a5e7a629ad7f9221a08daf5cfb1f5c)
+- Create dependabot.yml [`dbd783b`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/dbd783bf9240f2939802ff18b4be916cd770c266)
+- Upgrade the version for release [`1cd439c`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/commit/1cd439c4241ff2a713def26cdca545b9b35d409c)
+
+## [v2.2.1](https://github.com/Power-Maverick/DataverseDevTools-VSCode/compare/v2.1.9...v2.2.1) - 2024-11-10
+
+### Merged
+
+- Release v2.2.1 [`#176`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/176)
 - Bug Fixes Nov 2024 [`#175`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/175)
+- Update file paths and imports. Upgraded to webpack [`#151`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/151)
+- Update package.json version to 2.1.13 and main file to extension.js [`#150`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/150)
+- Update package.json with version 2.1.12 and author [`#149`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/149)
+- Releasing v2.1.11 [`#148`](https://github.com/Power-Maverick/DataverseDevTools-VSCode/pull/148)
 
 ### Commits
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "dataverse-devtools",
     "displayName": "Dataverse DevTools",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "description": "The all-in-one tool to develop code for Dataverse/Dynamics 365. Helps you connect to a Dataverse environment, generate TypeScript definitions for entities, create different type of Dataverse-specific projects and much more.",
     "publisher": "danish-naglekar",
     "author": {
@@ -556,25 +556,25 @@
         "@types/node-fetch": "^2.5.11",
         "@types/uuid": "^8.3.1",
         "@types/vscode": "^1.80.0",
-        "@typescript-eslint/eslint-plugin": "^6.15.0",
-        "@typescript-eslint/parser": "^6.15.0",
+        "@typescript-eslint/eslint-plugin": "^8.18.0",
+        "@typescript-eslint/parser": "^8.0.0",
         "@vscode/test-cli": "^0.0.4",
         "@vscode/test-electron": "^2.3.8",
         "all-contributors-cli": "^6.20.0",
         "auto-changelog": "^2.3.0",
         "copy-webpack-plugin": "^11.0.0",
-        "eslint": "^8.56.0",
-        "glob": "^7.1.7",
+        "eslint": "^8.0.0",
+        "glob": "^11.0.0",
         "mocha": "^10.0.0",
         "ts-loader": "^9.5.1",
-        "typescript": "^5.3.3",
+        "typescript": "^5.7.2",
         "webpack": "^5.89.0",
         "webpack-cli": "^5.1.4"
     },
     "dependencies": {
         "@azure/identity": "^3.0.0",
         "@azure/identity-vscode": "^1.0.0",
-        "@azure/msal-node": "^1.3.0",
+        "@azure/msal-node": "^2.16.2",
         "@types/fs-extra": "^9.0.12",
         "@types/lodash": "^4.14.171",
         "@vscode/extension-telemetry": "^0.9.2",

diff --git a/src/cliCommands/cliCommandsDataProvider.ts b/src/cliCommands/cliCommandsDataProvider.ts
@@ -55,8 +55,8 @@ export class CliCommandTreeItem extends CliCommandItemBase {
     }
 
     iconPath = {
-        light: path.join(__filename, "..", "resources", "light", this.level === 1 ? "folder.svg" : this.level === 2 ? "cli.svg" : "generic.svg"),
-        dark: path.join(__filename, "..", "resources", "dark", this.level === 1 ? "folder.svg" : this.level === 2 ? "cli.svg" : "generic.svg"),
+        light: vscode.Uri.file(path.join(__filename, "..", "resources", "light", this.level === 1 ? "folder.svg" : this.level === 2 ? "cli.svg" : "generic.svg")),
+        dark: vscode.Uri.file(path.join(__filename, "..", "resources", "dark", this.level === 1 ? "folder.svg" : this.level === 2 ? "cli.svg" : "generic.svg")),
     };
 
     contextValue = this.level === 2 ? "cli-command" : "cli-group";

diff --git a/src/cliCommands/cliCommandsItemBase.ts b/src/cliCommands/cliCommandsItemBase.ts
@@ -10,8 +10,8 @@ export class CliCommandItemBase extends vscode.TreeItem {
     }
 
     iconPath = {
-        light: path.join(__filename, "..", "resources", "light", "generic.svg"),
-        dark: path.join(__filename, "..", "resources", "dark", "generic.svg"),
+        light: vscode.Uri.file(path.join(__filename, "..", "resources", "light", "generic.svg")),
+        dark: vscode.Uri.file(path.join(__filename, "..", "resources", "dark", "generic.svg")),
     };
 
     //contextValue = this.level === 2 ? "connection" : "connection-child";

diff --git a/src/login/login.ts b/src/login/login.ts
@@ -89,9 +89,9 @@ export async function loginWithPrompt(clientId: string, adfs: boolean, dataverse
     if (vscode.env.uiKind === vscode.UIKind.Web) {
         //return loginWithoutLocalServer(clientId, environment, adfs, tenantId);
     }
-    if (adfs && terminateServer) {
-        await terminateServer();
-    }
+    // if (adfs && terminateServer) {
+    //     await terminateServer();
+    // }
 
     if (adfs) {
         //terminateServer = createTerminateServer(server);

diff --git a/src/tools/toolsDataProvider.ts b/src/tools/toolsDataProvider.ts
@@ -29,19 +29,23 @@ export class ToolsTreeItem extends ToolsItemBase {
     }
 
     iconPath = {
-        light: path.join(
-            __filename,
-            "..",
-            "resources",
-            "toolIcons",
-            this.toolShortName === "drb" ? "drb.png" : this.toolShortName === "prt" ? "prt.png" : this.toolShortName === "cmt" ? "cmt.png" : this.toolShortName === "pd" ? "pd.png" : "generic.svg",
+        light: vscode.Uri.file(
+            path.join(
+                __filename,
+                "..",
+                "resources",
+                "toolIcons",
+                this.toolShortName === "drb" ? "drb.png" : this.toolShortName === "prt" ? "prt.png" : this.toolShortName === "cmt" ? "cmt.png" : this.toolShortName === "pd" ? "pd.png" : "generic.svg",
+            ),
         ),
-        dark: path.join(
-            __filename,
-            "..",
-            "resources",
-            "toolIcons",
-            this.toolShortName === "drb" ? "drb.png" : this.toolShortName === "prt" ? "prt.png" : this.toolShortName === "cmt" ? "cmt.png" : this.toolShortName === "pd" ? "pd.png" : "generic.svg",
+        dark: vscode.Uri.file(
+            path.join(
+                __filename,
+                "..",
+                "resources",
+                "toolIcons",
+                this.toolShortName === "drb" ? "drb.png" : this.toolShortName === "prt" ? "prt.png" : this.toolShortName === "cmt" ? "cmt.png" : this.toolShortName === "pd" ? "pd.png" : "generic.svg",
+            ),
         ),
     };
 }
diff --git a/src/tools/toolsItemBase.ts b/src/tools/toolsItemBase.ts
@@ -10,8 +10,8 @@ export class ToolsItemBase extends vscode.TreeItem {
     }
 
     iconPath = {
-        light: path.join(__filename, "..", "resources", "light", "generic.svg"),
-        dark: path.join(__filename, "..", "resources", "dark", "generic.svg"),
+        light: vscode.Uri.file(path.join(__filename, "..", "resources", "light", "generic.svg")),
+        dark: vscode.Uri.file(path.join(__filename, "..", "resources", "dark", "generic.svg")),
     };
 
     //contextValue = this.level === 2 ? "connection" : "connection-child";

diff --git a/src/trees/dataverseConnectionDataProvider.ts b/src/trees/dataverseConnectionDataProvider.ts
@@ -116,35 +116,39 @@ export class DataverseConnectionTreeItem extends TreeItemBase {
     }
 
     iconPath = {
-        light: path.join(
-            __filename,
-            "..",
-            "resources",
-            "light",
-            this.level === 1
-                ? "connection-type.svg"
-                : this.level === 2 && this.current
-                ? "dataverse.svg"
-                : this.level === 2 && !this.current
-                ? "dataverse-off.svg"
-                : this.level === 3
-                ? "connection-details.svg"
-                : "generic.svg",
+        light: vscode.Uri.file(
+            path.join(
+                __filename,
+                "..",
+                "resources",
+                "light",
+                this.level === 1
+                    ? "connection-type.svg"
+                    : this.level === 2 && this.current
+                    ? "dataverse.svg"
+                    : this.level === 2 && !this.current
+                    ? "dataverse-off.svg"
+                    : this.level === 3
+                    ? "connection-details.svg"
+                    : "generic.svg",
+            ),
         ),
-        dark: path.join(
-            __filename,
-            "..",
-            "resources",
-            "dark",
-            this.level === 1
-                ? "connection-type.svg"
-                : this.level === 2 && this.current
-                ? "dataverse.svg"
-                : this.level === 2 && !this.current
-                ? "dataverse-off.svg"
-                : this.level === 3
-                ? "connection-details.svg"
-                : "generic.svg",
+        dark: vscode.Uri.file(
+            path.join(
+                __filename,
+                "..",
+                "resources",
+                "dark",
+                this.level === 1
+                    ? "connection-type.svg"
+                    : this.level === 2 && this.current
+                    ? "dataverse.svg"
+                    : this.level === 2 && !this.current
+                    ? "dataverse-off.svg"
+                    : this.level === 3
+                    ? "connection-details.svg"
+                    : "generic.svg",
+            ),
         ),
     };
 

diff --git a/src/trees/entitiesDataProvider.ts b/src/trees/entitiesDataProvider.ts
@@ -177,8 +177,8 @@ export class EntitiesTreeItem extends TreeItemBase {
     }
 
     iconPath = {
-        light: path.join(__filename, "..", "resources", "light", this.level === 1 ? "table.svg" : this.level === 2 ? "column.svg" : "generic.svg"),
-        dark: path.join(__filename, "..", "resources", "dark", this.level === 1 ? "table.svg" : this.level === 2 ? "column.svg" : "generic.svg"),
+        light: vscode.Uri.file(path.join(__filename, "..", "resources", "light", this.level === 1 ? "table.svg" : this.level === 2 ? "column.svg" : "generic.svg")),
+        dark: vscode.Uri.file(path.join(__filename, "..", "resources", "dark", this.level === 1 ? "table.svg" : this.level === 2 ? "column.svg" : "generic.svg")),
     };
 
     contextValue = "entitymedata";

diff --git a/src/trees/treeItemBase.ts b/src/trees/treeItemBase.ts
@@ -10,8 +10,8 @@ export class TreeItemBase extends vscode.TreeItem {
     }
 
     iconPath = {
-        light: path.join(__filename, "..", "resources", "light", "generic.svg"),
-        dark: path.join(__filename, "..", "resources", "dark", "generic.svg"),
+        light: vscode.Uri.file(path.join(__filename, "..", "resources", "light", "generic.svg")),
+        dark: vscode.Uri.file(path.join(__filename, "..", "resources", "dark", "generic.svg")),
     };
 
     //contextValue = this.level === 2 ? "connection" : "connection-child";

diff --git a/src/trees/webResourcesDataProvider.ts b/src/trees/webResourcesDataProvider.ts
@@ -202,39 +202,43 @@ export class WebResourcesTreeItem extends TreeItemBase {
     }
 
     iconPath = {
-        light: path.join(
-            __filename,
-            "..",
-            "resources",
-            "light",
-            this.label === "html"
-                ? "html.svg"
-                : this.label === "css"
-                ? "css.svg"
-                : this.label === "script"
-                ? "js.svg"
-                : this.level === 2 && !this.showCheck
-                ? "file-red.svg"
-                : this.level === 2 && this.showCheck
-                ? "file-green.svg"
-                : "generic.svg",
+        light: vscode.Uri.file(
+            path.join(
+                __filename,
+                "..",
+                "resources",
+                "light",
+                this.label === "html"
+                    ? "html.svg"
+                    : this.label === "css"
+                    ? "css.svg"
+                    : this.label === "script"
+                    ? "js.svg"
+                    : this.level === 2 && !this.showCheck
+                    ? "file-red.svg"
+                    : this.level === 2 && this.showCheck
+                    ? "file-green.svg"
+                    : "generic.svg",
+            ),
         ),
-        dark: path.join(
-            __filename,
-            "..",
-            "resources",
-            "dark",
-            this.label === "html"
-                ? "html.svg"
-                : this.label === "css"
-                ? "css.svg"
-                : this.label === "script"
-                ? "js.svg"
-                : this.level === 2 && !this.showCheck
-                ? "file-red.svg"
-                : this.level === 2 && this.showCheck
-                ? "file-green.svg"
-                : "generic.svg",
+        dark: vscode.Uri.file(
+            path.join(
+                __filename,
+                "..",
+                "resources",
+                "dark",
+                this.label === "html"
+                    ? "html.svg"
+                    : this.label === "css"
+                    ? "css.svg"
+                    : this.label === "script"
+                    ? "js.svg"
+                    : this.level === 2 && !this.showCheck
+                    ? "file-red.svg"
+                    : this.level === 2 && this.showCheck
+                    ? "file-green.svg"
+                    : "generic.svg",
+            ),
         ),
     };
 

diff --git a/src/utils/Parsers.ts b/src/utils/Parsers.ts
@@ -14,7 +14,11 @@ const options = {
 export function xmlToJSON<T>(xmlData: string): T {
     const parser = new XMLParser(options);
     var jsonObj: T = parser.parse(xmlData);
-    (jsonObj as any)["?xml"]["@_version"] = "1.0";
+    let tempObj = jsonObj as any;
+    // Check if xml attribute exists; if it does then add version = 1.0
+    if ("?xml" in tempObj) {
+        (jsonObj as any)["?xml"]["@_version"] = "1.0";
+    }
     return jsonObj;
 }