@opencrvs/toolkit 2.0.1-rc.7e65cec → 2.0.1-rc.848e85d
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 +2 -2
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
- package/dist/migrations/v2.0/checkout-upstream-files.js +1 -1
- package/dist/migrations/v2.0/index.js +2 -2
- package/dist/migrations/v2.0/merge-infrastructure-directory.js +3 -3
- package/opencrvs-toolkit-2.0.1-rc.848e85d.tgz +0 -0
- package/package.json +1 -1
- package/opencrvs-toolkit-2.0.1-rc.7e65cec.tgz +0 -0
package/dist/cli.js
CHANGED
|
@@ -4300,7 +4300,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4300
4300
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4301
4301
|
var import_child_process = require("child_process");
|
|
4302
4302
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4303
|
-
var UPSTREAM_BRANCH = "release
|
|
4303
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4304
4304
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4305
4305
|
var FILES_TO_CHECKOUT = [
|
|
4306
4306
|
"src/analytics/analytics.ts",
|
|
@@ -4838,7 +4838,7 @@ var import_os = require("os");
|
|
|
4838
4838
|
var import_path24 = require("path");
|
|
4839
4839
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4840
4840
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4841
|
-
var BASE_BRANCH = "release
|
|
4841
|
+
var BASE_BRANCH = "release/1.9.15";
|
|
4842
4842
|
function gitShowBytes(ref, path24) {
|
|
4843
4843
|
try {
|
|
4844
4844
|
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
2
|
-
export declare const UPSTREAM_BRANCH = "release
|
|
2
|
+
export declare const UPSTREAM_BRANCH = "release/2.0.0";
|
|
3
3
|
/**
|
|
4
4
|
* Runs a git command in the country config working directory.
|
|
5
5
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"checkout-upstream-files.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.0/checkout-upstream-files.ts"],"names":[],"mappings":"AA8CA,eAAO,MAAM,YAAY,2DACiC,CAAA;AAE1D,eAAO,MAAM,eAAe,kBAAkB,CAAA;AAc9C;;;;;;GAMG;AACH,wBAAgB,MAAM,CACpB,IAAI,EAAE,MAAM,EAAE,EACd,EAAE,MAAc,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAC5C,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAO9C;AAED,wBAAgB,eAAe,IAAI,IAAI,CAMtC;AAID,iBAAe,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAuDnC;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -59,7 +59,7 @@ exports.main = main;
|
|
|
59
59
|
*/
|
|
60
60
|
const child_process_1 = require("child_process");
|
|
61
61
|
exports.UPSTREAM_URL = 'https://github.com/opencrvs/opencrvs-countryconfig.git';
|
|
62
|
-
exports.UPSTREAM_BRANCH = 'release
|
|
62
|
+
exports.UPSTREAM_BRANCH = 'release/2.0.0';
|
|
63
63
|
// Remote name used only for the duration of this codemod. Prefixed to avoid
|
|
64
64
|
// clashing with remotes the user may have (origin, upstream, etc.).
|
|
65
65
|
const TEMP_REMOTE = 'opencrvs-upgrade-v19-v20-codemod';
|
|
@@ -4312,7 +4312,7 @@ Saved ${handlerRelPath}.`);
|
|
|
4312
4312
|
// src/migrations/v2.0/checkout-upstream-files.ts
|
|
4313
4313
|
var import_child_process = require("child_process");
|
|
4314
4314
|
var UPSTREAM_URL = "https://github.com/opencrvs/opencrvs-countryconfig.git";
|
|
4315
|
-
var UPSTREAM_BRANCH = "release
|
|
4315
|
+
var UPSTREAM_BRANCH = "release/2.0.0";
|
|
4316
4316
|
var TEMP_REMOTE = "opencrvs-upgrade-v19-v20-codemod";
|
|
4317
4317
|
var FILES_TO_CHECKOUT = [
|
|
4318
4318
|
"src/analytics/analytics.ts",
|
|
@@ -4850,7 +4850,7 @@ var import_os = require("os");
|
|
|
4850
4850
|
var import_path24 = require("path");
|
|
4851
4851
|
var TEMP_REMOTE2 = "opencrvs-upgrade-v19-v20-codemod-merge-infra";
|
|
4852
4852
|
var INFRASTRUCTURE_DIR = "infrastructure";
|
|
4853
|
-
var BASE_BRANCH = "release
|
|
4853
|
+
var BASE_BRANCH = "release/1.9.15";
|
|
4854
4854
|
function gitShowBytes(ref, path24) {
|
|
4855
4855
|
try {
|
|
4856
4856
|
const buf = (0, import_child_process2.execFileSync)("git", ["show", `${ref}:${path24}`], {
|
|
@@ -56,7 +56,7 @@ exports.main = main;
|
|
|
56
56
|
* so `git merge-base HEAD upstream/develop` typically returns nothing.
|
|
57
57
|
* - With no merge-base, a 3-way merge degenerates to a 2-way diff against
|
|
58
58
|
* an empty file — every line that differs becomes a conflict.
|
|
59
|
-
* - `release
|
|
59
|
+
* - `release/1.9.15` is the latest 1.9.x release on upstream and is a
|
|
60
60
|
* near-perfect representation of "what `infrastructure/` looked like
|
|
61
61
|
* before v2.0", regardless of whether the fork's git history reaches it.
|
|
62
62
|
* - For files the country config never modified relative to that baseline,
|
|
@@ -81,7 +81,7 @@ exports.main = main;
|
|
|
81
81
|
* sides changed a binary file, the result will be invalid and a warning
|
|
82
82
|
* is printed.
|
|
83
83
|
* - Forks that are on a much older 1.9.x and never merged later 1.9 patches
|
|
84
|
-
* may see a few extra conflicts on files where 1.9.x → release
|
|
84
|
+
* may see a few extra conflicts on files where 1.9.x → release/1.9.15
|
|
85
85
|
* patches and v1.9 → v2.0 changes textually overlap.
|
|
86
86
|
*/
|
|
87
87
|
const child_process_1 = require("child_process");
|
|
@@ -97,7 +97,7 @@ const INFRASTRUCTURE_DIR = 'infrastructure';
|
|
|
97
97
|
// Synthetic merge-base: the tip of upstream's latest 1.9.x release line.
|
|
98
98
|
// We use this branch's content as the "common ancestor" for every file,
|
|
99
99
|
// since most country forks don't share git history with upstream.
|
|
100
|
-
const BASE_BRANCH = 'release
|
|
100
|
+
const BASE_BRANCH = 'release/1.9.15';
|
|
101
101
|
/**
|
|
102
102
|
* Reads `git show <ref>:<path>` as a Uint8Array (binary-safe).
|
|
103
103
|
* Returns `null` if the path doesn't exist at that ref.
|
|
Binary file
|
package/package.json
CHANGED
|
Binary file
|