@biffo/cli 0.298.28 → 0.298.29
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 +7 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -809,7 +809,13 @@ var EMPTY_SUMMARY = () => ({
|
|
|
809
809
|
async function planCoreUpgrade(options) {
|
|
810
810
|
const mergeFile = options.mergeFile ?? gitMergeFile;
|
|
811
811
|
const trackedOnly = { trackedOnly: true };
|
|
812
|
-
const
|
|
812
|
+
const baseManifestPath = join5(options.baseDir, CORE_MANIFEST_FILE);
|
|
813
|
+
const baseManifest = existsSync5(baseManifestPath) ? readCoreManifest(options.baseDir) : null;
|
|
814
|
+
const base = new Set(
|
|
815
|
+
listTemplateOwnedFiles(options.baseDir, options.manifest, trackedOnly).filter(
|
|
816
|
+
(path) => baseManifest === null || isTemplateOwned(path, baseManifest)
|
|
817
|
+
)
|
|
818
|
+
);
|
|
813
819
|
const ours = new Set(listTemplateOwnedFiles(options.oursDir, options.manifest));
|
|
814
820
|
const theirs = new Set(listTemplateOwnedFiles(options.theirsDir, options.manifest, trackedOnly));
|
|
815
821
|
const divergentPrefixes = readDivergenceConfig(options.oursDir).warnOnly.map((e) => e.prefix);
|