chore: update dependencies

Codeneos · Aug 18, 2023 · aeacbe5 · aeacbe5
1 parent 9b1bc37
commit aeacbe5
Show file tree

Hide file tree

Showing 8 changed files with 297 additions and 484 deletions.
diff --git a/package.json b/package.json
@@ -82,6 +82,7 @@
         "@types/fs-extra": "^9",
         "@oclif/command": "1.8.16",
         "@types/node": "^20",
+        "moment": ">=2.29.4",
         "fs-extra": "9",
         "js-force": "1.11.0",
         "salesforce-alm": "^52",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -69,7 +69,7 @@
         "jest": "^29.6.1",
         "json-loader": "^0.5.7",
         "log-symbols": "^4.0.0",
-        "moment": "^2.29.1",
+        "moment": "^2.29.4",
         "shx": "^0.3.4",
         "source-map-support": "^0.5.21",
         "ts-jest": "^29.1.1",
@@ -78,11 +78,11 @@
         "tsc-alias": "^1.6.7",
         "tsconfig-paths-webpack-plugin": "^3.5.2",
         "typescript": "5.1.6",
-        "webpack": "^5.72.1",
-        "webpack-cli": "^4.9.2",
+        "webpack": "^5.88.2",
+        "webpack-cli": "^5.1.4",
         "webpack-env": "^0.8.0",
         "webpack-glob-entry": "^2.1.1",
-        "webpack-merge": "^5.8.0",
+        "webpack-merge": "^5.9.0",
         "webpack-node-externals": "^3.0.0"
     },
     "publisher": "curlybracket",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -55,10 +55,10 @@
         "@vlocode/util": "workspace:*",
         "chalk": "^4.1.1",
         "globby": "^11.0.4",
-        "luxon": "^3.1.0",
+        "luxon": "^3.4.0",
         "memfs": "^3.2.2",
         "minimatch": "^9.0.3",
-        "moment": "^2.29.1",
+        "moment": "^2.29.4",
         "reflect-metadata": "^0.1.13",
         "unique-names-generator": "^4.6.0"
     },

diff --git a/packages/omniscript/package.json b/packages/omniscript/package.json
@@ -61,7 +61,9 @@
         "@vlocode/salesforce": "workspace:*",
         "@vlocode/util": "workspace:*",
         "@vlocode/vlocity": "workspace:*",
-        "jsdom": "^20.0.0"
+        "jsdom": "^20.0.0",
+        "bufferutil": "^4.0.7",
+        "utf-8-validate": "^6.0.3"
     },
     "publisher": "curlybracket",
     "gitHead": "f16fa9dcbf7ef17328047ecb07ab4a7e6a94140a"

diff --git a/packages/vlocity-deploy/package.json b/packages/vlocity-deploy/package.json
@@ -70,8 +70,8 @@
         "glob": "^7.1.7",
         "js-yaml": "^4.1.0",
         "jsdom": "^20.0.0",
-        "luxon": "^3.1.0",
-        "moment": "^2.29.1",
+        "luxon": "^3.4.0",
+        "moment": "^2.29.4",
         "sass": "^1.59.3"
     },
     "publisher": "curlybracket",

diff --git a/packages/vscode-extension/build/buildCommands.ts b/packages/vscode-extension/build/buildCommands.ts
@@ -123,18 +123,34 @@ export function mergeCommandContributions(packageJson: PackageJson, commands: Co
         // Build menus
         for (const menuInfo of command.menus || []) {
             const menu = contributes.menus[menuInfo.menu] || (contributes.menus[menuInfo.menu] = []);
-            const when = menuInfo.when ?? command.when;
+            const commandWhen = command.when ? Array.isArray(command.when) ? command.when : [command.when] : undefined;
+            const menuEntryWhen = menuInfo.when ? Array.isArray(menuInfo.when) ? menuInfo.when : [menuInfo.when] : undefined;
+            const when: string[] = [];
+
+            if (menuEntryWhen && commandWhen) {
+                for (let mWhen of menuEntryWhen) {
+                    mWhen = mWhen.includes('||') ? `(${mWhen})` : mWhen;
+                    for (let cWhen of commandWhen) {
+                        cWhen = cWhen.includes('||') ? `(${cWhen})` : cWhen;
+                        if (mWhen == 'false' || cWhen == 'false') {
+                            when.push(`false`);
+                        }
+                        when.push(`${cWhen} && ${mWhen}`);
+                    }
+                }
+            } else if (menuEntryWhen) {
+                when.push(...menuEntryWhen)
+            } else if (commandWhen) {
+                when.push(...commandWhen)
+            }
+
             const newMenuEntry = stripUndefined({
                 command: name,
                 group: command.group || menuInfo.group
             });
 
             if (when) {
-                if (Array.isArray(when)) {
-                    menu.push(...when.map( when => ({ ...newMenuEntry, when: when.toString() }) ));
-                } else {
-                    menu.push({ ...newMenuEntry, when: when.toString() });
-                }
+                menu.push(...when.map( when => ({ ...newMenuEntry, when: when.toString() }) ));
             } else {
                 menu.push(newMenuEntry);
             }