zarro 1.176.2 → 1.178.0

package/gulp-tasks/generate-local-task.js

@@ -9,13 +9,13 @@
         await writeTextFile(target, template.replace("%TASK_NAME%", taskName));
         log.info(`generated new task file at: ${target}`);
     });
-    const template = `
-/// <reference path="../node_modules/zarro/types.d.ts" />
-const
-  gulp = requireModule<Gulp>("gulp");
-  
-gulp.task(\`%TASK_NAME%\`, async () => {
-  
-});  
+    const template = `
+/// <reference path="../node_modules/zarro/types.d.ts" />
+const
+  gulp = requireModule<Gulp>("gulp");
+  
+gulp.task(\`%TASK_NAME%\`, async () => {
+  
+});  
 `.trim();
 })();

package/gulp-tasks/modules/dotnet-cli.js

@@ -1011,8 +1011,8 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
             }
             const s = toUpgrade.length === 1 ? "" : "s", message = `searching for ${toUpgrade.length} package${s} to upgrade in ${project}`, upgradeIds = toUpgrade.map(o => o.id);
             const upstream = await ctx.exec(message, async () => {
-                var _a;
-                return await searchForMultiplePackages(upgradeIds, opts.source, (_a = opts.preRelease) !== null && _a !== void 0 ? _a : false);
+                var _a, _b;
+                return await searchForMultiplePackages(upgradeIds, opts.source, (_a = opts.preRelease) !== null && _a !== void 0 ? _a : false, (_b = opts.clearNugetHttpCache) !== null && _b !== void 0 ? _b : false);
             });
             if (upstream.length === 0) {
                 log.warn(`No results found for packages at ${opts.source} (preRelease: ${!!opts.preRelease})\n- ${upgradeIds.join("\n- ")}`);
@@ -1040,7 +1040,10 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
             }
         }
     }
