@yeoman/conflicter 0.3.4 → 0.3.5
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/yo-resolve.js +0 -1
- package/dist/yo-resolve.js.map +1 -1
- package/package.json +4 -4
package/dist/yo-resolve.js
CHANGED
|
@@ -62,7 +62,6 @@ export class YoResolve {
|
|
|
62
62
|
for (const [pattern, status = 'skip'] of parsed) {
|
|
63
63
|
const negate = pattern.startsWith('!');
|
|
64
64
|
const minimatchPattern = `${negate ? '!' : ''}${folder}/${negate ? pattern.slice(1) : pattern}`;
|
|
65
|
-
console.log(minimatchPattern);
|
|
66
65
|
map.set(new Minimatch(minimatchPattern), status);
|
|
67
66
|
}
|
|
68
67
|
}
|
package/dist/yo-resolve.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yo-resolve.js","sourceRoot":"","sources":["../src/yo-resolve.ts"],"names":[],"mappings":"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
|
|
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": "0.3.
|
|
3
|
+
"version": "0.3.5",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Conflict resolution for yeoman's generator/environment stack",
|
|
6
6
|
"keywords": [
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@types/node": "^16.18.28",
|
|
37
37
|
"@yeoman/transform": "^0.2.1",
|
|
38
|
-
"@yeoman/types": "^0.
|
|
38
|
+
"@yeoman/types": "^0.4.0",
|
|
39
39
|
"binary-extensions": "^2.2.0",
|
|
40
40
|
"cli-table": "^0.3.11",
|
|
41
41
|
"dateformat": "^5.0.3",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"@types/dateformat": "^5.0.0",
|
|
54
54
|
"@types/diff": "^5.0.3",
|
|
55
55
|
"@types/textextensions": "^2.4.0",
|
|
56
|
-
"@yeoman/adapter": "^0.1.
|
|
56
|
+
"@yeoman/adapter": "^0.1.4",
|
|
57
57
|
"esmocha": "^0.1.4",
|
|
58
58
|
"lodash-es": "^4.17.21",
|
|
59
59
|
"sinon": "^15.0.4",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"access": "public",
|
|
68
68
|
"registry": "https://registry.npmjs.org/"
|
|
69
69
|
},
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "fddebd6424725b9636af96a643a25f00f7314a77"
|
|
71
71
|
}
|