@vscode/gulp-electron 1.37.0 → 1.38.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/gulp-electron",
-  "version": "1.37.0",
+  "version": "1.38.1",
   "description": "gulp plugin for packaging Electron into VS Code",
   "main": "src/index.js",
   "scripts": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/microsoft/vscode-gulp-electron.git"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=22"
   },
   "keywords": [
     "gulpplugin",
@@ -29,7 +29,7 @@
   "homepage": "https://github.com/microsoft/vscode-gulp-electron",
   "dependencies": {
     "@electron/get": "^4.0.1",
-    "@octokit/rest": "^18.0.14",
+    "@octokit/rest": "^22.0.0",
     "event-stream": "3.3.4",
     "gulp-filter": "^5.1.0",
     "gulp-rename": "1.2.2",

package/src/download.js

@@ -8,7 +8,7 @@ var es = require("event-stream");
 var zfs = require("gulp-vinyl-zip");
 var filter = require("gulp-filter");
 const { Octokit } = require("@octokit/rest");
-const got = require("got");
+const { got } = require("got");
 const sumchecker = require('sumchecker');
 
 async function getDownloadUrl(

package/src/win32.js

@@ -51,7 +51,13 @@ function getSignTool() {
 }
 
 exports.getAppPath = function (opts) {
-  return "resources/app";
+  if (opts.createVersionedResources) {
+    if (!opts.productVersionString) {
+      throw new Error("productVersionString must be defined.");
+    }
+    return path.join(opts.productVersionString, "resources", "app");
+  }
+  return path.join("resources", "app");
 };
 
 function patchExecutable(opts) {
@@ -77,6 +83,15 @@ function patchExecutable(opts) {
       "product-version": opts.productVersion,
     };
 
+    if (opts.createVersionedResources) {
+      if (!opts.productVersionString) {
+        throw new Error("productVersionString must be defined.");
+      }
+      patch["resource-string"] = {
+        2: opts.productVersionString
+      };
+    }
+
     if (opts.winIcon) {
       patch.icon = opts.winIcon;
     }
@@ -140,13 +155,37 @@ function renameApp(opts) {
   });
 }
 
+function moveFilesExceptExecutable(opts) {
+  const versionFolder = opts.productVersionString;
+  if (!versionFolder) {
+    throw new Error("productVersionString must be defined.");
+  }
+  return es.mapSync(function (f) {
+    // Skip if the file is the renamed executable
+    if (
+      f.relative === `${opts.productName}.exe`
+    ) {
+      return f;
+    }
+
+    // Move other files to version subfolder
+    if (f.path && f.base) {
+      const relativePath = path.relative(f.base, f.path);
+      f.path = path.join(f.base, versionFolder, relativePath);
+    }
+
+    return f;
+  });
+}
+
 exports.patch = function (opts) {
   var pass = es.through();
 
   var src = pass
     .pipe(opts.keepDefaultApp ? es.through() : removeDefaultApp())
     .pipe(patchExecutable(opts))
-    .pipe(renameApp(opts));
+    .pipe(renameApp(opts))
+    .pipe(opts.createVersionedResources ? moveFilesExceptExecutable(opts) : es.through());
 
   return es.duplex(pass, src);
 };