@yeoman/conflicter 2.0.0-alpha.2 → 2.1.0

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.
Files changed (9) hide show
  1. package/dist/binary-diff.js +2 -6
  2. package/dist/binary-diff.js.map +1 -1
  3. package/dist/conflicter.js +13 -15
  4. package/dist/conflicter.js.map +1 -1
  5. package/dist/transform.js +0 -1
  6. package/dist/transform.js.map +1 -1
  7. package/dist/yo-resolve.js +3 -5
  8. package/dist/yo-resolve.js.map +1 -1
  9. package/package.json +8 -6
package/dist/binary-diff.js CHANGED
@@ -24,14 +24,10 @@ const binaryDiff = (existingFilePath, newFileContents) => {
24
24
  head: ['', 'Existing', 'Replacement', 'Diff'],
25
25
  });
26
26
  let sizeDiff;
27
- if (!newFileContents) {
28
- newFileContents = Buffer.from([]);
29
- }
27
+ newFileContents ||= Buffer.from([]);
30
28
  sizeDiff = existingStat.size > newFileContents.length ? '-' : '+';
31
29
  sizeDiff += prettyBytes(Math.abs(existingStat.size - newFileContents.length));
32
- table.push(['Size', prettyBytes(existingStat.size), prettyBytes(newFileContents.length), sizeDiff],
33
- // eslint-disable-next-line @typescript-eslint/no-unsafe-call
34
- ['Last modified', dateFormat(existingStat.mtime), '', '']);
30
+ table.push(['Size', prettyBytes(existingStat.size), prettyBytes(newFileContents.length), sizeDiff], ['Last modified', dateFormat(existingStat.mtime), '', '']);
35
31
  return table.toString();
36
32
  };
37
33
  export { isBinary, binaryDiff };
