zarro 1.170.22 → 1.170.26

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

@@ -397,10 +397,10 @@
                             path: absoluteNuspecPath,
                             version: await readNuspecVersion(absoluteNuspecPath)
                         };
-                        log.warn(`
-WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
-          The version in '${copy.nuspec}' will be temporarily set to ${opts.versionSuffix} whilst
-          packing and reverted later.
+                        log.warn(`
+WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
+          The version in '${copy.nuspec}' will be temporarily set to ${opts.versionSuffix} whilst
+          packing and reverted later.
 `.trim());
                         await updateNuspecVersion(absoluteNuspecPath, opts.versionSuffix);
                         // TODO: hook into "after dotnet run" to revert
@@ -766,6 +766,10 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         pushFlag(args, opts.exactMatch, "--exact-match");
         pushFlag(args, opts.preRelease, "--prerelease");
         pushIfSet(args, opts.configFile, "--configfile");
+        const skip = opts.skip === undefined ? 0 : opts.skip;
+        const take = opts.take === undefined ? 1024 : opts.take;
+        args.push("--skip", `${skip}`);
+        args.push("--take", `${take}`);
         args.push("--format", "json");
         if (opts.search) {
             args.push(opts.search);
@@ -779,7 +783,6 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         }
         const allText = stdout.join(" "), parsed = JSON.parse(allText);
         const finalResult = [];
-        const limit = opts.take || Number.MAX_VALUE;
         for (const sourceResult of parsed.searchResult) {
             for (const pkg of sourceResult.packages) {
                 finalResult.push({
@@ -796,12 +799,12 @@ WARNING: 'dotnet pack' ignores --version-suffix when a nuspec file is provided.
         // 2. dotnet returns results in ascending version order
         //    - where the most useful, especially for paging, is reverse-ordered
         finalResult.sort((a, b) => a.version.compareWith(b.version)).reverse();
-        const skip = opts.skip || 0;
+        // some registries don't honor paging (looking at you, GitHub)
         if (skip > 0) {
             finalResult.splice(0, skip);
         }
-        if (finalResult.length > limit) {
-            finalResult.splice(limit);
+        if (finalResult.length > take) {
+            finalResult.splice(take);
         }
         return finalResult;
     }

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

@@ -727,9 +727,14 @@
         });
         env.register({
             name: "NUGET_PUSH_SOURCE",
-            help: "Specifically: nuget source to push to. Will fall back on NUGET_SOURCE or first of NUGET_SOURCES.",
+            help: "Specify nuget source to push to. Will fall back on NUGET_SOURCE or first of NUGET_SOURCES.",
             default: env.resolve("NUGET_SOURCE")
         });
+        env.register({
+            name: "PACKAGE_REGISTRY",
+            help: "Specify npm source to push to. Will default to npmjs.com",
+            default: "nuget.org"
+        });
         debug("-- env registration complete --");
     };
 })();

package/gulp-tasks/release-npm.js

@@ -48,6 +48,11 @@
                     args.push("--otp");
                     args.push(otp);
                 }
+                const registry = env.resolve(env.PACKAGE_REGISTRY);
+                if (!!registry) {
+                    args.push("--registry");
+                    args.push(registry);
+                }
                 await spawn("npm", args, {
                     interactive: true
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zarro",
-  "version": "1.170.22",
+  "version": "1.170.26",
   "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
   "bin": {
     "zarro": "./index.js"

package/types.d.ts

@@ -446,6 +446,7 @@ declare global {
     "TAG" |
     "GIT_TAG" |
     "GIT_VERSION_INCREMENT_MESSAGE" |
+    "PACKAGE_REGISTRY" |
     string; // allow client-side extension, encourage usage of env.associate & env.register
 
   type NumericEnvVar =
@@ -641,6 +642,7 @@ declare global {
     TAG: StringEnvVar;
     GIT_TAG: StringEnvVar;
     GIT_VERSION_INCREMENT_MESSAGE: StringEnvVar;
+    PACKAGE_REGISTRY: StringEnvVar;
 
     ENABLE_NUGET_PARALLEL_PROCESSING: FlagEnvVar;
     BUILD_SHOW_INFO: FlagEnvVar;