create-windy 0.6.11 → 0.6.12
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/cli.js +8 -0
- package/package.json +1 -1
- package/template/.windy-template.json +2 -2
package/dist/cli.js
CHANGED
|
@@ -8295,6 +8295,11 @@ var recipes = [
|
|
|
8295
8295
|
id: "starter-0.6.10-to-0.6.11",
|
|
8296
8296
|
from: "0.6.10",
|
|
8297
8297
|
to: "0.6.11"
|
|
8298
|
+
},
|
|
8299
|
+
{
|
|
8300
|
+
id: "starter-0.6.11-to-0.6.12",
|
|
8301
|
+
from: "0.6.11",
|
|
8302
|
+
to: "0.6.12"
|
|
8298
8303
|
}
|
|
8299
8304
|
];
|
|
8300
8305
|
function resolveRecipeChain(sourceVersion, targetVersion) {
|
|
@@ -9808,6 +9813,9 @@ async function planFile(path2, baseRoot, targetRoot, source, target, ours, prove
|
|
|
9808
9813
|
}
|
|
9809
9814
|
return hashContent(ours) === source.hash ? readyPlannedFile(path2, ownership, "delete", "\u76EE\u6807\u7248\u672C\u5220\u9664", expected) : conflict3(path2, ownership, "\u5BA2\u6237\u4FEE\u6539\u540E Windy \u53C8\u5220\u9664", expected);
|
|
9810
9815
|
}
|
|
9816
|
+
if (source && target && !ours) {
|
|
9817
|
+
return readyPlannedFile(path2, "project-owned", "preserve", "\u9879\u76EE\u5DF2\u5220\u9664", expected);
|
|
9818
|
+
}
|
|
9811
9819
|
if (!source || !target || !ours || !theirs) {
|
|
9812
9820
|
return conflict3(path2, ownership, "\u6587\u4EF6\u72B6\u6001\u4E0D\u5B8C\u6574\uFF0C\u4E0D\u80FD\u5B89\u5168\u63A8\u65AD", expected);
|
|
9813
9821
|
}
|
package/package.json
CHANGED