zarro 1.170.6 → 1.170.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,10 @@
1
1
  "use strict";
2
2
  (function () {
3
- const gulpInfo = require("gulp/package.json"), parts = gulpInfo.version.split(".").map((s) => parseInt(s, 10));
3
+ const { readTextFileSync } = require("yafs"), entryPoint = require.resolve("gulp"), path = require("path"), containingFolder = path.dirname(entryPoint), packageJson = path.join(containingFolder, "package.json"), gulpInfo = readJson(packageJson), parts = gulpInfo.version.split(".").map((s) => parseInt(s, 10));
4
+ function readJson(pathToFile) {
5
+ const contents = readTextFileSync(pathToFile);
6
+ return JSON.parse(contents);
7
+ }
4
8
  module.exports = {
5
9
  major: parts[0],
6
10
  minor: parts[1],
@@ -36,7 +36,8 @@
36
36
  if (!data || !seekKeys) {
37
37
  return undefined;
38
38
  }
39
- const uniqueKeys = new Set(seekKeys);
39
+ const setValues = seekKeys.filter(s => !!s);
40
+ const uniqueKeys = new Set(setValues);
40
41
  for (let seek of uniqueKeys) {
41
42
  const exactMatch = data[seek];
42
43
  if (exactMatch) {
@@ -68,12 +69,18 @@
68
69
  return source.name;
69
70
  }
70
71
  }
71
- log.warn(`Unable to match provides nuget push source '${sourceToResolve}' to the url or name of any registered source on this machine`);
72
+ if (!!process.env[env.NUGET_API_KEY] && looksLikeUrl(sourceToResolve)) {
73
+ return undefined;
74
+ }
75
+ log.warn(`Unable to match provided nuget push source '${sourceToResolve}' to the url or name of any registered source on this machine`);
72
76
  log.warn(` known sources are:`);
73
77
  for (const source of sources) {
74
78
  log.warn(` ${source.name}: ${source.url} (${source.enabled ? "enabled" : "disabled"})`);
75
79
  }
76
- throw new Error(`Unable to determine the nuget source to push to`);
80
+ return undefined;
81
+ }
82
+ function looksLikeUrl(str) {
83
+ return !!str && str.includes("://");
77
84
  }
78
85
  function resolveSource(source) {
79
86
  if (source) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zarro",
3
- "version": "1.170.6",
3
+ "version": "1.170.10",
4
4
  "description": "Some glue to make gulp easier, perhaps even zero- or close-to-zero-conf",
5
5
  "bin": {
6
6
  "zarro": "./index.js"
@@ -58,13 +58,12 @@
58
58
  "bent": "^7.3.12",
59
59
  "cross-env": "^7.0.3",
60
60
  "cross-fetch": "^4.0.0",
61
- "debug": "^4.3.1",
62
61
  "decompress": "^4.2.1",
63
62
  "del": "^5.1.0",
64
63
  "event-stream": "^4.0.1",
65
64
  "exec-step": "^0.8.0",
66
65
  "fancy-log": "^1.3.3",
67
- "gulp": "^4.0.2",
66
+ "gulp": "^4.0.0",
68
67
  "gulp-debug": "^4.0.0",
69
68
  "gulp-dotnet-cli": "^1.1.0",
70
69
  "gulp-edit-xml": "^3.1.1",
@@ -77,7 +76,6 @@
77
76
  "readline": "^1.3.0",
78
77
  "request": "^2.88.2",
79
78
  "require-dir": "^1.2.0",
80
- "requirejs": "^2.3.6",
81
79
  "rimraf": "^3.0.2",
82
80
  "run-sequence": "^2.2.1",
83
81
  "sax": "^1.2.4",
@@ -125,6 +123,7 @@
125
123
  "@types/xml2js": "^0.4.8",
126
124
  "@types/yargs": "^15.0.13",
127
125
  "console-cls": "^1.2.2",
126
+ "debug": "^4.3.4",
128
127
  "debugger-is-attached": "^1.2.0",
129
128
  "expect-even-more-jest": "^1.15.0",
130
129
  "filesystem-sandbox": "^1.20.0",