package/dist/binary-diff.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"binary-diff.js","sourceRoot":"","sources":["../src/binary-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,mBAAmB,CAAC;AAEjD,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAE,eAAiC,EAAW,EAAE;IAChF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvF,IAAI,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACxC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC;KACd;IAED,OAAO,OAAO,CACZ,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACrD,CAAC,eAAe,IAAI,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAC3H,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,gBAAwB,EAAE,eAAwB,EAAE,EAAE;IACxE,MAAM,YAAY,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;QACtB,IAAI,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC;KAC9C,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC;IAEb,IAAI,CAAC,eAAe,EAAE;QACpB,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACnC;IAED,QAAQ,GAAG,YAAY,CAAC,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAElE,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9E,KAAK,CAAC,IAAI,CACR,CAAC,MAAM,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;IACvF,6DAA6D;IAC7D,CAAC,eAAe,EAAG,UAAkB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CACnE,CAAC;IAEF,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC"}
1
+ {"version":3,"file":"binary-diff.js","sourceRoot":"","sources":["../src/binary-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,mBAAmB,CAAC;AAEjD,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAE,eAAiC,EAAW,EAAE;IAChF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvF,IAAI,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACxC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC;KACd;IAED,OAAO,OAAO,CACZ,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACrD,CAAC,eAAe,IAAI,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAC3H,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,gBAAwB,EAAE,eAAwB,EAAE,EAAE;IACxE,MAAM,YAAY,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;QACtB,IAAI,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC;KAC9C,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC;IAEb,eAAe,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEpC,QAAQ,GAAG,YAAY,CAAC,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAElE,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9E,KAAK,CAAC,IAAI,CACR,CAAC,MAAM,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,EACvF,CAAC,eAAe,EAAG,UAAkB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CACnE,CAAC;IAEF,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC"}
package/dist/conflicter.js CHANGED
@@ -1,12 +1,10 @@
1
- /* eslint-disable @typescript-eslint/member-ordering */
2
1
  import fs from 'node:fs';
3
2
  import { stat as fsStat, readFile } from 'node:fs/promises';
4
3
  import path from 'node:path';
5
4
  import process from 'node:process';
6
5
  import { Buffer } from 'node:buffer';
7
- import { diffWords, diffLines } from 'diff';
6
+ import { diffLines, diffWords } from 'diff';
8
7
  import { loadFile } from 'mem-fs';
9
- // eslint-disable-next-line n/file-extension-in-import
10
8
  import { clearFileState, setModifiedFileState } from 'mem-fs-editor/state';
11
9
  import { transform } from 'p-transform';
12
10
  import { binaryDiff, isBinary } from './binary-diff.js';
@@ -52,7 +50,6 @@ export class Conflicter {
52
50
  this.regenerate = options?.regenerate ?? false;
53
51
  this.dryRun = options?.dryRun ?? false;
54
52
  this.cwd = path.resolve(options?.cwd ?? process.cwd());
55
- // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
56
53
  this.diffOptions = options?.diffOptions;
57
54
  if (this.bail) {
58
55
  // Bail conflicts with force option, if bail set force to false.
@@ -97,23 +94,25 @@ export class Conflicter {
97
94
  }
98
95
  return [colored];
99
96
  };
97
+ const prepareChange = (changes, prefix) => changes
98
+ .split('\n')
99
+ .map((line, index, array) => (array.length - 1 === index ? line : `${prefix}${line}`))
100
+ .join('\n');
100
101
  const messages = file.conflicterChanges
101
102
  ?.map((change) => {
102
103
  if (change.added) {
103
- return { color: 'added', message: change.value };
104
+ return { color: 'added', message: prepareChange(change.value, '+') };
104
105
  }
105
106
  if (change.removed) {
106
- return { color: 'removed', message: change.value };
107
+ return { color: 'removed', message: prepareChange(change.value, '-') };
107
108
  }
108
- return { message: change.value };
109
+ return { message: prepareChange(change.value, ' ') };
109
110
  })
110
111
  .map((colored) => colorLines(colored));
111
112
  if (file.fileModeChanges) {
112
113
  destAdapter.log.colored([
113
- { message: '\npermission change ' },
114
- { message: `${file.fileModeChanges[0]}`, color: 'removed' },
115
- { message: '' },
116
- { message: `${file.fileModeChanges[1]}`, color: 'added' },
114
+ { message: `\nold mode ${file.fileModeChanges[0]}`, color: 'removed' },
115
+ { message: `\nnew mode ${file.fileModeChanges[1]}`, color: 'added' },
117
116
  { message: '\n' },
118
117
  ]);
119
118
  }
@@ -141,7 +140,8 @@ export class Conflicter {
141
140
  * @return {Boolean} `true` if there's a conflict, `false` otherwise.
142
141
  */
143
142
  async _detectConflict(file) {
144
- let { contents, stat } = file;
143
+ let { contents } = file;
144
+ const { stat } = file;
145
145
  const filepath = path.resolve(file.path);
146
146
  // If file path point to a directory, then it's not safe to write
147
147
  const diskStat = await fsStat(filepath);
@@ -165,12 +165,10 @@ export class Conflicter {
165
165
  let changes;
166
166
  if (this.ignoreWhitespace) {
167
167
  changes = diffWords(actual.toString(), contents.toString(), this.diffOptions);
168
- // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
169
168
  modified = changes.some(change => change.value?.trim() && (change.added || change.removed));
170
169
  }
171
170
  else {
172
171
  changes = diffLines(actual.toString(), contents.toString(), this.diffOptions);
173
- // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
174
172
  modified = (changes.length > 1 || changes[0].added || changes[0].removed) ?? false;
175
173
  }
176
174
  if (modified) {
@@ -398,7 +396,7 @@ export class Conflicter {
398
396
  return conflicterFile;
399
397
  }, function () {
400
398
  if (yoResolveContents) {
401
- yoResolveFile = yoResolveFile ?? loadFile(yoResolveFilePath);
399
+ yoResolveFile ??= loadFile(yoResolveFilePath);
402
400
  setModifiedFileState(yoResolveFile);
403
401
  const oldContents = yoResolveFile.contents?.toString() ?? '';
404
402
  yoResolveFile.contents = Buffer.from(oldContents + yoResolveContents);
package/dist/conflicter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"conflicter.js","sourceRoot":"","sources":["../src/conflicter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"conflicter.js","sourceRoot":"","sources":["../src/conflicter.ts"],"names":[],"mappings":"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"}
package/dist/transform.js CHANGED
@@ -1,5 +1,4 @@
1
1
  import { transformFileField } from '@yeoman/transform';
2
- // eslint-disable-next-line n/file-extension-in-import
3
2
  import { isFilePending } from 'mem-fs-editor/state';
4
3
  export const forceFileTransform = (pattern) => transformFileField('conflicter', 'force', { pattern, filter: isFilePending });
5
4
  export const forceYoFiles = () => forceFileTransform('**/{.yo-rc.json,.yo-resolve,.yo-rc-global.json}');
package/dist/transform.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,sDAAsD;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAkC,EAAE,CACpF,kBAAkB,CAA+B,YAAY,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,YAAY,GAAG,GAAmC,EAAE,CAAC,kBAAkB,CAAC,iDAAiD,CAAC,CAAC"}
1
+ {"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAkC,EAAE,CACpF,kBAAkB,CAA+B,YAAY,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,YAAY,GAAG,GAAmC,EAAE,CAAC,kBAAkB,CAAC,iDAAiD,CAAC,CAAC"}
package/dist/yo-resolve.js CHANGED
@@ -3,7 +3,6 @@ import { dirname, resolve } from 'node:path';
3
3
  import { Minimatch } from 'minimatch';
4
4
  import slash from 'slash';
5
5
  import { transformFileField } from '@yeoman/transform';
6
- // eslint-disable-next-line n/file-extension-in-import
7
6
  import { isFilePending } from 'mem-fs-editor/state';
8
7
  const eachFolder = function* (folder) {
9
8
  let last;
@@ -21,11 +20,9 @@ export class YoResolve {
21
20
  }
22
21
  async getStatusForFile(filePath) {
23
22
  for (const folder of eachFolder(slash(filePath))) {
24
- // eslint-disable-next-line no-await-in-loop
25
23
  const map = await this.getMapForFolder(folder);
26
24
  if (map) {
27
25
  for (const [pattern, value] of map) {
28
- // eslint-disable-next-line unicorn/prefer-regexp-test
29
26
  if (pattern.match(filePath)) {
30
27
  return value;
31
28
  }
@@ -39,7 +36,6 @@ export class YoResolve {
39
36
  }
40
37
  async getMapForFolder(folder) {
41
38
  const map = this.groupedYoResolve.get(folder);
42
- // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
43
39
  if (map || map === null) {
44
40
  return map ?? undefined;
45
41
  }
@@ -67,7 +63,9 @@ export class YoResolve {
67
63
  return map;
68
64
  }
69
65
  }
70
- catch { }
66
+ catch {
67
+ // Ignore errors
68
+ }
71
69
  return undefined;
72
70
  }
73
71
  }
package/dist/yo-resolve.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"yo-resolve.js","sourceRoot":"","sources":["../src/yo-resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,sDAAsD;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,MAAc;IAC1C,IAAI,IAAI,CAAC;IACT,GAAG;QACD,MAAM,MAAM,CAAC;QACb,IAAI,GAAG,MAAM,CAAC;QACd,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;KAC1B,QAAQ,MAAM,KAAK,IAAI,EAAE;AAC5B,CAAC,CAAC;AAEF,MAAM,OAAO,SAAS;IACpB,gBAAgB,GAAG,IAAI,GAAG,EAAkC,CAAC;IACpD,iBAAiB,CAAS;IAEnC,YAAY,OAAwC;QAClD,IAAI,CAAC,iBAAiB,GAAG,OAAO,EAAE,iBAAiB,IAAI,aAAa,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAgB;QACrC,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE;YAChD,4CAA4C;YAC5C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,GAAG,EAAE;gBACP,KAAK,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,GAAG,EAAE;oBAClC,sDAAsD;oBACtD,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;wBAC3B,OAAO,KAAyB,CAAC;qBAClC;iBACF;aACF;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,eAAe;QACb,OAAO,kBAAkB,CACvB,YAAY,EACZ,KAAK,EAAE,MAAoC,EAAE,IAAoB,EAAE,EAAE,CAAC,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAChH,EAAE,MAAM,EAAE,aAAa,EAAE,CAC1B,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAAc;QAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC9C,wEAAwE;QACxE,IAAI,GAAG,IAAI,GAAG,KAAK,IAAI,EAAE;YACvB,OAAO,GAAG,IAAI,SAAS,CAAC;SACzB;QAED,IAAI;YACF,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3C,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;gBACrB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC/C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAqB,CAAC;gBACzC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACvC,IAAI,QAAQ,EAAE;oBACZ,MAAM,MAAM,GAAG,QAAQ;yBACpB,QAAQ,EAAE;yBACV,KAAK,CAAC,OAAO,CAAC;yBACd,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;yBAChC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;yBAC9C,MAAM,CAAC,OAAO,CAAC;yBACf,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC7C,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,MAAM,EAAE;wBAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;wBACvC,MAAM,gBAAgB,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;wBAChG,GAAG,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;qBAClD;iBACF;gBAED,OAAO,GAAG,CAAC;aACZ;SACF;QAAC,MAAM,GAAE;QAEV,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,GAAG,IAA6C,EAAkC,EAAE,CAC3H,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,eAAe,EAAE,CAAC"}
1
+ {"version":3,"file":"yo-resolve.js","sourceRoot":"","sources":["../src/yo-resolve.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yeoman/conflicter",
3
- "version": "2.0.0-alpha.2",
3
+ "version": "2.1.0",
4
4
  "private": false,
5
5
  "description": "Conflict resolution for yeoman's generator/environment stack",
6
6
  "keywords": [
@@ -29,7 +29,6 @@
29
29
  "clean": "rimraf dist",
30
30
  "clean-all": "npm run clean && rimraf node_modules",
31
31
  "precommit": "lint-staged",
32
- "pretest": "xo",
33
32
  "test": "vitest run --coverage"
34
33
  },
35
34
  "dependencies": {
@@ -44,7 +43,8 @@
44
43
  "minimatch": "^9.0.0",
45
44
  "p-transform": "^4.1.3",
46
45
  "pretty-bytes": "^6.1.0",
47
- "textextensions": "^5.16.0"
46
+ "slash": "^5.1.0",
47
+ "textextensions": "^6.11.0"
48
48
  },
49
49
  "devDependencies": {
50
50
  "@types/cli-table": "^0.3.1",
@@ -52,8 +52,10 @@
52
52
  "@types/diff": "^5.0.3",
53
53
  "@types/textextensions": "^2.4.0",
54
54
  "@yeoman/adapter": "*",
55
- "lodash-es": "^4.17.21",
56
- "slash": "^5.1.0"
55
+ "lodash-es": "^4.17.21"
56
+ },
57
+ "acceptDependencies": {
58
+ "@yeoman/transform": "^2.0.0"
57
59
  },
58
60
  "peerDependencies": {
59
61
  "@yeoman/types": "^1.0.0",
@@ -66,5 +68,5 @@
66
68
  "access": "public",
67
69
  "registry": "https://registry.npmjs.org/"
68
70
  },
69
- "gitHead": "cb49c0f34979eb52824e33708bd4475599768a7a"
71
+ "gitHead": "e0b4188a17e10dd8ec563ee9baa31574cb77d7fe"
70
72
  }