-    async function searchForMultiplePackages(packageIds, source, preRelease) {
+    async function searchForMultiplePackages(packageIds, source, preRelease, clearNugetHttpCache) {
+        if (clearNugetHttpCache) {
+            await clearCaches(DotNetCache.httpCache);
+        }
         // TODO: optimise
         const promises = packageIds.map(id => searchPackages({
             search: id,

package/gulp-tasks/modules/register-environment-variables.js

@@ -485,6 +485,11 @@
             help: "Flag: when set truthy (default), don't actively restore packages (next build will do so) - makes the process faster",
             default: "true"
         });
+        env.register({
+            name: "UPGRADE_PACKAGES_BYPASS_CACHE",
+            help: "Flag: when set truthy, first clear the nuget http cache before searching for upgrades",
+            default: "false"
+        });
         env.register({
             name: "PACK_INCLUDE_CSPROJ",
             help: "Mask to apply for inclusions to 'dotnet pack'",

package/gulp-tasks/modules/resolve-nuget.js

@@ -99,7 +99,7 @@
             throw new ZarroError("MONO is required to run nuget restore on this platform");
         }
         const baseFolder = findNpmBase();
-        const script = `#!/bin/sh
+        const script = `#!/bin/sh
 mono ${path.resolve(nugetPath)} $@`;
         const scriptPath = path.join(baseFolder, "node_modules", ".bin", "mono-nuget");
         writeFileSync(scriptPath, script, { encoding: "utf-8" });

package/gulp-tasks/modules/shim-nuget.js

@@ -18,8 +18,8 @@
         if (fileExistsSync(shim)) {
             return shim;
         }
-        writeTextFileSync(shim, `#!/bin/sh
-mono $(dirname $0)/nuget.exe $*
+        writeTextFileSync(shim, `#!/bin/sh
+mono $(dirname $0)/nuget.exe $*
 `);
         chmodSync(shim, "777");
         return shim;

package/gulp-tasks/update-self.js

@@ -55,10 +55,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
                 this.emit("end");
             }
             catch (err) {
-                console.error(chalk.redBright(`
- ==================================================
-| WARNING: Unable to update zarro, error(s) follow |
- ==================================================
+                console.error(chalk.redBright(`
+ ==================================================
+| WARNING: Unable to update zarro, error(s) follow |
+ ==================================================
 `));
                 this.emit("error", err);
             }

package/gulp-tasks/upgrade-packages.js

@@ -2,7 +2,7 @@
 (function () {
     const { ls, FsEntities, fileExistsSync } = require("yafs"), gulp = requireModule("gulp");
     gulp.task("upgrade-packages", async () => {
-        const env = requireModule("env"), { upgradePackages } = requireModule("dotnet-cli"), rawPackageMask = env.resolveArray(env.UPGRADE_PACKAGES), packageMask = parseMasks(rawPackageMask, true), rawTargetMask = env.resolveArray(env.UPGRADE_PACKAGES_TARGET), nugetSource = env.resolve(env.NUGET_SOURCE), showProgress = env.resolveFlag(env.UPGRADE_PACKAGES_PROGRESS), preRelease = env.resolveFlag(env.UPGRADE_PACKAGES_PRERELEASE), noRestore = env.resolveFlag(env.UPGRADE_PACKAGES_NO_RESTORE), targets = await resolveTargets(rawTargetMask);
+        const env = requireModule("env"), { upgradePackages } = requireModule("dotnet-cli"), rawPackageMask = env.resolveArray(env.UPGRADE_PACKAGES), packageMask = parseMasks(rawPackageMask, true), rawTargetMask = env.resolveArray(env.UPGRADE_PACKAGES_TARGET), nugetSource = env.resolve(env.NUGET_SOURCE), showProgress = env.resolveFlag(env.UPGRADE_PACKAGES_PROGRESS), preRelease = env.resolveFlag(env.UPGRADE_PACKAGES_PRERELEASE), noRestore = env.resolveFlag(env.UPGRADE_PACKAGES_NO_RESTORE), clearNugetHttpCache = env.resolveFlag(env.UPGRADE_PACKAGES_BYPASS_CACHE), targets = await resolveTargets(rawTargetMask);
         for (const target of targets) {
             await upgradePackages({
                 source: nugetSource,
@@ -10,7 +10,8 @@
                 packages: packageMask,
                 pathToProjectOrSolution: target,
                 preRelease: preRelease,
-                noRestore: noRestore
+                noRestore: noRestore,
+                clearNugetHttpCache: clearNugetHttpCache
             });
         }
     });

package/gulp-tasks/verify-up-to-date.js

@@ -43,9 +43,9 @@
                     const e = ex;
                     const msg = e.message || e;
                     if (msg === "operation timed out") {
-                        log.error(chalk.redBright(`fetch operation timed out:
- - check that the current account can fetch from all remotes
- - optionally disable fetch with SKIP_FETCH_ON_VERIFY=1
+                        log.error(chalk.redBright(`fetch operation timed out:
+ - check that the current account can fetch from all remotes
+ - optionally disable fetch with SKIP_FETCH_ON_VERIFY=1
  - optionally increase GIT_FETCH_TIMEOUT from current value: ${timeout}`));
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.176.2",
+  "version": "1.178.0",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "index.js"
@@ -63,7 +63,7 @@
     "event-stream": "^4.0.1",
     "exec-step": "^0.14.0",
     "fancy-log": "^1.3.3",
-    "gulp": "^4.0.0",
+    "gulp": "^5.0.0",
     "gulp-debug": "^4.0.0",
     "gulp-dotnet-cli": "^1.1.0",
     "gulp-edit-xml": "^3.1.1",

package/types.d.ts

@@ -523,6 +523,7 @@ declare global {
     "BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE" |
     "UPGRADE_PACKAGES_PROGRESS" |
     "UPGRADE_PACKAGES_PRERELEASE" |
+    "UPGRADE_PACKAGES_BYPASS_CACHE" |
     string;
 
   type AnyEnvVar = StringEnvVar | NumericEnvVar | FlagEnvVar | VersionIncrementStrategy;
@@ -704,6 +705,7 @@ declare global {
     BUILD_TOOLS_INSTALL_FORCE_NUGET_EXE: FlagEnvVar;
     UPGRADE_PACKAGES_PROGRESS: FlagEnvVar;
     UPGRADE_PACKAGES_PRERELEASE: FlagEnvVar;
+    UPGRADE_PACKAGES_BYPASS_CACHE: FlagEnvVar;
 
     BUILD_MAX_CPU_COUNT: NumericEnvVar;
     MAX_NUNIT_AGENTS: NumericEnvVar;
@@ -1653,6 +1655,7 @@ declare global {
      * defaults to true
      */
     showProgress?: boolean;
+    clearNugetHttpCache?: boolean;
   }
 
   enum DotNetCache {