@vscode/gulp-electron 1.37.1 → 1.38.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/gulp-electron",
-  "version": "1.37.1",
+  "version": "1.38.2",
   "description": "gulp plugin for packaging Electron into VS Code",
   "main": "src/index.js",
   "scripts": {
@@ -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/darwin.js

@@ -226,11 +226,9 @@ function patchHelperInfoPlist(opts) {
   var input = es.through();
   var output = input.pipe(
     es.map(function (f, cb) {
-      if (
-        !/Contents\/Frameworks\/Electron\ Helper( \w+)?\.app\/Contents\/Info.plist$/i.test(
-          f.relative
-        )
-      ) {
+      const match = /Contents\/Frameworks\/Electron\ Helper( \(\w+\))?\.app\/Contents\/Info.plist$/i.exec(
+        f.relative);
+      if (!match) {
         return cb(null, f);
       }
 
@@ -246,24 +244,14 @@ function patchHelperInfoPlist(opts) {
 
       f.contents.on("end", function () {
         var infoPlist = plist.parse(contents.toString("utf8"));
-        var match = /\.helper\.([^.]+)$/.exec(
-          infoPlist["CFBundleIdentifier"] || ""
-        );
-        var suffix = match ? match[1] : "";
+        var suffix = match[1] ?? "";
 
         if (opts.darwinBundleIdentifier) {
           infoPlist["CFBundleIdentifier"] =
             opts.darwinBundleIdentifier + ".helper";
-
-          if (suffix) {
-            infoPlist["CFBundleIdentifier"] += "." + suffix;
-          }
         }
 
-        infoPlist["CFBundleName"] = opts.productName + " Helper";
-        if (suffix) {
-          infoPlist["CFBundleName"] += " " + suffix;
-        }
+        infoPlist["CFBundleName"] = `${opts.productName} Helper${suffix}`;
 
         if (infoPlist["CFBundleDisplayName"]) {
           infoPlist["CFBundleDisplayName"] = infoPlist["CFBundleName"];

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);
 };