@vscode/gulp-electron 1.33.0 → 1.35.0

package/azure-pipelines.yml

@@ -37,4 +37,6 @@ extends:
         testSteps:
           - script: npm ci
           - script: npm test
+            env:
+              GITHUB_TOKEN: "$(github-token)"
         publishPackage: ${{ parameters.publishPackage }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vscode/gulp-electron",
-  "version": "1.33.0",
+  "version": "1.35.0",
   "description": "gulp plugin for packaging Electron into VS Code",
   "main": "src/index.js",
   "scripts": {
@@ -42,11 +42,11 @@
     "rimraf": "^2.4.2",
     "semver": "^4.3.4",
     "temp": "^0.8.3",
-    "vinyl": "^2.2.0",
+    "vinyl": "^3.0.0",
     "vinyl-fs": "^3.0.3"
   },
   "devDependencies": {
     "gulp-buffer": "0.0.2",
-    "mocha": "^9.2.2"
+    "mocha": "^10.2.0"
   }
 }

package/src/darwin.js

@@ -323,6 +323,20 @@ function addCredits(opts) {
   return es.duplex(input, es.merge(input, credits));
 }
 
+function moveChromiumLicense(opts) {
+  var newLicensePath = path.join(
+    getOriginalAppFullName(opts),
+    "Contents",
+    "Resources"
+  );
+  return es.mapSync(function (f) {
+    if (!f.isNull() && !f.isDirectory() && f.path === "LICENSES.chromium.html") {
+      f.dirname = newLicensePath;
+    }
+    return f;
+  });
+}
+
 function renameApp(opts) {
   var originalAppName = getOriginalAppName(opts);
   var originalAppNameRegexp = new RegExp("^" + getOriginalAppFullName(opts));
@@ -403,6 +417,7 @@ exports.patch = function (opts) {
     .pipe(patchHelperInfoPlist(opts))
     .pipe(createEntitlementsPlist(opts))
     .pipe(addCredits(opts))
+    .pipe(moveChromiumLicense(opts))
     .pipe(renameApp(opts))
     .pipe(renameAppHelper(opts));
 

package/src/download.js

@@ -11,17 +11,18 @@ const { Octokit } = require("@octokit/rest");
 const got = require("got");
 
 async function getDownloadUrl(
-  ownerRepo,
+  ownerRepo, customTag,
   { version, platform, arch, token, artifactName, artifactSuffix }
 ) {
   const [owner, repo] = ownerRepo.split("/");
   const octokit = new Octokit({ auth: token });
   const releaseVersion = version.startsWith("v") ? version : `v${version}`;
+  const tag = customTag ?? releaseVersion;
 
   const { data: release } = await octokit.repos.getReleaseByTag({
     owner,
     repo,
-    tag: releaseVersion,
+    tag,
   });
 
   if (!release) {
@@ -117,7 +118,7 @@ async function download(opts) {
   );
 
   if (opts.repo) {
-    const url = await getDownloadUrl(opts.repo, downloadOpts);
+    const url = await getDownloadUrl(opts.repo, opts.tag, downloadOpts);
 
     downloadOpts = {
       ...downloadOpts,
@@ -166,6 +167,7 @@ function getDarwinLibFFMpegPath(opts) {
 module.exports = function (opts) {
   const downloadOpts = {
     version: opts.version,
+    tag: opts.tag,
     platform: opts.platform,
     arch: opts.arch === "arm" ? "armv7l" : opts.arch,
     artifactName: "electron",