create-tamagui 1.7.7 → 1.7.9

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.
package/dist/index.js CHANGED
@@ -159,9 +159,9 @@ var require_isexe = __commonJS({
159
159
  }
160
160
  });
161
161
 
162
- // ../../node_modules/which/which.js
162
+ // ../../node_modules/@expo/spawn-async/node_modules/which/which.js
163
163
  var require_which = __commonJS({
164
- "../../node_modules/which/which.js"(exports, module2) {
164
+ "../../node_modules/@expo/spawn-async/node_modules/which/which.js"(exports, module2) {
165
165
  var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
166
166
  var path3 = require("path");
167
167
  var COLON = isWindows ? ";" : ":";
@@ -3427,12 +3427,24 @@ var require_parse2 = __commonJS({
3427
3427
  function internalize(holder, name, reviver) {
3428
3428
  var value = holder[name];
3429
3429
  if (value != null && (typeof value === "undefined" ? "undefined" : _typeof(value)) === "object") {
3430
- for (var _key in value) {
3431
- var replacement = internalize(value, _key, reviver);
3432
- if (replacement === void 0) {
3433
- delete value[_key];
3434
- } else {
3435
- value[_key] = replacement;
3430
+ if (Array.isArray(value)) {
3431
+ for (var i = 0; i < value.length; i++) {
3432
+ var _key = String(i);
3433
+ var replacement = internalize(value, _key, reviver);
3434
+ if (replacement === void 0) {
3435
+ delete value[_key];
3436
+ } else {
3437
+ Object.defineProperty(value, _key, { value: replacement, writable: true, enumerable: true, configurable: true });
3438
+ }
3439
+ }
3440
+ } else {
3441
+ for (var _key2 in value) {
3442
+ var _replacement = internalize(value, _key2, reviver);
3443
+ if (_replacement === void 0) {
3444
+ delete value[_key2];
3445
+ } else {
3446
+ Object.defineProperty(value, _key2, { value: _replacement, writable: true, enumerable: true, configurable: true });
3447
+ }
3436
3448
  }
3437
3449
  }
3438
3450
  }
@@ -4106,7 +4118,7 @@ var require_parse2 = __commonJS({
4106
4118
  if (Array.isArray(parent)) {
4107
4119
  parent.push(value);
4108
4120
  } else {
4109
- parent[key] = value;
4121
+ Object.defineProperty(parent, key, { value, writable: true, enumerable: true, configurable: true });
4110
4122
  }
4111
4123
  }
4112
4124
  if (value !== null && (typeof value === "undefined" ? "undefined" : _typeof(value)) === "object") {
@@ -4547,7 +4559,7 @@ var require_polyfills = __commonJS({
4547
4559
  var start = Date.now();
4548
4560
  var backoff = 0;
4549
4561
  fs$rename(from, to, function CB(er) {
4550
- if (er && (er.code === "EACCES" || er.code === "EPERM") && Date.now() - start < 6e4) {
4562
+ if (er && (er.code === "EACCES" || er.code === "EPERM" || er.code === "EBUSY") && Date.now() - start < 6e4) {
4551
4563
  setTimeout(function() {
4552
4564
  fs4.stat(to, function(stater, st) {
4553
4565
  if (stater && stater.code === "ENOENT")
@@ -7742,7 +7754,7 @@ var require_scan = __commonJS({
7742
7754
  }
7743
7755
  let base = str;
7744
7756
  let prefix = "";
7745
- let glob2 = "";
7757
+ let glob = "";
7746
7758
  if (start > 0) {
7747
7759
  prefix = str.slice(0, start);
7748
7760
  str = str.slice(start);
@@ -7750,10 +7762,10 @@ var require_scan = __commonJS({
7750
7762
  }
7751
7763
  if (base && isGlob === true && lastIndex > 0) {
7752
7764
  base = str.slice(0, lastIndex);
7753
- glob2 = str.slice(lastIndex);
7765
+ glob = str.slice(lastIndex);
7754
7766
  } else if (isGlob === true) {
7755
7767
  base = "";
7756
- glob2 = str;
7768
+ glob = str;
7757
7769
  } else {
7758
7770
  base = str;
7759
7771
  }
@@ -7763,8 +7775,8 @@ var require_scan = __commonJS({
7763
7775
  }
7764
7776
  }
7765
7777
  if (opts.unescape === true) {
7766
- if (glob2)
7767
- glob2 = utils.removeBackslashes(glob2);
7778
+ if (glob)
7779
+ glob = utils.removeBackslashes(glob);
7768
7780
  if (base && backslashes === true) {
7769
7781
  base = utils.removeBackslashes(base);
7770
7782
  }
@@ -7774,7 +7786,7 @@ var require_scan = __commonJS({
7774
7786
  input,
7775
7787
  start,
7776
7788
  base,
7777
- glob: glob2,
7789
+ glob,
7778
7790
  isBrace,
7779
7791
  isBracket,
7780
7792
  isGlob,
@@ -8620,9 +8632,9 @@ var require_picomatch = __commonJS({
8620
8632
  var utils = require_utils2();
8621
8633
  var constants = require_constants2();
8622
8634
  var isObject = (val) => val && typeof val === "object" && !Array.isArray(val);
8623
- var picomatch = (glob2, options, returnState = false) => {
8624
- if (Array.isArray(glob2)) {
8625
- const fns = glob2.map((input) => picomatch(input, options, returnState));
8635
+ var picomatch = (glob, options, returnState = false) => {
8636
+ if (Array.isArray(glob)) {
8637
+ const fns = glob.map((input) => picomatch(input, options, returnState));
8626
8638
  const arrayMatcher = (str) => {
8627
8639
  for (const isMatch of fns) {
8628
8640
  const state2 = isMatch(str);
@@ -8633,13 +8645,13 @@ var require_picomatch = __commonJS({
8633
8645
  };
8634
8646
  return arrayMatcher;
8635
8647
  }
8636
- const isState = isObject(glob2) && glob2.tokens && glob2.input;
8637
- if (glob2 === "" || typeof glob2 !== "string" && !isState) {
8648
+ const isState = isObject(glob) && glob.tokens && glob.input;
8649
+ if (glob === "" || typeof glob !== "string" && !isState) {
8638
8650
  throw new TypeError("Expected pattern to be a non-empty string");
8639
8651
  }
8640
8652
  const opts = options || {};
8641
8653
  const posix = utils.isWindows(options);
8642
- const regex = isState ? picomatch.compileRe(glob2, options) : picomatch.makeRe(glob2, options, false, true);
8654
+ const regex = isState ? picomatch.compileRe(glob, options) : picomatch.makeRe(glob, options, false, true);
8643
8655
  const state = regex.state;
8644
8656
  delete regex.state;
8645
8657
  let isIgnored = () => false;
@@ -8648,8 +8660,8 @@ var require_picomatch = __commonJS({
8648
8660
  isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
8649
8661
  }
8650
8662
  const matcher = (input, returnObject = false) => {
8651
- const { isMatch, match, output } = picomatch.test(input, regex, options, { glob: glob2, posix });
8652
- const result = { glob: glob2, state, regex, posix, input, output, match, isMatch };
8663
+ const { isMatch, match, output } = picomatch.test(input, regex, options, { glob, posix });
8664
+ const result = { glob, state, regex, posix, input, output, match, isMatch };
8653
8665
  if (typeof opts.onResult === "function") {
8654
8666
  opts.onResult(result);
8655
8667
  }
@@ -8674,7 +8686,7 @@ var require_picomatch = __commonJS({
8674
8686
  }
8675
8687
  return matcher;
8676
8688
  };
8677
- picomatch.test = (input, regex, options, { glob: glob2, posix } = {}) => {
8689
+ picomatch.test = (input, regex, options, { glob, posix } = {}) => {
8678
8690
  if (typeof input !== "string") {
8679
8691
  throw new TypeError("Expected input to be a string");
8680
8692
  }
@@ -8683,11 +8695,11 @@ var require_picomatch = __commonJS({
8683
8695
  }
8684
8696
  const opts = options || {};
8685
8697
  const format = opts.format || (posix ? utils.toPosixSlashes : null);
8686
- let match = input === glob2;
8698
+ let match = input === glob;
8687
8699
  let output = match && format ? format(input) : input;
8688
8700
  if (match === false) {
8689
8701
  output = format ? format(input) : input;
8690
- match = output === glob2;
8702
+ match = output === glob;
8691
8703
  }
8692
8704
  if (match === false || opts.capture === true) {
8693
8705
  if (opts.matchBase === true || opts.basename === true) {
@@ -8698,8 +8710,8 @@ var require_picomatch = __commonJS({
8698
8710
  }
8699
8711
  return { isMatch: Boolean(match), match, output };
8700
8712
  };
8701
- picomatch.matchBase = (input, glob2, options, posix = utils.isWindows(options)) => {
8702
- const regex = glob2 instanceof RegExp ? glob2 : picomatch.makeRe(glob2, options);
8713
+ picomatch.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
8714
+ const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
8703
8715
  return regex.test(path3.basename(input));
8704
8716
  };
8705
8717
  picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
@@ -8888,9 +8900,9 @@ var require_micromatch = __commonJS({
8888
8900
  }
8889
8901
  return [].concat(patterns).every((p) => picomatch(p, options)(str));
8890
8902
  };
8891
- micromatch.capture = (glob2, input, options) => {
8903
+ micromatch.capture = (glob, input, options) => {
8892
8904
  let posix = utils.isWindows(options);
8893
- let regex = picomatch.makeRe(String(glob2), { ...options, capture: true });
8905
+ let regex = picomatch.makeRe(String(glob), { ...options, capture: true });
8894
8906
  let match = regex.exec(posix ? utils.toPosixSlashes(input) : input);
8895
8907
  if (match) {
8896
8908
  return match.slice(1).map((v) => v === void 0 ? "" : v);
@@ -13361,7 +13373,7 @@ var require_inflight = __commonJS({
13361
13373
  // ../../node_modules/glob/glob.js
13362
13374
  var require_glob = __commonJS({
13363
13375
  "../../node_modules/glob/glob.js"(exports, module2) {
13364
- module2.exports = glob2;
13376
+ module2.exports = glob;
13365
13377
  var rp = require_fs();
13366
13378
  var minimatch = require_minimatch();
13367
13379
  var Minimatch = minimatch.Minimatch;
@@ -13379,7 +13391,7 @@ var require_glob = __commonJS({
13379
13391
  var childrenIgnored = common.childrenIgnored;
13380
13392
  var isIgnored = common.isIgnored;
13381
13393
  var once = require_once();
13382
- function glob2(pattern, options, cb) {
13394
+ function glob(pattern, options, cb) {
13383
13395
  if (typeof options === "function")
13384
13396
  cb = options, options = {};
13385
13397
  if (!options)
@@ -13391,9 +13403,9 @@ var require_glob = __commonJS({
13391
13403
  }
13392
13404
  return new Glob(pattern, options, cb);
13393
13405
  }
13394
- glob2.sync = globSync;
13395
- var GlobSync = glob2.GlobSync = globSync.GlobSync;
13396
- glob2.glob = glob2;
13406
+ glob.sync = globSync;
13407
+ var GlobSync = glob.GlobSync = globSync.GlobSync;
13408
+ glob.glob = glob;
13397
13409
  function extend(origin, add) {
13398
13410
  if (add === null || typeof add !== "object") {
13399
13411
  return origin;
@@ -13405,7 +13417,7 @@ var require_glob = __commonJS({
13405
13417
  }
13406
13418
  return origin;
13407
13419
  }
13408
- glob2.hasMagic = function(pattern, options_) {
13420
+ glob.hasMagic = function(pattern, options_) {
13409
13421
  var options = extend({}, options_);
13410
13422
  options.noprocess = true;
13411
13423
  var g = new Glob(pattern, options);
@@ -13420,7 +13432,7 @@ var require_glob = __commonJS({
13420
13432
  }
13421
13433
  return false;
13422
13434
  };
13423
- glob2.Glob = Glob;
13435
+ glob.Glob = Glob;
13424
13436
  inherits(Glob, EE);
13425
13437
  function Glob(pattern, options, cb) {
13426
13438
  if (typeof options === "function") {
@@ -13919,9 +13931,9 @@ var require_rimraf = __commonJS({
13919
13931
  var assert2 = require("assert");
13920
13932
  var path3 = require("path");
13921
13933
  var fs4 = require("fs");
13922
- var glob2 = void 0;
13934
+ var glob = void 0;
13923
13935
  try {
13924
- glob2 = require_glob();
13936
+ glob = require_glob();
13925
13937
  } catch (_err) {
13926
13938
  }
13927
13939
  var defaultGlobOpts = {
@@ -13949,7 +13961,7 @@ var require_rimraf = __commonJS({
13949
13961
  if (options.glob === false) {
13950
13962
  options.disableGlob = true;
13951
13963
  }
13952
- if (options.disableGlob !== true && glob2 === void 0) {
13964
+ if (options.disableGlob !== true && glob === void 0) {
13953
13965
  throw Error("glob dependency not found, set `options.disableGlob = true` if intentional");
13954
13966
  }
13955
13967
  options.disableGlob = options.disableGlob || false;
@@ -13999,12 +14011,12 @@ var require_rimraf = __commonJS({
13999
14011
  rimraf_(p2, options, CB);
14000
14012
  });
14001
14013
  };
14002
- if (options.disableGlob || !glob2.hasMagic(p))
14014
+ if (options.disableGlob || !glob.hasMagic(p))
14003
14015
  return afterGlob(null, [p]);
14004
14016
  options.lstat(p, (er, stat) => {
14005
14017
  if (!er)
14006
14018
  return afterGlob(null, [p]);
14007
- glob2(p, options.glob, afterGlob);
14019
+ glob(p, options.glob, afterGlob);
14008
14020
  });
14009
14021
  };
14010
14022
  var rimraf_ = (p, options, cb) => {
@@ -14118,14 +14130,14 @@ var require_rimraf = __commonJS({
14118
14130
  assert2(options, "rimraf: missing options");
14119
14131
  assert2.equal(typeof options, "object", "rimraf: options should be object");
14120
14132
  let results;
14121
- if (options.disableGlob || !glob2.hasMagic(p)) {
14133
+ if (options.disableGlob || !glob.hasMagic(p)) {
14122
14134
  results = [p];
14123
14135
  } else {
14124
14136
  try {
14125
14137
  options.lstatSync(p);
14126
14138
  results = [p];
14127
14139
  } catch (er) {
14128
- results = glob2.sync(p, options.glob);
14140
+ results = glob.sync(p, options.glob);
14129
14141
  }
14130
14142
  }
14131
14143
  if (!results.length)
@@ -19860,6 +19872,7 @@ var require_http_cache_semantics = __commonJS({
19860
19872
  206,
19861
19873
  300,
19862
19874
  301,
19875
+ 308,
19863
19876
  404,
19864
19877
  405,
19865
19878
  410,
@@ -19921,10 +19934,10 @@ var require_http_cache_semantics = __commonJS({
19921
19934
  const cc = {};
19922
19935
  if (!header)
19923
19936
  return cc;
19924
- const parts = header.trim().split(/\s*,\s*/);
19937
+ const parts = header.trim().split(/,/);
19925
19938
  for (const part of parts) {
19926
- const [k, v] = part.split(/\s*=\s*/, 2);
19927
- cc[k] = v === void 0 ? true : v.replace(/^"|"$/g, "");
19939
+ const [k, v] = part.split(/=/, 2);
19940
+ cc[k.trim()] = v === void 0 ? true : v.trim().replace(/^"|"$/g, "");
19928
19941
  }
19929
19942
  return cc;
19930
19943
  }
@@ -25822,13 +25835,13 @@ var require_dist2 = __commonJS({
25822
25835
  const answers = {};
25823
25836
  const override2 = prompt._override || {};
25824
25837
  questions = [].concat(questions);
25825
- let answer, question2, quit, name, type;
25838
+ let answer, question, quit, name, type;
25826
25839
  const getFormattedAnswer = /* @__PURE__ */ function() {
25827
- var _ref = _asyncToGenerator(function* (question3, answer2, skipValidation = false) {
25828
- if (!skipValidation && question3.validate && question3.validate(answer2) !== true) {
25840
+ var _ref = _asyncToGenerator(function* (question2, answer2, skipValidation = false) {
25841
+ if (!skipValidation && question2.validate && question2.validate(answer2) !== true) {
25829
25842
  return;
25830
25843
  }
25831
- return question3.format ? yield question3.format(answer2, answers) : answer2;
25844
+ return question2.format ? yield question2.format(answer2, answers) : answer2;
25832
25845
  });
25833
25846
  return function getFormattedAnswer2(_x, _x2) {
25834
25847
  return _ref.apply(this, arguments);
@@ -25839,20 +25852,20 @@ var require_dist2 = __commonJS({
25839
25852
  var _iteratorError = void 0;
25840
25853
  try {
25841
25854
  for (var _iterator = questions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
25842
- question2 = _step.value;
25843
- var _question = question2;
25855
+ question = _step.value;
25856
+ var _question = question;
25844
25857
  name = _question.name;
25845
25858
  type = _question.type;
25846
- for (let key in question2) {
25859
+ for (let key in question) {
25847
25860
  if (passOn.includes(key))
25848
25861
  continue;
25849
- let value = question2[key];
25850
- question2[key] = typeof value === "function" ? yield value(answer, _objectSpread({}, answers), question2) : value;
25862
+ let value = question[key];
25863
+ question[key] = typeof value === "function" ? yield value(answer, _objectSpread({}, answers), question) : value;
25851
25864
  }
25852
- if (typeof question2.message !== "string") {
25865
+ if (typeof question.message !== "string") {
25853
25866
  throw new Error("prompt message is required");
25854
25867
  }
25855
- var _question2 = question2;
25868
+ var _question2 = question;
25856
25869
  name = _question2.name;
25857
25870
  type = _question2.type;
25858
25871
  if (!type)
@@ -25860,19 +25873,19 @@ var require_dist2 = __commonJS({
25860
25873
  if (prompts2[type] === void 0) {
25861
25874
  throw new Error(`prompt type (${type}) is not defined`);
25862
25875
  }
25863
- if (override2[question2.name] !== void 0) {
25864
- answer = yield getFormattedAnswer(question2, override2[question2.name]);
25876
+ if (override2[question.name] !== void 0) {
25877
+ answer = yield getFormattedAnswer(question, override2[question.name]);
25865
25878
  if (answer !== void 0) {
25866
25879
  answers[name] = answer;
25867
25880
  continue;
25868
25881
  }
25869
25882
  }
25870
25883
  try {
25871
- answer = prompt._injected ? getInjectedAnswer(prompt._injected) : yield prompts2[type](question2);
25872
- answers[name] = answer = yield getFormattedAnswer(question2, answer, true);
25873
- quit = yield onSubmit(question2, answer, answers);
25884
+ answer = prompt._injected ? getInjectedAnswer(prompt._injected) : yield prompts2[type](question);
25885
+ answers[name] = answer = yield getFormattedAnswer(question, answer, true);
25886
+ quit = yield onSubmit(question, answer, answers);
25874
25887
  } catch (err) {
25875
- quit = !(yield onCancel(question2, answers));
25888
+ quit = !(yield onCancel(question, answers));
25876
25889
  }
25877
25890
  if (quit)
25878
25891
  return answers;
@@ -27936,43 +27949,43 @@ var require_lib6 = __commonJS({
27936
27949
  const answers = {};
27937
27950
  const override2 = prompt._override || {};
27938
27951
  questions = [].concat(questions);
27939
- let answer, question2, quit, name, type;
27940
- const getFormattedAnswer = async (question3, answer2, skipValidation = false) => {
27941
- if (!skipValidation && question3.validate && question3.validate(answer2) !== true) {
27952
+ let answer, question, quit, name, type;
27953
+ const getFormattedAnswer = async (question2, answer2, skipValidation = false) => {
27954
+ if (!skipValidation && question2.validate && question2.validate(answer2) !== true) {
27942
27955
  return;
27943
27956
  }
27944
- return question3.format ? await question3.format(answer2, answers) : answer2;
27957
+ return question2.format ? await question2.format(answer2, answers) : answer2;
27945
27958
  };
27946
- for (question2 of questions) {
27947
- ({ name, type } = question2);
27948
- for (let key in question2) {
27959
+ for (question of questions) {
27960
+ ({ name, type } = question);
27961
+ for (let key in question) {
27949
27962
  if (passOn.includes(key))
27950
27963
  continue;
27951
- let value = question2[key];
27952
- question2[key] = typeof value === "function" ? await value(answer, { ...answers }, question2) : value;
27964
+ let value = question[key];
27965
+ question[key] = typeof value === "function" ? await value(answer, { ...answers }, question) : value;
27953
27966
  }
27954
- if (typeof question2.message !== "string") {
27967
+ if (typeof question.message !== "string") {
27955
27968
  throw new Error("prompt message is required");
27956
27969
  }
27957
- ({ name, type } = question2);
27970
+ ({ name, type } = question);
27958
27971
  if (!type)
27959
27972
  continue;
27960
27973
  if (prompts2[type] === void 0) {
27961
27974
  throw new Error(`prompt type (${type}) is not defined`);
27962
27975
  }
27963
- if (override2[question2.name] !== void 0) {
27964
- answer = await getFormattedAnswer(question2, override2[question2.name]);
27976
+ if (override2[question.name] !== void 0) {
27977
+ answer = await getFormattedAnswer(question, override2[question.name]);
27965
27978
  if (answer !== void 0) {
27966
27979
  answers[name] = answer;
27967
27980
  continue;
27968
27981
  }
27969
27982
  }
27970
27983
  try {
27971
- answer = prompt._injected ? getInjectedAnswer(prompt._injected) : await prompts2[type](question2);
27972
- answers[name] = answer = await getFormattedAnswer(question2, answer, true);
27973
- quit = await onSubmit(question2, answer, answers);
27984
+ answer = prompt._injected ? getInjectedAnswer(prompt._injected) : await prompts2[type](question);
27985
+ answers[name] = answer = await getFormattedAnswer(question, answer, true);
27986
+ quit = await onSubmit(question, answer, answers);
27974
27987
  } catch (err) {
27975
- quit = !await onCancel(question2, answers);
27988
+ quit = !await onCancel(question, answers);
27976
27989
  }
27977
27990
  if (quit)
27978
27991
  return answers;
@@ -32644,6 +32657,94 @@ var require_tar = __commonJS({
32644
32657
  }
32645
32658
  });
32646
32659
 
32660
+ // ../../node_modules/zx/node_modules/which/lib/index.js
32661
+ var require_lib7 = __commonJS({
32662
+ "../../node_modules/zx/node_modules/which/lib/index.js"(exports, module2) {
32663
+ var isexe = require_isexe();
32664
+ var { join: join2, delimiter, sep, posix } = require("path");
32665
+ var isWindows = process.platform === "win32";
32666
+ var rSlash = new RegExp(`[${posix.sep}${sep === posix.sep ? "" : sep}]`.replace(/(\\)/g, "\\$1"));
32667
+ var rRel = new RegExp(`^\\.${rSlash.source}`);
32668
+ var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
32669
+ var getPathInfo = (cmd, {
32670
+ path: optPath = process.env.PATH,
32671
+ pathExt: optPathExt = process.env.PATHEXT,
32672
+ delimiter: optDelimiter = delimiter
32673
+ }) => {
32674
+ const pathEnv = cmd.match(rSlash) ? [""] : [
32675
+ // windows always checks the cwd first
32676
+ ...isWindows ? [process.cwd()] : [],
32677
+ ...(optPath || /* istanbul ignore next: very unusual */
32678
+ "").split(optDelimiter)
32679
+ ];
32680
+ if (isWindows) {
32681
+ const pathExtExe = optPathExt || [".EXE", ".CMD", ".BAT", ".COM"].join(optDelimiter);
32682
+ const pathExt = pathExtExe.split(optDelimiter);
32683
+ if (cmd.includes(".") && pathExt[0] !== "") {
32684
+ pathExt.unshift("");
32685
+ }
32686
+ return { pathEnv, pathExt, pathExtExe };
32687
+ }
32688
+ return { pathEnv, pathExt: [""] };
32689
+ };
32690
+ var getPathPart = (raw, cmd) => {
32691
+ const pathPart = /^".*"$/.test(raw) ? raw.slice(1, -1) : raw;
32692
+ const prefix = !pathPart && rRel.test(cmd) ? cmd.slice(0, 2) : "";
32693
+ return prefix + join2(pathPart, cmd);
32694
+ };
32695
+ var which2 = async (cmd, opt = {}) => {
32696
+ const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
32697
+ const found = [];
32698
+ for (const envPart of pathEnv) {
32699
+ const p = getPathPart(envPart, cmd);
32700
+ for (const ext of pathExt) {
32701
+ const withExt = p + ext;
32702
+ const is = await isexe(withExt, { pathExt: pathExtExe, ignoreErrors: true });
32703
+ if (is) {
32704
+ if (!opt.all) {
32705
+ return withExt;
32706
+ }
32707
+ found.push(withExt);
32708
+ }
32709
+ }
32710
+ }
32711
+ if (opt.all && found.length) {
32712
+ return found;
32713
+ }
32714
+ if (opt.nothrow) {
32715
+ return null;
32716
+ }
32717
+ throw getNotFoundError(cmd);
32718
+ };
32719
+ var whichSync = (cmd, opt = {}) => {
32720
+ const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
32721
+ const found = [];
32722
+ for (const pathEnvPart of pathEnv) {
32723
+ const p = getPathPart(pathEnvPart, cmd);
32724
+ for (const ext of pathExt) {
32725
+ const withExt = p + ext;
32726
+ const is = isexe.sync(withExt, { pathExt: pathExtExe, ignoreErrors: true });
32727
+ if (is) {
32728
+ if (!opt.all) {
32729
+ return withExt;
32730
+ }
32731
+ found.push(withExt);
32732
+ }
32733
+ }
32734
+ }
32735
+ if (opt.all && found.length) {
32736
+ return found;
32737
+ }
32738
+ if (opt.nothrow) {
32739
+ return null;
32740
+ }
32741
+ throw getNotFoundError(cmd);
32742
+ };
32743
+ module2.exports = which2;
32744
+ which2.sync = whichSync;
32745
+ }
32746
+ });
32747
+
32647
32748
  // ../../node_modules/from/index.js
32648
32749
  var require_from = __commonJS({
32649
32750
  "../../node_modules/from/index.js"(exports, module2) {
@@ -34771,6 +34872,11 @@ var require_queue = __commonJS({
34771
34872
  return p;
34772
34873
  }
34773
34874
  function drained() {
34875
+ if (queue.idle()) {
34876
+ return new Promise(function(resolve) {
34877
+ resolve();
34878
+ });
34879
+ }
34774
34880
  var previousDrain = queue.drain;
34775
34881
  var p = new Promise(function(resolve) {
34776
34882
  queue.drain = function() {
@@ -36017,12 +36123,17 @@ var require_ignore = __commonJS({
36017
36123
  var SPACE = " ";
36018
36124
  var ESCAPE = "\\";
36019
36125
  var REGEX_TEST_BLANK_LINE = /^\s+$/;
36126
+ var REGEX_INVALID_TRAILING_BACKSLASH = /(?:[^\\]|^)\\$/;
36020
36127
  var REGEX_REPLACE_LEADING_EXCAPED_EXCLAMATION = /^\\!/;
36021
36128
  var REGEX_REPLACE_LEADING_EXCAPED_HASH = /^\\#/;
36022
36129
  var REGEX_SPLITALL_CRLF = /\r?\n/g;
36023
36130
  var REGEX_TEST_INVALID_PATH = /^\.*\/|^\.+$/;
36024
36131
  var SLASH = "/";
36025
- var KEY_IGNORE = typeof Symbol !== "undefined" ? Symbol.for("node-ignore") : "node-ignore";
36132
+ var TMP_KEY_IGNORE = "node-ignore";
36133
+ if (typeof Symbol !== "undefined") {
36134
+ TMP_KEY_IGNORE = Symbol.for("node-ignore");
36135
+ }
36136
+ var KEY_IGNORE = TMP_KEY_IGNORE;
36026
36137
  var define = (object, key, value) => Object.defineProperty(object, key, { value });
36027
36138
  var REGEX_REGEXP_RANGE = /([0-z])-([0-z])/g;
36028
36139
  var RETURN_FALSE = () => false;
@@ -36116,16 +36227,20 @@ var require_ignore = __commonJS({
36116
36227
  // Check if it is not the last `'/**'`
36117
36228
  (_, index, str) => index + 6 < str.length ? "(?:\\/[^\\/]+)*" : "\\/.+"
36118
36229
  ],
36119
- // intermediate wildcards
36230
+ // normal intermediate wildcards
36120
36231
  [
36121
36232
  // Never replace escaped '*'
36122
36233
  // ignore rule '\*' will match the path '*'
36123
36234
  // 'abc.*/' -> go
36124
- // 'abc.*' -> skip this rule
36125
- /(^|[^\\]+)\\\*(?=.+)/g,
36235
+ // 'abc.*' -> skip this rule,
36236
+ // coz trailing single wildcard will be handed by [trailing wildcard]
36237
+ /(^|[^\\]+)(\\\*)+(?=.+)/g,
36126
36238
  // '*.js' matches '.js'
36127
36239
  // '*.js' doesn't match 'abc'
36128
- (_, p1) => `${p1}[^\\/]*`
36240
+ (_, p1, p2) => {
36241
+ const unescaped = p2.replace(/\\\*/g, "[^\\/]*");
36242
+ return p1 + unescaped;
36243
+ }
36129
36244
  ],
36130
36245
  [
36131
36246
  // unescape, revert step 3 except for back slash
@@ -36185,7 +36300,7 @@ var require_ignore = __commonJS({
36185
36300
  return ignoreCase ? new RegExp(source, "i") : new RegExp(source);
36186
36301
  };
36187
36302
  var isString2 = (subject) => typeof subject === "string";
36188
- var checkPattern = (pattern) => pattern && isString2(pattern) && !REGEX_TEST_BLANK_LINE.test(pattern) && pattern.indexOf("#") !== 0;
36303
+ var checkPattern = (pattern) => pattern && isString2(pattern) && !REGEX_TEST_BLANK_LINE.test(pattern) && !REGEX_INVALID_TRAILING_BACKSLASH.test(pattern) && pattern.indexOf("#") !== 0;
36189
36304
  var splitPattern = (pattern) => pattern.split(REGEX_SPLITALL_CRLF);
36190
36305
  var IgnoreRule = class {
36191
36306
  constructor(origin, pattern, negative, regex) {
@@ -36374,21 +36489,52 @@ var require_ignore = __commonJS({
36374
36489
  // ../../node_modules/minimist/index.js
36375
36490
  var require_minimist = __commonJS({
36376
36491
  "../../node_modules/minimist/index.js"(exports, module2) {
36492
+ "use strict";
36493
+ function hasKey(obj, keys) {
36494
+ var o = obj;
36495
+ keys.slice(0, -1).forEach(function(key2) {
36496
+ o = o[key2] || {};
36497
+ });
36498
+ var key = keys[keys.length - 1];
36499
+ return key in o;
36500
+ }
36501
+ function isNumber(x) {
36502
+ if (typeof x === "number") {
36503
+ return true;
36504
+ }
36505
+ if (/^0x[0-9a-f]+$/i.test(x)) {
36506
+ return true;
36507
+ }
36508
+ return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
36509
+ }
36510
+ function isConstructorOrProto(obj, key) {
36511
+ return key === "constructor" && typeof obj[key] === "function" || key === "__proto__";
36512
+ }
36377
36513
  module2.exports = function(args, opts) {
36378
- if (!opts)
36514
+ if (!opts) {
36379
36515
  opts = {};
36380
- var flags = { bools: {}, strings: {}, unknownFn: null };
36381
- if (typeof opts["unknown"] === "function") {
36382
- flags.unknownFn = opts["unknown"];
36383
36516
  }
36384
- if (typeof opts["boolean"] === "boolean" && opts["boolean"]) {
36517
+ var flags = {
36518
+ bools: {},
36519
+ strings: {},
36520
+ unknownFn: null
36521
+ };
36522
+ if (typeof opts.unknown === "function") {
36523
+ flags.unknownFn = opts.unknown;
36524
+ }
36525
+ if (typeof opts.boolean === "boolean" && opts.boolean) {
36385
36526
  flags.allBools = true;
36386
36527
  } else {
36387
- [].concat(opts["boolean"]).filter(Boolean).forEach(function(key2) {
36528
+ [].concat(opts.boolean).filter(Boolean).forEach(function(key2) {
36388
36529
  flags.bools[key2] = true;
36389
36530
  });
36390
36531
  }
36391
36532
  var aliases = {};
36533
+ function aliasIsBoolean(key2) {
36534
+ return aliases[key2].some(function(x) {
36535
+ return flags.bools[x];
36536
+ });
36537
+ }
36392
36538
  Object.keys(opts.alias || {}).forEach(function(key2) {
36393
36539
  aliases[key2] = [].concat(opts.alias[key2]);
36394
36540
  aliases[key2].forEach(function(x) {
@@ -36400,89 +36546,96 @@ var require_minimist = __commonJS({
36400
36546
  [].concat(opts.string).filter(Boolean).forEach(function(key2) {
36401
36547
  flags.strings[key2] = true;
36402
36548
  if (aliases[key2]) {
36403
- flags.strings[aliases[key2]] = true;
36549
+ [].concat(aliases[key2]).forEach(function(k) {
36550
+ flags.strings[k] = true;
36551
+ });
36404
36552
  }
36405
36553
  });
36406
- var defaults2 = opts["default"] || {};
36554
+ var defaults2 = opts.default || {};
36407
36555
  var argv2 = { _: [] };
36408
- Object.keys(flags.bools).forEach(function(key2) {
36409
- setArg(key2, defaults2[key2] === void 0 ? false : defaults2[key2]);
36410
- });
36411
- var notFlags = [];
36412
- if (args.indexOf("--") !== -1) {
36413
- notFlags = args.slice(args.indexOf("--") + 1);
36414
- args = args.slice(0, args.indexOf("--"));
36415
- }
36416
36556
  function argDefined(key2, arg2) {
36417
36557
  return flags.allBools && /^--[^=]+$/.test(arg2) || flags.strings[key2] || flags.bools[key2] || aliases[key2];
36418
36558
  }
36419
- function setArg(key2, val, arg2) {
36420
- if (arg2 && flags.unknownFn && !argDefined(key2, arg2)) {
36421
- if (flags.unknownFn(arg2) === false)
36422
- return;
36423
- }
36424
- var value2 = !flags.strings[key2] && isNumber(val) ? Number(val) : val;
36425
- setKey(argv2, key2.split("."), value2);
36426
- (aliases[key2] || []).forEach(function(x) {
36427
- setKey(argv2, x.split("."), value2);
36428
- });
36429
- }
36430
36559
  function setKey(obj, keys, value2) {
36431
36560
  var o = obj;
36432
36561
  for (var i2 = 0; i2 < keys.length - 1; i2++) {
36433
36562
  var key2 = keys[i2];
36434
- if (isConstructorOrProto(o, key2))
36563
+ if (isConstructorOrProto(o, key2)) {
36435
36564
  return;
36436
- if (o[key2] === void 0)
36565
+ }
36566
+ if (o[key2] === void 0) {
36437
36567
  o[key2] = {};
36438
- if (o[key2] === Object.prototype || o[key2] === Number.prototype || o[key2] === String.prototype)
36568
+ }
36569
+ if (o[key2] === Object.prototype || o[key2] === Number.prototype || o[key2] === String.prototype) {
36439
36570
  o[key2] = {};
36440
- if (o[key2] === Array.prototype)
36571
+ }
36572
+ if (o[key2] === Array.prototype) {
36441
36573
  o[key2] = [];
36574
+ }
36442
36575
  o = o[key2];
36443
36576
  }
36444
- var key2 = keys[keys.length - 1];
36445
- if (isConstructorOrProto(o, key2))
36577
+ var lastKey = keys[keys.length - 1];
36578
+ if (isConstructorOrProto(o, lastKey)) {
36446
36579
  return;
36447
- if (o === Object.prototype || o === Number.prototype || o === String.prototype)
36580
+ }
36581
+ if (o === Object.prototype || o === Number.prototype || o === String.prototype) {
36448
36582
  o = {};
36449
- if (o === Array.prototype)
36583
+ }
36584
+ if (o === Array.prototype) {
36450
36585
  o = [];
36451
- if (o[key2] === void 0 || flags.bools[key2] || typeof o[key2] === "boolean") {
36452
- o[key2] = value2;
36453
- } else if (Array.isArray(o[key2])) {
36454
- o[key2].push(value2);
36586
+ }
36587
+ if (o[lastKey] === void 0 || flags.bools[lastKey] || typeof o[lastKey] === "boolean") {
36588
+ o[lastKey] = value2;
36589
+ } else if (Array.isArray(o[lastKey])) {
36590
+ o[lastKey].push(value2);
36455
36591
  } else {
36456
- o[key2] = [o[key2], value2];
36592
+ o[lastKey] = [o[lastKey], value2];
36457
36593
  }
36458
36594
  }
36459
- function aliasIsBoolean(key2) {
36460
- return aliases[key2].some(function(x) {
36461
- return flags.bools[x];
36595
+ function setArg(key2, val, arg2) {
36596
+ if (arg2 && flags.unknownFn && !argDefined(key2, arg2)) {
36597
+ if (flags.unknownFn(arg2) === false) {
36598
+ return;
36599
+ }
36600
+ }
36601
+ var value2 = !flags.strings[key2] && isNumber(val) ? Number(val) : val;
36602
+ setKey(argv2, key2.split("."), value2);
36603
+ (aliases[key2] || []).forEach(function(x) {
36604
+ setKey(argv2, x.split("."), value2);
36462
36605
  });
36463
36606
  }
36607
+ Object.keys(flags.bools).forEach(function(key2) {
36608
+ setArg(key2, defaults2[key2] === void 0 ? false : defaults2[key2]);
36609
+ });
36610
+ var notFlags = [];
36611
+ if (args.indexOf("--") !== -1) {
36612
+ notFlags = args.slice(args.indexOf("--") + 1);
36613
+ args = args.slice(0, args.indexOf("--"));
36614
+ }
36464
36615
  for (var i = 0; i < args.length; i++) {
36465
36616
  var arg = args[i];
36617
+ var key;
36618
+ var next;
36466
36619
  if (/^--.+=/.test(arg)) {
36467
36620
  var m = arg.match(/^--([^=]+)=([\s\S]*)$/);
36468
- var key = m[1];
36621
+ key = m[1];
36469
36622
  var value = m[2];
36470
36623
  if (flags.bools[key]) {
36471
36624
  value = value !== "false";
36472
36625
  }
36473
36626
  setArg(key, value, arg);
36474
36627
  } else if (/^--no-.+/.test(arg)) {
36475
- var key = arg.match(/^--no-(.+)/)[1];
36628
+ key = arg.match(/^--no-(.+)/)[1];
36476
36629
  setArg(key, false, arg);
36477
36630
  } else if (/^--.+/.test(arg)) {
36478
- var key = arg.match(/^--(.+)/)[1];
36479
- var next = args[i + 1];
36480
- if (next !== void 0 && !/^-/.test(next) && !flags.bools[key] && !flags.allBools && (aliases[key] ? !aliasIsBoolean(key) : true)) {
36631
+ key = arg.match(/^--(.+)/)[1];
36632
+ next = args[i + 1];
36633
+ if (next !== void 0 && !/^(-|--)[^-]/.test(next) && !flags.bools[key] && !flags.allBools && (aliases[key] ? !aliasIsBoolean(key) : true)) {
36481
36634
  setArg(key, next, arg);
36482
- i++;
36635
+ i += 1;
36483
36636
  } else if (/^(true|false)$/.test(next)) {
36484
36637
  setArg(key, next === "true", arg);
36485
- i++;
36638
+ i += 1;
36486
36639
  } else {
36487
36640
  setArg(key, flags.strings[key] ? "" : true, arg);
36488
36641
  }
@@ -36490,13 +36643,13 @@ var require_minimist = __commonJS({
36490
36643
  var letters = arg.slice(1, -1).split("");
36491
36644
  var broken = false;
36492
36645
  for (var j = 0; j < letters.length; j++) {
36493
- var next = arg.slice(j + 2);
36646
+ next = arg.slice(j + 2);
36494
36647
  if (next === "-") {
36495
36648
  setArg(letters[j], next, arg);
36496
36649
  continue;
36497
36650
  }
36498
- if (/[A-Za-z]/.test(letters[j]) && /=/.test(next)) {
36499
- setArg(letters[j], next.split("=")[1], arg);
36651
+ if (/[A-Za-z]/.test(letters[j]) && next[0] === "=") {
36652
+ setArg(letters[j], next.slice(1), arg);
36500
36653
  broken = true;
36501
36654
  break;
36502
36655
  }
@@ -36513,23 +36666,21 @@ var require_minimist = __commonJS({
36513
36666
  setArg(letters[j], flags.strings[letters[j]] ? "" : true, arg);
36514
36667
  }
36515
36668
  }
36516
- var key = arg.slice(-1)[0];
36669
+ key = arg.slice(-1)[0];
36517
36670
  if (!broken && key !== "-") {
36518
36671
  if (args[i + 1] && !/^(-|--)[^-]/.test(args[i + 1]) && !flags.bools[key] && (aliases[key] ? !aliasIsBoolean(key) : true)) {
36519
36672
  setArg(key, args[i + 1], arg);
36520
- i++;
36673
+ i += 1;
36521
36674
  } else if (args[i + 1] && /^(true|false)$/.test(args[i + 1])) {
36522
36675
  setArg(key, args[i + 1] === "true", arg);
36523
- i++;
36676
+ i += 1;
36524
36677
  } else {
36525
36678
  setArg(key, flags.strings[key] ? "" : true, arg);
36526
36679
  }
36527
36680
  }
36528
36681
  } else {
36529
36682
  if (!flags.unknownFn || flags.unknownFn(arg) !== false) {
36530
- argv2._.push(
36531
- flags.strings["_"] || !isNumber(arg) ? arg : Number(arg)
36532
- );
36683
+ argv2._.push(flags.strings._ || !isNumber(arg) ? arg : Number(arg));
36533
36684
  }
36534
36685
  if (opts.stopEarly) {
36535
36686
  argv2._.push.apply(argv2._, args.slice(i + 1));
@@ -36537,44 +36688,23 @@ var require_minimist = __commonJS({
36537
36688
  }
36538
36689
  }
36539
36690
  }
36540
- Object.keys(defaults2).forEach(function(key2) {
36541
- if (!hasKey(argv2, key2.split("."))) {
36542
- setKey(argv2, key2.split("."), defaults2[key2]);
36543
- (aliases[key2] || []).forEach(function(x) {
36544
- setKey(argv2, x.split("."), defaults2[key2]);
36691
+ Object.keys(defaults2).forEach(function(k) {
36692
+ if (!hasKey(argv2, k.split("."))) {
36693
+ setKey(argv2, k.split("."), defaults2[k]);
36694
+ (aliases[k] || []).forEach(function(x) {
36695
+ setKey(argv2, x.split("."), defaults2[k]);
36545
36696
  });
36546
36697
  }
36547
36698
  });
36548
36699
  if (opts["--"]) {
36549
- argv2["--"] = new Array();
36550
- notFlags.forEach(function(key2) {
36551
- argv2["--"].push(key2);
36552
- });
36700
+ argv2["--"] = notFlags.slice();
36553
36701
  } else {
36554
- notFlags.forEach(function(key2) {
36555
- argv2._.push(key2);
36702
+ notFlags.forEach(function(k) {
36703
+ argv2._.push(k);
36556
36704
  });
36557
36705
  }
36558
36706
  return argv2;
36559
36707
  };
36560
- function hasKey(obj, keys) {
36561
- var o = obj;
36562
- keys.slice(0, -1).forEach(function(key2) {
36563
- o = o[key2] || {};
36564
- });
36565
- var key = keys[keys.length - 1];
36566
- return key in o;
36567
- }
36568
- function isNumber(x) {
36569
- if (typeof x === "number")
36570
- return true;
36571
- if (/^0x[0-9a-f]+$/i.test(x))
36572
- return true;
36573
- return /^[-+]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x);
36574
- }
36575
- function isConstructorOrProto(obj, key) {
36576
- return key === "constructor" && typeof obj[key] === "function" || key === "__proto__";
36577
- }
36578
36708
  }
36579
36709
  });
36580
36710
 
@@ -37766,7 +37896,7 @@ ${indent}${body}`;
37766
37896
  }
37767
37897
  function plainString(item, ctx, onComment, onChompKeep) {
37768
37898
  const { type, value } = item;
37769
- const { actualString, implicitKey, indent, inFlow } = ctx;
37899
+ const { actualString, implicitKey, indent, indentStep, inFlow } = ctx;
37770
37900
  if (implicitKey && /[\n[\]{},]/.test(value) || inFlow && /[[\]{},]/.test(value)) {
37771
37901
  return quotedString(value, ctx);
37772
37902
  }
@@ -37776,9 +37906,13 @@ ${indent}${body}`;
37776
37906
  if (!implicitKey && !inFlow && type !== Scalar.Scalar.PLAIN && value.includes("\n")) {
37777
37907
  return blockString(item, ctx, onComment, onChompKeep);
37778
37908
  }
37779
- if (indent === "" && containsDocumentMarker(value)) {
37780
- ctx.forceBlockIndent = true;
37781
- return blockString(item, ctx, onComment, onChompKeep);
37909
+ if (containsDocumentMarker(value)) {
37910
+ if (indent === "") {
37911
+ ctx.forceBlockIndent = true;
37912
+ return blockString(item, ctx, onComment, onChompKeep);
37913
+ } else if (implicitKey && indent === indentStep) {
37914
+ return quotedString(value, ctx);
37915
+ }
37782
37916
  }
37783
37917
  const str = value.replace(/\n+/g, `$&
37784
37918
  ${indent}`);
@@ -37848,6 +37982,7 @@ var require_stringify3 = __commonJS({
37848
37982
  doubleQuotedAsJSON: false,
37849
37983
  doubleQuotedMinMultiLineLength: 40,
37850
37984
  falseStr: "false",
37985
+ flowCollectionPadding: true,
37851
37986
  indentSeq: true,
37852
37987
  lineWidth: 80,
37853
37988
  minContentWidth: 20,
@@ -37871,6 +38006,7 @@ var require_stringify3 = __commonJS({
37871
38006
  return {
37872
38007
  anchors: /* @__PURE__ */ new Set(),
37873
38008
  doc,
38009
+ flowCollectionPadding: opt.flowCollectionPadding ? " " : "",
37874
38010
  indent: "",
37875
38011
  indentStep: typeof opt.indent === "number" ? " ".repeat(opt.indent) : " ",
37876
38012
  inFlow,
@@ -38012,43 +38148,64 @@ ${indent}:`;
38012
38148
  if (keyComment)
38013
38149
  str += stringifyComment.lineComment(str, ctx.indent, commentString(keyComment));
38014
38150
  }
38015
- let vcb = "";
38016
- let valueComment = null;
38151
+ let vsb, vcb, valueComment;
38017
38152
  if (Node.isNode(value)) {
38018
- if (value.spaceBefore)
38019
- vcb = "\n";
38020
- if (value.commentBefore) {
38021
- const cs = commentString(value.commentBefore);
38022
- vcb += `
38023
- ${stringifyComment.indentComment(cs, ctx.indent)}`;
38024
- }
38153
+ vsb = !!value.spaceBefore;
38154
+ vcb = value.commentBefore;
38025
38155
  valueComment = value.comment;
38026
- } else if (value && typeof value === "object") {
38027
- value = doc.createNode(value);
38156
+ } else {
38157
+ vsb = false;
38158
+ vcb = null;
38159
+ valueComment = null;
38160
+ if (value && typeof value === "object")
38161
+ value = doc.createNode(value);
38028
38162
  }
38029
38163
  ctx.implicitKey = false;
38030
38164
  if (!explicitKey && !keyComment && Node.isScalar(value))
38031
38165
  ctx.indentAtStart = str.length + 1;
38032
38166
  chompKeep = false;
38033
38167
  if (!indentSeq && indentStep.length >= 2 && !ctx.inFlow && !explicitKey && Node.isSeq(value) && !value.flow && !value.tag && !value.anchor) {
38034
- ctx.indent = ctx.indent.substr(2);
38168
+ ctx.indent = ctx.indent.substring(2);
38035
38169
  }
38036
38170
  let valueCommentDone = false;
38037
38171
  const valueStr = stringify.stringify(value, ctx, () => valueCommentDone = true, () => chompKeep = true);
38038
38172
  let ws = " ";
38039
- if (vcb || keyComment) {
38040
- if (valueStr === "" && !ctx.inFlow)
38041
- ws = vcb === "\n" ? "\n\n" : vcb;
38042
- else
38043
- ws = `${vcb}
38173
+ if (keyComment || vsb || vcb) {
38174
+ ws = vsb ? "\n" : "";
38175
+ if (vcb) {
38176
+ const cs = commentString(vcb);
38177
+ ws += `
38178
+ ${stringifyComment.indentComment(cs, ctx.indent)}`;
38179
+ }
38180
+ if (valueStr === "" && !ctx.inFlow) {
38181
+ if (ws === "\n")
38182
+ ws = "\n\n";
38183
+ } else {
38184
+ ws += `
38044
38185
  ${ctx.indent}`;
38186
+ }
38045
38187
  } else if (!explicitKey && Node.isCollection(value)) {
38046
- const flow = valueStr[0] === "[" || valueStr[0] === "{";
38047
- if (!flow || valueStr.includes("\n"))
38048
- ws = `
38188
+ const vs0 = valueStr[0];
38189
+ const nl0 = valueStr.indexOf("\n");
38190
+ const hasNewline = nl0 !== -1;
38191
+ const flow = ctx.inFlow ?? value.flow ?? value.items.length === 0;
38192
+ if (hasNewline || !flow) {
38193
+ let hasPropsLine = false;
38194
+ if (hasNewline && (vs0 === "&" || vs0 === "!")) {
38195
+ let sp0 = valueStr.indexOf(" ");
38196
+ if (vs0 === "&" && sp0 !== -1 && sp0 < nl0 && valueStr[sp0 + 1] === "!") {
38197
+ sp0 = valueStr.indexOf(" ", sp0 + 1);
38198
+ }
38199
+ if (sp0 === -1 || nl0 < sp0)
38200
+ hasPropsLine = true;
38201
+ }
38202
+ if (!hasPropsLine)
38203
+ ws = `
38049
38204
  ${ctx.indent}`;
38050
- } else if (valueStr === "" || valueStr[0] === "\n")
38205
+ }
38206
+ } else if (valueStr === "" || valueStr[0] === "\n") {
38051
38207
  ws = "";
38208
+ }
38052
38209
  str += ws + valueStr;
38053
38210
  if (ctx.inFlow) {
38054
38211
  if (valueCommentDone && onComment)
@@ -38282,7 +38439,7 @@ ${indent}${line}` : "\n";
38282
38439
  return str;
38283
38440
  }
38284
38441
  function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemIndent, onComment }) {
38285
- const { indent, indentStep, options: { commentString } } = ctx;
38442
+ const { indent, indentStep, flowCollectionPadding: fcPadding, options: { commentString } } = ctx;
38286
38443
  itemIndent += indentStep;
38287
38444
  const itemCtx = Object.assign({}, ctx, {
38288
38445
  indent: itemIndent,
@@ -38349,7 +38506,7 @@ ${indentStep}${indent}${line}` : "\n";
38349
38506
  str += `
38350
38507
  ${indent}${end}`;
38351
38508
  } else {
38352
- str = `${start} ${lines.join(" ")} ${end}`;
38509
+ str = `${start}${fcPadding}${lines.join(" ")}${fcPadding}${end}`;
38353
38510
  }
38354
38511
  }
38355
38512
  if (comment) {
@@ -38394,13 +38551,13 @@ var require_YAMLMap = __commonJS({
38394
38551
  return void 0;
38395
38552
  }
38396
38553
  var YAMLMap = class extends Collection.Collection {
38554
+ static get tagName() {
38555
+ return "tag:yaml.org,2002:map";
38556
+ }
38397
38557
  constructor(schema) {
38398
38558
  super(Node.MAP, schema);
38399
38559
  this.items = [];
38400
38560
  }
38401
- static get tagName() {
38402
- return "tag:yaml.org,2002:map";
38403
- }
38404
38561
  /**
38405
38562
  * Adds a value to the collection.
38406
38563
  *
@@ -38545,13 +38702,13 @@ var require_YAMLSeq = __commonJS({
38545
38702
  var Scalar = require_Scalar();
38546
38703
  var toJS = require_toJS();
38547
38704
  var YAMLSeq = class extends Collection.Collection {
38705
+ static get tagName() {
38706
+ return "tag:yaml.org,2002:seq";
38707
+ }
38548
38708
  constructor(schema) {
38549
38709
  super(Node.SEQ, schema);
38550
38710
  this.items = [];
38551
38711
  }
38552
- static get tagName() {
38553
- return "tag:yaml.org,2002:seq";
38554
- }
38555
38712
  add(value) {
38556
38713
  this.items.push(value);
38557
38714
  }
@@ -43659,7 +43816,7 @@ var import_path = __toESM(require("path"));
43659
43816
  var import_stream = require("stream");
43660
43817
  var import_util4 = require("util");
43661
43818
  var PackageManager = __toESM(require_build());
43662
- var import_chalk4 = __toESM(require_source());
43819
+ var import_chalk5 = __toESM(require_source());
43663
43820
  var import_commander = __toESM(require_commander());
43664
43821
  var import_fs_extra = __toESM(require_lib5());
43665
43822
  var import_got = __toESM(require_source4());
@@ -43863,7 +44020,7 @@ var ansi_styles_default = ansiStyles;
43863
44020
  var import_node_process = __toESM(require("process"), 1);
43864
44021
  var import_node_os = __toESM(require("os"), 1);
43865
44022
  var import_node_tty = __toESM(require("tty"), 1);
43866
- function hasFlag(flag, argv2 = import_node_process.default.argv) {
44023
+ function hasFlag(flag, argv2 = globalThis.Deno ? globalThis.Deno.args : import_node_process.default.argv) {
43867
44024
  const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
43868
44025
  const position = argv2.indexOf(prefix + flag);
43869
44026
  const terminatorPosition = argv2.indexOf("--");
@@ -43915,6 +44072,9 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
43915
44072
  return 2;
43916
44073
  }
43917
44074
  }
44075
+ if ("TF_BUILD" in env && "AGENT_NAME" in env) {
44076
+ return 1;
44077
+ }
43918
44078
  if (haveStream && !streamIsTTY && forceColor === void 0) {
43919
44079
  return 0;
43920
44080
  }
@@ -43930,7 +44090,10 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
43930
44090
  return 1;
43931
44091
  }
43932
44092
  if ("CI" in env) {
43933
- if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "GITHUB_ACTIONS", "BUILDKITE", "DRONE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
44093
+ if ("GITHUB_ACTIONS" in env) {
44094
+ return 3;
44095
+ }
44096
+ if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
43934
44097
  return 1;
43935
44098
  }
43936
44099
  return min;
@@ -43938,19 +44101,21 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
43938
44101
  if ("TEAMCITY_VERSION" in env) {
43939
44102
  return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
43940
44103
  }
43941
- if ("TF_BUILD" in env && "AGENT_NAME" in env) {
43942
- return 1;
43943
- }
43944
44104
  if (env.COLORTERM === "truecolor") {
43945
44105
  return 3;
43946
44106
  }
44107
+ if (env.TERM === "xterm-kitty") {
44108
+ return 3;
44109
+ }
43947
44110
  if ("TERM_PROGRAM" in env) {
43948
44111
  const version = Number.parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
43949
44112
  switch (env.TERM_PROGRAM) {
43950
- case "iTerm.app":
44113
+ case "iTerm.app": {
43951
44114
  return version >= 3 ? 3 : 2;
43952
- case "Apple_Terminal":
44115
+ }
44116
+ case "Apple_Terminal": {
43953
44117
  return 2;
44118
+ }
43954
44119
  }
43955
44120
  }
43956
44121
  if (/-256(color)?$/i.test(env.TERM)) {
@@ -44155,7 +44320,7 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
44155
44320
  var source_default = chalk;
44156
44321
 
44157
44322
  // ../../node_modules/zx/build/core.js
44158
- var import_which = __toESM(require_which(), 1);
44323
+ var import_which = __toESM(require_lib7(), 1);
44159
44324
 
44160
44325
  // ../../node_modules/zx/build/util.js
44161
44326
  var import_node_util = require("util");
@@ -44711,8 +44876,8 @@ var ProcessPromise = class extends Promise {
44711
44876
  } catch (e) {
44712
44877
  }
44713
44878
  }
44714
- stdio(stdin2, stdout = "pipe", stderr = "pipe") {
44715
- this._stdio = [stdin2, stdout, stderr];
44879
+ stdio(stdin, stdout = "pipe", stderr = "pipe") {
44880
+ this._stdio = [stdin, stdout, stderr];
44716
44881
  return this;
44717
44882
  }
44718
44883
  nothrow() {
@@ -44896,7 +45061,7 @@ var getIsIgnoredPredicate = (files, cwd) => {
44896
45061
  return (fileOrDirectory) => {
44897
45062
  fileOrDirectory = toPath(fileOrDirectory);
44898
45063
  fileOrDirectory = toRelativePath(fileOrDirectory, cwd);
44899
- return ignores.ignores(slash(fileOrDirectory));
45064
+ return fileOrDirectory ? ignores.ignores(slash(fileOrDirectory)) : false;
44900
45065
  };
44901
45066
  };
44902
45067
  var normalizeOptions = (options = {}) => ({
@@ -45094,7 +45259,7 @@ var generateGlobTasksSync = normalizeArgumentsSync(generateTasksSync);
45094
45259
 
45095
45260
  // ../../node_modules/zx/build/goods.js
45096
45261
  var import_minimist = __toESM(require_minimist(), 1);
45097
- var import_which2 = __toESM(require_which(), 1);
45262
+ var import_which2 = __toESM(require_lib7(), 1);
45098
45263
  var import_yaml = __toESM(require_dist3(), 1);
45099
45264
  var argv = (0, import_minimist.default)(process.argv.slice(2));
45100
45265
  var globby2 = Object.assign(function globby3(patterns, options) {
@@ -45104,7 +45269,7 @@ var globby2 = Object.assign(function globby3(patterns, options) {
45104
45269
  // package.json
45105
45270
  var package_default = {
45106
45271
  name: "create-tamagui",
45107
- version: "1.7.6",
45272
+ version: "1.7.8",
45108
45273
  bin: "./run.js",
45109
45274
  main: "dist",
45110
45275
  files: [
@@ -45138,7 +45303,7 @@ var package_default = {
45138
45303
  },
45139
45304
  devDependencies: {
45140
45305
  "@playwright/test": "^1.29.0",
45141
- "@tamagui/build": "1.7.6",
45306
+ "@tamagui/build": "1.7.8",
45142
45307
  "@types/async-retry": "1.4.2",
45143
45308
  "@types/cross-spawn": "^6.0.2",
45144
45309
  "@types/node": "^16.11.9",
@@ -45175,11 +45340,11 @@ var program = new import_commander.default.Command(package_default.name).version
45175
45340
  "Currently, the only option is `next-expo-solito`, which is set by default.",
45176
45341
  "next-expo-solito"
45177
45342
  ).allowUnknownOption().usage(
45178
- `${import_chalk4.default.green("<project-directory>")} [options]
45343
+ `${import_chalk5.default.green("<project-directory>")} [options]
45179
45344
 
45180
45345
  Example usage:
45181
45346
 
45182
- ${import_chalk4.default.blueBright(`npx ${package_default.name} next-expo`)}`
45347
+ ${import_chalk5.default.blueBright(`npx ${package_default.name} next-expo`)}`
45183
45348
  ).parse(process.argv);
45184
45349
  if (process.argv.includes("--version")) {
45185
45350
  console.log(package_default.version);
@@ -45197,7 +45362,7 @@ function downloadAndExtractExample(root, name) {
45197
45362
  );
45198
45363
  }
45199
45364
  async function run() {
45200
- console.log(import_chalk4.default.bold("Creating tamagui app..."));
45365
+ console.log(import_chalk5.default.bold("Creating tamagui app..."));
45201
45366
  const gitVersionString = parseFloat(
45202
45367
  (0, import_child_process.execSync)(`git --version`).toString().replace(`git version `, "").trim()
45203
45368
  );
@@ -45233,12 +45398,12 @@ async function run() {
45233
45398
  if (!projectPath) {
45234
45399
  console.log();
45235
45400
  console.log("Please specify the project directory:");
45236
- console.log(` ${import_chalk4.default.cyan(program.name())} ${import_chalk4.default.green("<project-directory>")}`);
45401
+ console.log(` ${import_chalk5.default.cyan(program.name())} ${import_chalk5.default.green("<project-directory>")}`);
45237
45402
  console.log();
45238
45403
  console.log("For example:");
45239
- console.log(` ${import_chalk4.default.cyan(program.name())} ${import_chalk4.default.green("my-tamagui-app")}`);
45404
+ console.log(` ${import_chalk5.default.cyan(program.name())} ${import_chalk5.default.green("my-tamagui-app")}`);
45240
45405
  console.log();
45241
- console.log(`Run ${import_chalk4.default.cyan(`${program.name()} --help`)} to see all options.`);
45406
+ console.log(`Run ${import_chalk5.default.cyan(`${program.name()} --help`)} to see all options.`);
45242
45407
  process.exit(1);
45243
45408
  }
45244
45409
  const shouldGitInit = IS_TEST || Boolean(
@@ -45254,40 +45419,40 @@ async function run() {
45254
45419
  const { valid, problems } = validateNpmName(projectName);
45255
45420
  if (!valid) {
45256
45421
  console.error(
45257
- `Could not create a project called ${import_chalk4.default.red(
45422
+ `Could not create a project called ${import_chalk5.default.red(
45258
45423
  `"${projectName}"`
45259
45424
  )} because of npm naming restrictions:`
45260
45425
  );
45261
- problems.forEach((p) => console.error(` ${import_chalk4.default.red.bold("*")} ${p}`));
45426
+ problems.forEach((p) => console.error(` ${import_chalk5.default.red.bold("*")} ${p}`));
45262
45427
  process.exit(1);
45263
45428
  }
45264
45429
  if (import_fs.default.existsSync(resolvedProjectPath)) {
45265
45430
  console.log();
45266
45431
  console.log(
45267
- import_chalk4.default.red("\u{1F6A8} [tamagui] error"),
45268
- `You tried to make a project called ${import_chalk4.default.underline(
45269
- import_chalk4.default.blueBright(projectName)
45270
- )}, but a folder with that name already exists: ${import_chalk4.default.blueBright(
45432
+ import_chalk5.default.red("\u{1F6A8} [tamagui] error"),
45433
+ `You tried to make a project called ${import_chalk5.default.underline(
45434
+ import_chalk5.default.blueBright(projectName)
45435
+ )}, but a folder with that name already exists: ${import_chalk5.default.blueBright(
45271
45436
  resolvedProjectPath
45272
45437
  )}
45273
45438
 
45274
- ${import_chalk4.default.bold(import_chalk4.default.red(`Please pick a different project name \u{1F978}`))}`
45439
+ ${import_chalk5.default.bold(import_chalk5.default.red(`Please pick a different project name \u{1F978}`))}`
45275
45440
  );
45276
45441
  console.log();
45277
45442
  console.log();
45278
45443
  process.exit(1);
45279
45444
  }
45280
45445
  console.log();
45281
- console.log(`Creating a new tamagui app ${import_chalk4.default.blueBright(resolvedProjectPath)}...`);
45446
+ console.log(`Creating a new tamagui app ${import_chalk5.default.blueBright(resolvedProjectPath)}...`);
45282
45447
  import_fs.default.mkdirSync(resolvedProjectPath);
45283
- console.log(import_chalk4.default.green(`${projectName} folder created.`));
45448
+ console.log(import_chalk5.default.green(`${projectName} folder created.`));
45284
45449
  try {
45285
45450
  const home = (0, import_os.homedir)();
45286
45451
  const tamaguiDir = (0, import_path.join)(home, ".tamagui");
45287
45452
  const repoRoot = (0, import_path.join)(__dirname, "..", "..", "..");
45288
45453
  const targetGitDir = IS_TEST ? (0, import_path.join)(tamaguiDir, "tamagui-test") : (0, import_path.join)(tamaguiDir, "tamagui");
45289
45454
  async function setupTamaguiDotDir(isRetry = false) {
45290
- console.log(`Setting up ${import_chalk4.default.blueBright(tamaguiDir)}...`);
45455
+ console.log(`Setting up ${import_chalk5.default.blueBright(tamaguiDir)}...`);
45291
45456
  cd(repoRoot);
45292
45457
  if (process.env.GITHUB_HEAD_REF) {
45293
45458
  try {
@@ -45353,10 +45518,10 @@ ${err.stack}` : "trying from fresh."}`
45353
45518
  process.exit(1);
45354
45519
  }
45355
45520
  console.log(
45356
- `Copying starter from ${starterDir} into ${import_chalk4.default.blueBright(projectName)}...`
45521
+ `Copying starter from ${starterDir} into ${import_chalk5.default.blueBright(projectName)}...`
45357
45522
  );
45358
45523
  await (0, import_fs_extra.copy)(starterDir, resolvedProjectPath);
45359
- console.log(import_chalk4.default.green(`${projectName} created!`));
45524
+ console.log(import_chalk5.default.green(`${projectName} created!`));
45360
45525
  cd(resolvedProjectPath);
45361
45526
  if (shouldGitInit) {
45362
45527
  await $`git init`;
@@ -45376,17 +45541,17 @@ ${err.stack}` : "trying from fresh."}`
45376
45541
  console.error("[tamagui] error installing with " + packageManager + "\n", e == null ? void 0 : e.message);
45377
45542
  process.exit(1);
45378
45543
  }
45379
- console.log(`${import_chalk4.default.green("Success!")} Created ${projectName} at ${projectPath}`);
45544
+ console.log(`${import_chalk5.default.green("Success!")} Created ${projectName} at ${projectPath}`);
45380
45545
  console.log("Inside that directory, you can run several commands:");
45381
45546
  console.log();
45382
- console.log(import_chalk4.default.cyan(` ${packageManager} ${useYarn ? "" : "run "}web`));
45547
+ console.log(import_chalk5.default.cyan(` ${packageManager} ${useYarn ? "" : "run "}web`));
45383
45548
  console.log(" Starts the development server for the Next.js site.");
45384
- console.log(import_chalk4.default.cyan(` ${packageManager} ${useYarn ? "" : "run "}native`));
45549
+ console.log(import_chalk5.default.cyan(` ${packageManager} ${useYarn ? "" : "run "}native`));
45385
45550
  console.log();
45386
45551
  console.log("We suggest that you begin by typing:");
45387
45552
  console.log();
45388
- console.log(import_chalk4.default.cyan(" cd"), projectName);
45389
- console.log(` ${import_chalk4.default.cyan(`${packageManager} ${useYarn ? "" : "run "}web`)}`);
45553
+ console.log(import_chalk5.default.cyan(" cd"), projectName);
45554
+ console.log(` ${import_chalk5.default.cyan(`${packageManager} ${useYarn ? "" : "run "}web`)}`);
45390
45555
  console.log();
45391
45556
  }
45392
45557
  run();