submodule-version 2.1.1 → 2.1.3
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/runner/handleErrors/handleErrors.js +3 -1
- package/dist/runner/handleErrors/handleErrors.js.map +1 -1
- package/dist/runner/handleErrors/handleGitError.d.ts +1 -1
- package/dist/runner/handleErrors/handleGitError.js +2 -2
- package/dist/runner/handleErrors/handleGitError.js.map +1 -1
- package/dist/src/git/git.js +3 -2
- package/dist/src/git/git.js.map +1 -1
- package/dist/src/sv.d.ts +1 -1
- package/dist/src/sv.js +12 -1
- package/dist/src/sv.js.map +1 -1
- package/package.json +1 -1
- package/runner/handleErrors/handleErrors.ts +3 -1
- package/runner/handleErrors/handleGitError.ts +2 -2
- package/src/git/git.ts +5 -2
- package/src/sv.ts +16 -1
|
@@ -4,12 +4,14 @@ exports.handleErrors = void 0;
|
|
|
4
4
|
const handleBuildGraphError_1 = require("./handleBuildGraphError");
|
|
5
5
|
const handleInstallError_1 = require("./handleInstallError");
|
|
6
6
|
const handleGitError_1 = require("./handleGitError");
|
|
7
|
+
const log_1 = require("../log");
|
|
7
8
|
const handleErrors = async (error, gitUrl) => {
|
|
8
9
|
await Promise.all([
|
|
9
10
|
(0, handleBuildGraphError_1.handleBuildGraphError)(error),
|
|
10
11
|
(0, handleInstallError_1.handleInstallError)(error, gitUrl),
|
|
11
|
-
(0, handleGitError_1.handleGitError)(error
|
|
12
|
+
(0, handleGitError_1.handleGitError)(error),
|
|
12
13
|
]);
|
|
14
|
+
log_1.log.error('unhandled error', error.message);
|
|
13
15
|
};
|
|
14
16
|
exports.handleErrors = handleErrors;
|
|
15
17
|
//# sourceMappingURL=handleErrors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleErrors.js","sourceRoot":"","sources":["../../../runner/handleErrors/handleErrors.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAChE,6DAA0D;AAC1D,qDAAkD;
|
|
1
|
+
{"version":3,"file":"handleErrors.js","sourceRoot":"","sources":["../../../runner/handleErrors/handleErrors.ts"],"names":[],"mappings":";;;AAAA,mEAAgE;AAChE,6DAA0D;AAC1D,qDAAkD;AAClD,gCAA6B;AAEtB,MAAM,YAAY,GAAG,KAAK,EAAE,KAAY,EAAE,MAAc,EAAE,EAAE;IACjE,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,6CAAqB,EAAC,KAAK,CAAC;QAC5B,IAAA,uCAAkB,EAAC,KAAK,EAAE,MAAM,CAAC;QACjC,IAAA,+BAAc,EAAC,KAAK,CAAC;KACtB,CAAC,CAAC;IACH,SAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC,CAAC;AAPW,QAAA,YAAY,gBAOvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const handleGitError: (error: Error
|
|
1
|
+
export declare const handleGitError: (error: Error) => void;
|
|
@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.handleGitError = void 0;
|
|
4
4
|
const git_1 = require("../../src/git");
|
|
5
5
|
const log_1 = require("../log");
|
|
6
|
-
const handleGitError = (error
|
|
6
|
+
const handleGitError = (error) => {
|
|
7
7
|
if (!(error instanceof git_1.GitError))
|
|
8
8
|
return;
|
|
9
9
|
const { message: errorMessage } = error;
|
|
10
10
|
if (errorMessage === 'GIT_NOT_A_REPO') {
|
|
11
|
-
log_1.log.error(
|
|
11
|
+
log_1.log.error('Is not a git repo');
|
|
12
12
|
}
|
|
13
13
|
if (errorMessage === 'GIT_MODULE_CHECKOUT_FAILED') {
|
|
14
14
|
log_1.log.error('Checkout failded');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGitError.js","sourceRoot":"","sources":["../../../runner/handleErrors/handleGitError.ts"],"names":[],"mappings":";;;AAAA,uCAAyC;AACzC,gCAA6B;AAEtB,MAAM,cAAc,GAAG,CAAC,KAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"handleGitError.js","sourceRoot":"","sources":["../../../runner/handleErrors/handleGitError.ts"],"names":[],"mappings":";;;AAAA,uCAAyC;AACzC,gCAA6B;AAEtB,MAAM,cAAc,GAAG,CAAC,KAAY,EAAE,EAAE;IAC7C,IAAI,CAAC,CAAC,KAAK,YAAY,cAAQ,CAAC;QAAE,OAAO;IAEzC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAExC,IAAI,YAAY,KAAK,gBAAgB,EAAE,CAAC;QACtC,SAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,YAAY,KAAK,4BAA4B,EAAE,CAAC;QAClD,SAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAChC,CAAC;AACH,CAAC,CAAC;AAZW,QAAA,cAAc,kBAYzB"}
|
package/dist/src/git/git.js
CHANGED
|
@@ -45,8 +45,9 @@ exports.git = {
|
|
|
45
45
|
});
|
|
46
46
|
},
|
|
47
47
|
rm: async (submoduleName) => {
|
|
48
|
-
|
|
49
|
-
await execAsync(`rm -rf
|
|
48
|
+
const modulePath = path_1.default.join(runOptions_1.RunOptions.modulesDir, submoduleName);
|
|
49
|
+
await execAsync(`git rm -rf ${modulePath}`, { cwd: runOptions_1.RunOptions.cwd });
|
|
50
|
+
await execAsync(`rm -rf ${path_1.default.join('.git/modules', modulePath)}`, { cwd: runOptions_1.RunOptions.cwd });
|
|
50
51
|
},
|
|
51
52
|
};
|
|
52
53
|
//# sourceMappingURL=git.js.map
|
package/dist/src/git/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/git/git.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAqC;AACrC,+BAAiC;AACjC,gDAAwB;AACxB,+CAA4C;AAC5C,gDAA6C;AAC7C,8CAA2C;AAC3C,yCAAsC;AAEtC,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC;AAErB,QAAA,GAAG,GAAG;IACjB,QAAQ,EAAE,yBAAW;IAErB,aAAa,EAAE,KAAK,EAAE,GAAW,EAAiB,EAAE;QAClD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,uBAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAEtD,IAAI,CAAC;YACH,MAAM,SAAS,CACb,qBAAqB,GAAG,IAAI,MAAM,EAAE,EACpC,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CACxB,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,mBAAQ,CAAC,gBAAgB,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,IAAY,EAAE,OAAe,EAAiB,EAAE;QAC/D,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,uBAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAEtD,IAAI,CAAC;YACH,MAAM,SAAS,CACb,UAAU,MAAM,aAAa,OAAO,KAAK,EACzC,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CACxB,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,mBAAQ,CAAC,4BAA4B,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAED,YAAY,EAAE,KAAK,EAAE,WAAmB,EAAqB,EAAE;QAC7D,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,uBAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC7D,MAAM,SAAS,CAAC,UAAU,MAAM,eAAe,EAAE,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CAAC,CAAC;QAE1E,MAAM,GAAG,GAAG,MAAM,SAAS,CACzB,UAAU,MAAM,SAAS,EACzB,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CACxB,CAAC;QAEF,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAErD,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,CAAC,GAAG;gBAAE,OAAO,KAAK,CAAC;YAEvB,OAAO,yBAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,EAAE,EAAE,KAAK,EAAE,aAAqB,EAAE,EAAE;QAClC,MAAM,
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/git/git.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAqC;AACrC,+BAAiC;AACjC,gDAAwB;AACxB,+CAA4C;AAC5C,gDAA6C;AAC7C,8CAA2C;AAC3C,yCAAsC;AAEtC,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC;AAErB,QAAA,GAAG,GAAG;IACjB,QAAQ,EAAE,yBAAW;IAErB,aAAa,EAAE,KAAK,EAAE,GAAW,EAAiB,EAAE;QAClD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,yBAAW,EAAC,GAAG,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,uBAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAEtD,IAAI,CAAC;YACH,MAAM,SAAS,CACb,qBAAqB,GAAG,IAAI,MAAM,EAAE,EACpC,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CACxB,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,mBAAQ,CAAC,gBAAgB,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,IAAY,EAAE,OAAe,EAAiB,EAAE;QAC/D,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,uBAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAEtD,IAAI,CAAC;YACH,MAAM,SAAS,CACb,UAAU,MAAM,aAAa,OAAO,KAAK,EACzC,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CACxB,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,mBAAQ,CAAC,4BAA4B,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IAED,YAAY,EAAE,KAAK,EAAE,WAAmB,EAAqB,EAAE;QAC7D,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,uBAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC7D,MAAM,SAAS,CAAC,UAAU,MAAM,eAAe,EAAE,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CAAC,CAAC;QAE1E,MAAM,GAAG,GAAG,MAAM,SAAS,CACzB,UAAU,MAAM,SAAS,EACzB,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CACxB,CAAC;QAEF,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAErD,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC1B,IAAI,CAAC,GAAG;gBAAE,OAAO,KAAK,CAAC;YAEvB,OAAO,yBAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,EAAE,EAAE,KAAK,EAAE,aAAqB,EAAE,EAAE;QAClC,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,uBAAU,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;QAEnE,MAAM,SAAS,CACb,cAAc,UAAU,EAAE,EAC1B,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CACxB,CAAC;QAEF,MAAM,SAAS,CACb,UAAU,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,EAAE,EACjD,EAAE,GAAG,EAAE,uBAAU,CAAC,GAAG,EAAE,CACxB,CAAC;IACJ,CAAC;CACF,CAAC"}
|
package/dist/src/sv.d.ts
CHANGED
|
@@ -5,5 +5,5 @@ export declare class SV {
|
|
|
5
5
|
buildGraph: () => Promise<Record<string, import("./Graph/Graph").IGraphEntry>>;
|
|
6
6
|
install: (gitUrl: string, parentModule?: string) => Promise<void>;
|
|
7
7
|
update: () => Promise<void>;
|
|
8
|
-
remove: (submoduleName: string) => Promise<void>;
|
|
8
|
+
remove: (submoduleName: string, parentModule?: string) => Promise<void>;
|
|
9
9
|
}
|
package/dist/src/sv.js
CHANGED
|
@@ -45,8 +45,19 @@ class SV {
|
|
|
45
45
|
}
|
|
46
46
|
}));
|
|
47
47
|
};
|
|
48
|
-
this.remove = async (submoduleName) => {
|
|
48
|
+
this.remove = async (submoduleName, parentModule) => {
|
|
49
49
|
await git_1.git.rm(submoduleName);
|
|
50
|
+
const json = await this.pkgJSONManager.read(parentModule);
|
|
51
|
+
if (!json.sv)
|
|
52
|
+
return;
|
|
53
|
+
const sv = Object.keys(json.sv).reduce((acc, k) => {
|
|
54
|
+
if (k.endsWith(`${submoduleName}.git`)) {
|
|
55
|
+
return acc;
|
|
56
|
+
}
|
|
57
|
+
return { ...acc, [k]: json.sv[k] };
|
|
58
|
+
}, {});
|
|
59
|
+
json.sv = sv;
|
|
60
|
+
await this.pkgJSONManager.write(json, parentModule);
|
|
50
61
|
await this.graph.build();
|
|
51
62
|
};
|
|
52
63
|
runOptions_1.RunOptions.cwd = projectDir;
|
package/dist/src/sv.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sv.js","sourceRoot":"","sources":["../../src/sv.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,mCAAgC;AAChC,6CAA0C;AAC1C,+CAA4C;AAC5C,+BAA4B;AAE5B,MAAa,EAAE;IAIb,YACE,UAAkB,EAClB,aAAqB,QAAQ;QASxB,eAAU,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAEtC,YAAO,GAAG,KAAK,EAAE,MAAc,EAAE,YAAqB,EAAE,EAAE;YAC/D,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,SAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEpD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;YACnC,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC/D,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAExD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,SAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;gBAC7B,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,SAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,aAAa,GAAG,yBAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,gBAAgB,GAAG,OAAO,IAAI,aAAa,CAAC;YAElD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAC5D,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAClD,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;gBAClB,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;YACpB,CAAC;YAED,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,IAAI,gBAAgB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YACpE,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YACzD,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC3B,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,IAAI,EAAE;YACzB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACvC,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;gBACjE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;gBAC/B,MAAM,aAAa,GAAG,yBAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBAC/C,IAAI,aAAa,KAAK,OAAO,EAAE,CAAC;oBAC9B,MAAM,SAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC,CAAC,CAAC,CAAC;QACN,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,aAAqB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"sv.js","sourceRoot":"","sources":["../../src/sv.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { handleBuildGraphError } from './handleBuildGraphError';
|
|
2
2
|
import { handleInstallError } from './handleInstallError';
|
|
3
3
|
import { handleGitError } from './handleGitError';
|
|
4
|
+
import { log } from '../log';
|
|
4
5
|
|
|
5
6
|
export const handleErrors = async (error: Error, gitUrl: string) => {
|
|
6
7
|
await Promise.all([
|
|
7
8
|
handleBuildGraphError(error),
|
|
8
9
|
handleInstallError(error, gitUrl),
|
|
9
|
-
handleGitError(error
|
|
10
|
+
handleGitError(error),
|
|
10
11
|
]);
|
|
12
|
+
log.error('unhandled error', error.message);
|
|
11
13
|
};
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { GitError } from '../../src/git';
|
|
2
2
|
import { log } from '../log';
|
|
3
3
|
|
|
4
|
-
export const handleGitError = (error: Error
|
|
4
|
+
export const handleGitError = (error: Error) => {
|
|
5
5
|
if (!(error instanceof GitError)) return;
|
|
6
6
|
|
|
7
7
|
const { message: errorMessage } = error;
|
|
8
8
|
|
|
9
9
|
if (errorMessage === 'GIT_NOT_A_REPO') {
|
|
10
|
-
log.error(
|
|
10
|
+
log.error('Is not a git repo');
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
if (errorMessage === 'GIT_MODULE_CHECKOUT_FAILED') {
|
package/src/git/git.ts
CHANGED
|
@@ -57,12 +57,15 @@ export const git = {
|
|
|
57
57
|
},
|
|
58
58
|
|
|
59
59
|
rm: async (submoduleName: string) => {
|
|
60
|
+
const modulePath = path.join(RunOptions.modulesDir, submoduleName);
|
|
61
|
+
|
|
60
62
|
await execAsync(
|
|
61
|
-
`git rm -
|
|
63
|
+
`git rm -rf ${modulePath}`,
|
|
62
64
|
{ cwd: RunOptions.cwd },
|
|
63
65
|
);
|
|
66
|
+
|
|
64
67
|
await execAsync(
|
|
65
|
-
`rm -rf .git
|
|
68
|
+
`rm -rf ${path.join('.git/modules', modulePath)}`,
|
|
66
69
|
{ cwd: RunOptions.cwd },
|
|
67
70
|
);
|
|
68
71
|
},
|
package/src/sv.ts
CHANGED
|
@@ -65,8 +65,23 @@ export class SV {
|
|
|
65
65
|
}));
|
|
66
66
|
};
|
|
67
67
|
|
|
68
|
-
public remove = async (submoduleName: string) => {
|
|
68
|
+
public remove = async (submoduleName: string, parentModule?: string) => {
|
|
69
69
|
await git.rm(submoduleName);
|
|
70
|
+
const json = await this.pkgJSONManager.read(parentModule);
|
|
71
|
+
|
|
72
|
+
if (!json.sv) return;
|
|
73
|
+
|
|
74
|
+
const sv = Object.keys(json.sv).reduce((acc, k) => {
|
|
75
|
+
if (k.endsWith(`${submoduleName}.git`)) {
|
|
76
|
+
return acc;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
return { ...acc, [k]: json.sv[k] };
|
|
80
|
+
}, {});
|
|
81
|
+
|
|
82
|
+
json.sv = sv;
|
|
83
|
+
|
|
84
|
+
await this.pkgJSONManager.write(json, parentModule);
|
|
70
85
|
await this.graph.build();
|
|
71
86
|
};
|
|
72
87
|
}
|