git-sync-js 0.4.4 → 0.5.0
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/README.md +4 -3
- package/dist/credential.d.ts +1 -1
- package/dist/credential.d.ts.map +1 -1
- package/dist/credential.js +2 -2
- package/dist/credential.js.map +1 -1
- package/dist/errors.js +5 -0
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +15 -11
- package/dist/index.js.map +1 -1
- package/dist/inspect.js +2 -2
- package/dist/inspect.js.map +1 -1
- package/dist/interface.d.ts +1 -1
- package/dist/interface.d.ts.map +1 -1
- package/dist/sync.d.ts +1 -1
- package/dist/sync.d.ts.map +1 -1
- package/dist/sync.js +11 -3
- package/dist/sync.js.map +1 -1
- package/package.json +21 -21
package/README.md
CHANGED
|
@@ -74,6 +74,7 @@ try {
|
|
|
74
74
|
logger.notice(this.translateMessage(message), { handler: WikiChannel.syncProgress, callerFunction: 'commitAndSync', ...context });
|
|
75
75
|
},
|
|
76
76
|
},
|
|
77
|
+
filesToIgnore,
|
|
77
78
|
});
|
|
78
79
|
} catch (error) {
|
|
79
80
|
this.translateErrorMessage(error);
|
|
@@ -110,7 +111,7 @@ try {
|
|
|
110
111
|
Get modified files and modify type in a folder
|
|
111
112
|
|
|
112
113
|
```ts
|
|
113
|
-
await getModifiedFileList(wikiFolderPath)
|
|
114
|
+
await getModifiedFileList(wikiFolderPath);
|
|
114
115
|
```
|
|
115
116
|
|
|
116
117
|
### getRemoteUrl
|
|
@@ -118,8 +119,8 @@ await getModifiedFileList(wikiFolderPath)
|
|
|
118
119
|
Inspect git's remote url from folder's .git config
|
|
119
120
|
|
|
120
121
|
```ts
|
|
121
|
-
export async function credentialOff(directory: string): Promise<void> {
|
|
122
|
-
const githubRepoUrl = await getRemoteUrl(directory);
|
|
122
|
+
export async function credentialOff(directory: string, remoteUrl?: string): Promise<void> {
|
|
123
|
+
const githubRepoUrl = remoteUrl ?? (await getRemoteUrl(directory));
|
|
123
124
|
const gitUrlWithOutCredential = getGitUrlWithOutCredential(githubRepoUrl);
|
|
124
125
|
await GitProcess.exec(['remote', 'set-url', 'origin', gitUrlWithOutCredential], directory);
|
|
125
126
|
}
|
package/dist/credential.d.ts
CHANGED
|
@@ -11,5 +11,5 @@ export declare function credentialOn(directory: string, remoteUrl: string, userN
|
|
|
11
11
|
* @param {string} githubRepoUrl
|
|
12
12
|
* @param {{ login: string, email: string, accessToken: string }} userInfo
|
|
13
13
|
*/
|
|
14
|
-
export declare function credentialOff(directory: string): Promise<void>;
|
|
14
|
+
export declare function credentialOff(directory: string, remoteUrl?: string): Promise<void>;
|
|
15
15
|
//# sourceMappingURL=credential.d.ts.map
|
package/dist/credential.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential.d.ts","sourceRoot":"","sources":["../src/credential.ts"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7H;AACD;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"credential.d.ts","sourceRoot":"","sources":["../src/credential.ts"],"names":[],"mappings":"AAQA;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7H;AACD;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAIxF"}
|
package/dist/credential.js
CHANGED
|
@@ -20,8 +20,8 @@ export async function credentialOn(directory, remoteUrl, userName, accessToken)
|
|
|
20
20
|
* @param {string} githubRepoUrl
|
|
21
21
|
* @param {{ login: string, email: string, accessToken: string }} userInfo
|
|
22
22
|
*/
|
|
23
|
-
export async function credentialOff(directory) {
|
|
24
|
-
const githubRepoUrl = await getRemoteUrl(directory);
|
|
23
|
+
export async function credentialOff(directory, remoteUrl) {
|
|
24
|
+
const githubRepoUrl = remoteUrl ?? (await getRemoteUrl(directory));
|
|
25
25
|
const gitUrlWithOutCredential = getGitUrlWithOutCredential(githubRepoUrl);
|
|
26
26
|
await GitProcess.exec(['remote', 'set-url', 'origin', gitUrlWithOutCredential], directory);
|
|
27
27
|
}
|
package/dist/credential.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential.js","sourceRoot":"","sources":["../src/credential.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAE,QAAgB,EAAE,WAAmB,EAAU,EAAE,CAChG,IAAI,CAAC,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,QAAQ,IAAI,WAAW,cAAc,CAAC,CAAC,CAAC;AAC5H,MAAM,0BAA0B,GAAG,CAAC,iBAAyB,EAAU,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;AAE7H;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,SAAiB,EAAE,SAAiB,EAAE,QAAgB,EAAE,WAAmB;IAC5G,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACvF,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;IACpF,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;AAC1F,CAAC;AACD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,SAAiB;
|
|
1
|
+
{"version":3,"file":"credential.js","sourceRoot":"","sources":["../src/credential.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,uBAAuB,GAAG,CAAC,MAAc,EAAE,QAAgB,EAAE,WAAmB,EAAU,EAAE,CAChG,IAAI,CAAC,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,WAAW,QAAQ,IAAI,WAAW,cAAc,CAAC,CAAC,CAAC;AAC5H,MAAM,0BAA0B,GAAG,CAAC,iBAAyB,EAAU,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;AAE7H;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,SAAiB,EAAE,SAAiB,EAAE,QAAgB,EAAE,WAAmB;IAC5G,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACvF,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;IACpF,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,CAAC,EAAE,SAAS,CAAC,CAAC;AAC1F,CAAC;AACD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,SAAiB,EAAE,SAAkB;IACvE,MAAM,aAAa,GAAG,SAAS,IAAI,CAAC,MAAM,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;IACnE,MAAM,uBAAuB,GAAG,0BAA0B,CAAC,aAAa,CAAC,CAAC;IAC1E,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,uBAAuB,CAAC,EAAE,SAAS,CAAC,CAAC;AAC7F,CAAC"}
|
package/dist/errors.js
CHANGED
|
@@ -12,6 +12,8 @@ export class AssumeSyncError extends Error {
|
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
export class SyncParameterMissingError extends Error {
|
|
15
|
+
/** the missing parameterName */
|
|
16
|
+
parameterName;
|
|
15
17
|
constructor(parameterName = 'accessToken') {
|
|
16
18
|
super(parameterName);
|
|
17
19
|
Object.setPrototypeOf(this, SyncParameterMissingError.prototype);
|
|
@@ -37,6 +39,8 @@ export class GitPullPushError extends Error {
|
|
|
37
39
|
}
|
|
38
40
|
}
|
|
39
41
|
export class CantSyncGitNotInitializedError extends Error {
|
|
42
|
+
/** the directory that should have a git repo */
|
|
43
|
+
directory;
|
|
40
44
|
constructor(directory) {
|
|
41
45
|
super(directory);
|
|
42
46
|
Object.setPrototypeOf(this, CantSyncGitNotInitializedError.prototype);
|
|
@@ -54,6 +58,7 @@ export class SyncScriptIsInDeadLoopError extends Error {
|
|
|
54
58
|
}
|
|
55
59
|
}
|
|
56
60
|
export class CantSyncInSpecialGitStateAutoFixFailed extends Error {
|
|
61
|
+
stateMessage;
|
|
57
62
|
constructor(stateMessage) {
|
|
58
63
|
super(stateMessage);
|
|
59
64
|
Object.setPrototypeOf(this, CantSyncInSpecialGitStateAutoFixFailed.prototype);
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC,YAAY,YAAqB;QAC/B,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,qIACb,YAAY,IAAI,EAClB,EAAE,CAAC;IACL,CAAC;CACF;AACD,MAAM,OAAO,yBAA0B,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGlC,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC,YAAY,YAAqB;QAC/B,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,qIACb,YAAY,IAAI,EAClB,EAAE,CAAC;IACL,CAAC;CACF;AACD,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IAClD,gCAAgC;IAChC,aAAa,CAAS;IACtB,YAAY,aAAa,GAAG,aAAa;QACvC,KAAK,CAAC,aAAa,CAAC,CAAC;QACrB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,yBAAyB,CAAC,SAAS,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC;QACxC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,eAAe,aAAa,0CAA0C,aAAa,6BAA6B,CAAC;IAClI,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC,YACE,aAOC,EACD,aAAqB;QAErB,KAAK,CAAC,aAAa,CAAC,CAAC;QACrB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,2FAA2F,IAAI,CAAC,SAAS,CAAC;YACvH,GAAG,aAAa;YAChB,QAAQ,EAAE;gBACR,GAAG,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC;gBACjC,WAAW,EAAE,QAAQ,CAAE,aAAa,EAAE,QAA0B,EAAE,WAAW,EAAE;oBAC7E,MAAM,EAAE,EAAE;iBACX,CAAC;aACH;SACF,CAAC,MAAM,aAAa,EAAE,CAAC;IAC1B,CAAC;CACF;AAED,MAAM,OAAO,8BAA+B,SAAQ,KAAK;IACvD,gDAAgD;IAChD,SAAS,CAAS;IAClB,YAAY,SAAiB;QAC3B,KAAK,CAAC,SAAS,CAAC,CAAC;QACjB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,8BAA8B,CAAC,SAAS,CAAC,CAAC;QACtE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,gCAAgC,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,6GAA6G,SAAS,EAAE,CAAC;IAC1I,CAAC;CACF;AAED,MAAM,OAAO,2BAA4B,SAAQ,KAAK;IACpD;QACE,KAAK,EAAE,CAAC;QACR,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,2BAA2B,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,GAAG,6BAA6B,CAAC;QAC1C,IAAI,CAAC,OAAO,GAAG,6GAA6G,CAAC;IAC/H,CAAC;CACF;AAED,MAAM,OAAO,sCAAuC,SAAQ,KAAK;IAC/D,YAAY,CAAS;IACrB,YAAY,YAAoB;QAC9B,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,sCAAsC,CAAC,SAAS,CAAC,CAAC;QAC9E,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,wCAAwC,CAAC;QACrD,IAAI,CAAC,OAAO,GAAG,qYAAqY,YAAY,EAAE,CAAC;IACra,CAAC;CACF"}
|
package/dist/index.d.ts
CHANGED
|
@@ -32,6 +32,8 @@ export declare function commitAndSync(options: {
|
|
|
32
32
|
commitMessage?: string;
|
|
33
33
|
logger?: ILogger;
|
|
34
34
|
defaultGitInfo: typeof defaultDefaultGitInfo;
|
|
35
|
+
/** if you want to use a dynamic .gitignore, you can passing an array contains filepaths that want to ignore */
|
|
36
|
+
filesToIgnore?: string[];
|
|
35
37
|
}): Promise<void>;
|
|
36
38
|
export declare function clone(options: {
|
|
37
39
|
/** wiki folder path, can be relative */
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,aAAa,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAM3E,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AAEvB,wBAAsB,OAAO,CAAC,OAAO,EAAE;IACrC,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,qCAAqC;IACrC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,yBAAyB,GAAG,aAAa,CAAC;IACrD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;CAC/C,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,aAAa,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAM3E,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AAEvB,wBAAsB,OAAO,CAAC,OAAO,EAAE;IACrC,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,qCAAqC;IACrC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,yBAAyB,GAAG,aAAa,CAAC;IACrD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;CAC/C,GAAG,OAAO,CAAC,IAAI,CAAC,CA+ChB;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAC3C,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,yBAAyB;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,OAAO,qBAAqB,CAAC;IAC7C,+GAA+G;IAC/G,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;CAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CA4IhB;AAED,wBAAsB,KAAK,CAAC,OAAO,EAAE;IACnC,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2CAA2C;IAC3C,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,qBAAqB,CAAC;CAC/C,GAAG,OAAO,CAAC,IAAI,CAAC,CAqDhB"}
|
package/dist/index.js
CHANGED
|
@@ -18,10 +18,12 @@ export async function initGit(options) {
|
|
|
18
18
|
functionName: 'initGit',
|
|
19
19
|
step,
|
|
20
20
|
});
|
|
21
|
-
const logDebug = (message, step) => logger?.
|
|
21
|
+
const logDebug = (message, step) => logger?.debug(message, { functionName: 'initGit', step });
|
|
22
22
|
logProgress(GitStep.StartGitInitialization);
|
|
23
23
|
const { gitUserName, email } = userInfo ?? defaultGitInfo;
|
|
24
|
+
logDebug(`Running git init in dir ${dir}`, GitStep.StartGitInitialization);
|
|
24
25
|
await GitProcess.exec(['init'], dir);
|
|
26
|
+
logDebug(`Succefully Running git init in dir ${dir}`, GitStep.StartGitInitialization);
|
|
25
27
|
await commitFiles(dir, gitUserName, email ?? defaultGitInfo.email);
|
|
26
28
|
// if we are config local note git, we are done here
|
|
27
29
|
if (syncImmediately !== true) {
|
|
@@ -43,7 +45,7 @@ export async function initGit(options) {
|
|
|
43
45
|
logProgress(GitStep.StartBackupToGitRemote);
|
|
44
46
|
const defaultBranchName = await getDefaultBranchName(dir);
|
|
45
47
|
const { stderr: pushStdError, exitCode: pushExitCode } = await GitProcess.exec(['push', 'origin', defaultBranchName], dir);
|
|
46
|
-
await credentialOff(dir);
|
|
48
|
+
await credentialOff(dir, remoteUrl);
|
|
47
49
|
if (pushExitCode !== 0) {
|
|
48
50
|
logProgress(GitStep.GitPushFailed);
|
|
49
51
|
throw new GitPullPushError(options, `branch: ${defaultBranchName} ${pushStdError}`);
|
|
@@ -56,7 +58,7 @@ export async function initGit(options) {
|
|
|
56
58
|
* `git add .` + `git commit` + `git rebase` or something that can sync bi-directional
|
|
57
59
|
*/
|
|
58
60
|
export async function commitAndSync(options) {
|
|
59
|
-
const { dir, remoteUrl, commitMessage = 'Updated with Git-Sync', userInfo, logger, defaultGitInfo = defaultDefaultGitInfo } = options;
|
|
61
|
+
const { dir, remoteUrl, commitMessage = 'Updated with Git-Sync', userInfo, logger, defaultGitInfo = defaultDefaultGitInfo, filesToIgnore } = options;
|
|
60
62
|
const { gitUserName, email } = userInfo ?? defaultGitInfo;
|
|
61
63
|
const { accessToken } = userInfo ?? {};
|
|
62
64
|
if (accessToken === '' || accessToken === undefined) {
|
|
@@ -65,19 +67,19 @@ export async function commitAndSync(options) {
|
|
|
65
67
|
if (remoteUrl === '' || remoteUrl === undefined) {
|
|
66
68
|
throw new SyncParameterMissingError('remoteUrl');
|
|
67
69
|
}
|
|
68
|
-
const logProgress = (step) => logger?.info(step, {
|
|
70
|
+
const logProgress = (step) => logger?.info?.(step, {
|
|
69
71
|
functionName: 'commitAndSync',
|
|
70
72
|
step,
|
|
71
73
|
dir,
|
|
72
74
|
remoteUrl,
|
|
73
75
|
});
|
|
74
|
-
const logDebug = (message, step) => logger?.
|
|
76
|
+
const logDebug = (message, step) => logger?.debug?.(message, {
|
|
75
77
|
functionName: 'commitAndSync',
|
|
76
78
|
step,
|
|
77
79
|
dir,
|
|
78
80
|
remoteUrl,
|
|
79
81
|
});
|
|
80
|
-
const logWarn = (message, step) => logger?.warn(message, {
|
|
82
|
+
const logWarn = (message, step) => logger?.warn?.(message, {
|
|
81
83
|
functionName: 'commitAndSync',
|
|
82
84
|
step,
|
|
83
85
|
dir,
|
|
@@ -102,7 +104,7 @@ export async function commitAndSync(options) {
|
|
|
102
104
|
if (await haveLocalChanges(dir)) {
|
|
103
105
|
logProgress(GitStep.HaveThingsToCommit);
|
|
104
106
|
logDebug(commitMessage, GitStep.HaveThingsToCommit);
|
|
105
|
-
const { exitCode: commitExitCode, stderr: commitStdError } = await commitFiles(dir, gitUserName, email ?? defaultGitInfo.email, commitMessage);
|
|
107
|
+
const { exitCode: commitExitCode, stderr: commitStdError } = await commitFiles(dir, gitUserName, email ?? defaultGitInfo.email, commitMessage, filesToIgnore);
|
|
106
108
|
if (commitExitCode !== 0) {
|
|
107
109
|
logWarn(`commit failed ${commitStdError}`, GitStep.CommitComplete);
|
|
108
110
|
}
|
|
@@ -117,7 +119,7 @@ export async function commitAndSync(options) {
|
|
|
117
119
|
switch (await getSyncState(dir, logger, defaultBranchName)) {
|
|
118
120
|
case 'equal': {
|
|
119
121
|
logProgress(GitStep.NoNeedToSync);
|
|
120
|
-
await credentialOff(dir);
|
|
122
|
+
await credentialOff(dir, remoteUrl);
|
|
121
123
|
return;
|
|
122
124
|
}
|
|
123
125
|
case 'noUpstream': {
|
|
@@ -168,7 +170,7 @@ export async function commitAndSync(options) {
|
|
|
168
170
|
logProgress(GitStep.SyncFailedAlgorithmWrong);
|
|
169
171
|
}
|
|
170
172
|
}
|
|
171
|
-
await credentialOff(dir);
|
|
173
|
+
await credentialOff(dir, remoteUrl);
|
|
172
174
|
if (exitCode === 0) {
|
|
173
175
|
logProgress(GitStep.PerformLastCheckBeforeSynchronizationFinish);
|
|
174
176
|
await assumeSync(dir, logger, defaultBranchName);
|
|
@@ -203,7 +205,7 @@ export async function clone(options) {
|
|
|
203
205
|
dir,
|
|
204
206
|
remoteUrl,
|
|
205
207
|
});
|
|
206
|
-
const logDebug = (message, step) => logger?.
|
|
208
|
+
const logDebug = (message, step) => logger?.debug(message, {
|
|
207
209
|
functionName: 'commitAndSync',
|
|
208
210
|
step,
|
|
209
211
|
dir,
|
|
@@ -217,13 +219,15 @@ export async function clone(options) {
|
|
|
217
219
|
length: 24,
|
|
218
220
|
}),
|
|
219
221
|
}), GitStep.PrepareCloneOnlineWiki);
|
|
222
|
+
logDebug(`Running git init in dir ${dir}`, GitStep.PrepareCloneOnlineWiki);
|
|
220
223
|
await GitProcess.exec(['init'], dir);
|
|
224
|
+
logDebug(`Succefully Running git init in dir ${dir}`, GitStep.PrepareCloneOnlineWiki);
|
|
221
225
|
logProgress(GitStep.StartConfiguringGithubRemoteRepository);
|
|
222
226
|
await credentialOn(dir, remoteUrl, gitUserName, accessToken);
|
|
223
227
|
logProgress(GitStep.StartFetchingFromGithubRemote);
|
|
224
228
|
const defaultBranchName = await getDefaultBranchName(dir);
|
|
225
229
|
const { stderr: pullStdError, exitCode } = await GitProcess.exec(['pull', 'origin', `${defaultBranchName}:${defaultBranchName}`], dir);
|
|
226
|
-
await credentialOff(dir);
|
|
230
|
+
await credentialOff(dir, remoteUrl);
|
|
227
231
|
if (exitCode !== 0) {
|
|
228
232
|
throw new GitPullPushError(options, pullStdError);
|
|
229
233
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAE,OAAO,EAAqD,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,cAAc,IAAI,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACpH,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAErD,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AAEvB,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAW7B;IACC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,cAAc,GAAG,qBAAqB,EAAE,GAAG,OAAO,CAAC;IAE9G,MAAM,WAAW,GAAG,CAAC,IAAa,EAAW,EAAE,CAC7C,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE;QACjB,YAAY,EAAE,SAAS;QACvB,IAAI;KACL,CAAC,CAAC;IACL,MAAM,QAAQ,GAAG,CAAC,OAAe,EAAE,IAAa,EAAW,EAAE,CAAC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/inspect.js
CHANGED
|
@@ -102,7 +102,7 @@ export async function getDefaultBranchName(wikiFolderPath) {
|
|
|
102
102
|
* @param dir repo path to test
|
|
103
103
|
*/
|
|
104
104
|
export async function getSyncState(dir, logger, defaultBranchName) {
|
|
105
|
-
const logDebug = (message, step) => logger?.
|
|
105
|
+
const logDebug = (message, step) => logger?.debug?.(message, { functionName: 'getSyncState', step, dir });
|
|
106
106
|
const logProgress = (step) => logger?.info?.(step, {
|
|
107
107
|
functionName: 'getSyncState',
|
|
108
108
|
step,
|
|
@@ -194,7 +194,7 @@ export async function getGitRepositoryState(wikiFolderPath, logger) {
|
|
|
194
194
|
* @param dir repo path
|
|
195
195
|
*/
|
|
196
196
|
export async function getGitDirectory(dir, logger) {
|
|
197
|
-
const logDebug = (message, step) => logger?.
|
|
197
|
+
const logDebug = (message, step) => logger?.debug?.(message, { functionName: 'getSyncState', step, dir });
|
|
198
198
|
const logProgress = (step) => logger?.info?.(step, {
|
|
199
199
|
functionName: 'getSyncState',
|
|
200
200
|
step,
|
package/dist/inspect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../src/inspect.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../src/inspect.ts"],"names":[],"mappings":"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"}
|
package/dist/interface.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export interface ILogger {
|
|
|
15
15
|
/** used to report progress for human user to read */
|
|
16
16
|
info: (message: GitStep, context: ILoggerContext) => unknown;
|
|
17
17
|
/** used to report debug logs */
|
|
18
|
-
|
|
18
|
+
debug: (message: string, context: ILoggerContext) => unknown;
|
|
19
19
|
/** used to report failed optional progress */
|
|
20
20
|
warn: (message: string, context: ILoggerContext) => unknown;
|
|
21
21
|
}
|
package/dist/interface.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAc,SAAQ,yBAAyB;IAC9D,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,yBAAyB;IACxC,+BAA+B;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjC,2FAA2F;IAC3F,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,qDAAqD;IACrD,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC;IAC7D,gCAAgC;IAChC,
|
|
1
|
+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../src/interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAc,SAAQ,yBAAyB;IAC9D,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,yBAAyB;IACxC,+BAA+B;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACjC,2FAA2F;IAC3F,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,OAAO;IACtB,qDAAqD;IACrD,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC;IAC7D,gCAAgC;IAChC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC;IAC7D,8CAA8C;IAC9C,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC;CAC7D;AACD,sDAAsD;AACtD,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,oBAAY,OAAO;IACjB,sBAAsB,2BAA2B;IACjD,sBAAsB,2BAA2B;IACjD,kCAAkC,uCAAuC;IACzE,sCAAsC,2CAA2C;IACjF,sBAAsB,2BAA2B;IACjD,WAAW,gBAAgB;IAC3B,kBAAkB,uBAAuB;IACzC,WAAW,gBAAgB;IAC3B,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,iBAAiB,sBAAsB;IACvC,YAAY,iBAAiB;IAC7B,YAAY,iBAAiB;IAC7B,qBAAqB,0BAA0B;IAC/C,sBAAsB,2BAA2B;IACjD,0BAA0B,+BAA+B;IACzD,oBAAoB,yBAAyB;IAC7C,uBAAuB,4BAA4B;IACnD,oBAAoB,yBAAyB;IAC7C,0BAA0B,+BAA+B;IACzD,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;IACjC,kDAAkD;IAClD,wBAAwB,6BAA6B;IACrD,2CAA2C,gDAAgD;IAC3F,qBAAqB,0BAA0B;IAC/C,6BAA6B,kCAAkC;IAC/D,uCAAuC,4CAA4C;CACpF;AACD;;GAEG;AACH,eAAO,MAAM,gBAAgB,WAA8E,CAAC"}
|
package/dist/sync.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { ILogger } from './interface';
|
|
|
7
7
|
* @param email
|
|
8
8
|
* @param message
|
|
9
9
|
*/
|
|
10
|
-
export declare function commitFiles(dir: string, username: string, email: string, message?: string, logger?: ILogger): Promise<IGitResult>;
|
|
10
|
+
export declare function commitFiles(dir: string, username: string, email: string, message?: string, filesToIgnore?: string[], logger?: ILogger): Promise<IGitResult>;
|
|
11
11
|
/**
|
|
12
12
|
* try to continue rebase, simply adding and committing all things, leave them to user to resolve in the TiddlyWiki later.
|
|
13
13
|
* @param dir
|
package/dist/sync.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAC;AAMhD,OAAO,EAAW,OAAO,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,SAAsC,EAC7C,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAE,MAAM,QAAQ,CAAC;AAMhD,OAAO,EAAW,OAAO,EAAE,MAAM,aAAa,CAAC;AAE/C;;;;;;GAMG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,SAAsC,EAC7C,aAAa,GAAE,MAAM,EAAO,EAC5B,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC,CAqBrB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,uBAAuB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmCpJ"}
|
package/dist/sync.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/* eslint-disable unicorn/prevent-abbreviations */
|
|
2
2
|
import { GitProcess } from 'dugite';
|
|
3
|
-
import
|
|
3
|
+
import { add, listFiles, remove } from 'isomorphic-git';
|
|
4
4
|
import fs from 'fs-extra';
|
|
5
5
|
import { CantSyncInSpecialGitStateAutoFixFailed, SyncScriptIsInDeadLoopError } from './errors';
|
|
6
6
|
import { getGitRepositoryState } from './inspect';
|
|
@@ -12,14 +12,22 @@ import { GitStep } from './interface';
|
|
|
12
12
|
* @param email
|
|
13
13
|
* @param message
|
|
14
14
|
*/
|
|
15
|
-
export async function commitFiles(dir, username, email, message = 'Initialize with TiddlyGit-Desktop', logger) {
|
|
15
|
+
export async function commitFiles(dir, username, email, message = 'Initialize with TiddlyGit-Desktop', filesToIgnore = [], logger) {
|
|
16
16
|
const logProgress = (step) => logger?.info(step, {
|
|
17
17
|
functionName: 'commitFiles',
|
|
18
18
|
step,
|
|
19
19
|
dir,
|
|
20
20
|
});
|
|
21
21
|
logProgress(GitStep.AddingFiles);
|
|
22
|
-
await
|
|
22
|
+
await add({ dir, filepath: '.', fs });
|
|
23
|
+
// find and unStage files that are in the ignore list
|
|
24
|
+
const stagedFiles = await listFiles({ fs, dir });
|
|
25
|
+
if (filesToIgnore.length > 0) {
|
|
26
|
+
const stagedFilesToIgnore = filesToIgnore.filter((file) => stagedFiles.includes(file));
|
|
27
|
+
if (stagedFilesToIgnore.length > 0) {
|
|
28
|
+
await Promise.all(stagedFilesToIgnore.map(async (file) => await remove({ dir, filepath: file, fs })));
|
|
29
|
+
}
|
|
30
|
+
}
|
|
23
31
|
logProgress(GitStep.AddComplete);
|
|
24
32
|
return await GitProcess.exec(['commit', '-m', message, `--author="${username} <${email}>"`], dir);
|
|
25
33
|
}
|
package/dist/sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"AAAA,kDAAkD;AAClD,OAAO,EAAE,UAAU,EAAc,MAAM,QAAQ,CAAC;AAChD,OAAO,GAAG,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../src/sync.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "git-sync-js",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.5.0",
|
|
4
4
|
"description": "JS implementation for Git-Sync, a handy script that backup your notes in a git repo to the remote git services.",
|
|
5
5
|
"homepage": "https://github.com/linonetwo/git-sync-js",
|
|
6
6
|
"bugs": {
|
|
@@ -28,38 +28,38 @@
|
|
|
28
28
|
"prettier:write": "prettier --write src/**/*.ts"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"dugite": "^1.
|
|
32
|
-
"fs-extra": "^
|
|
33
|
-
"isomorphic-git": "^1.
|
|
31
|
+
"dugite": "^1.104.0",
|
|
32
|
+
"fs-extra": "^10.0.0",
|
|
33
|
+
"isomorphic-git": "^1.10.1",
|
|
34
34
|
"lodash": "^4.17.21"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@types/fs-extra": "^9.0.
|
|
38
|
-
"@types/lodash": "^4.14.
|
|
39
|
-
"@types/node": "^
|
|
40
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
41
|
-
"@typescript-eslint/parser": "^
|
|
37
|
+
"@types/fs-extra": "^9.0.13",
|
|
38
|
+
"@types/lodash": "^4.14.175",
|
|
39
|
+
"@types/node": "^16.11.1",
|
|
40
|
+
"@typescript-eslint/eslint-plugin": "^5.0.0",
|
|
41
|
+
"@typescript-eslint/parser": "^5.0.0",
|
|
42
42
|
"docs-ts": "^0.6.10",
|
|
43
|
-
"eslint": "^
|
|
43
|
+
"eslint": "^8.0.1",
|
|
44
44
|
"eslint-config-prettier": "8.3.0",
|
|
45
|
-
"eslint-config-standard": "16.0.
|
|
46
|
-
"eslint-config-standard-with-typescript": "
|
|
45
|
+
"eslint-config-standard": "16.0.3",
|
|
46
|
+
"eslint-config-standard-with-typescript": "21.0.1",
|
|
47
47
|
"eslint-import-resolver-alias": "1.1.2",
|
|
48
|
-
"eslint-import-resolver-typescript": "2.
|
|
49
|
-
"eslint-plugin-html": "6.
|
|
50
|
-
"eslint-plugin-import": "2.
|
|
48
|
+
"eslint-import-resolver-typescript": "2.5.0",
|
|
49
|
+
"eslint-plugin-html": "6.2.0",
|
|
50
|
+
"eslint-plugin-import": "2.25.2",
|
|
51
51
|
"eslint-plugin-node": "11.1.0",
|
|
52
|
-
"eslint-plugin-prettier": "
|
|
52
|
+
"eslint-plugin-prettier": "4.0.0",
|
|
53
53
|
"eslint-plugin-promise": "5.1.0",
|
|
54
|
-
"eslint-plugin-react": "7.
|
|
54
|
+
"eslint-plugin-react": "7.26.1",
|
|
55
55
|
"eslint-plugin-react-hooks": "4.2.0",
|
|
56
56
|
"eslint-plugin-security": "^1.4.0",
|
|
57
57
|
"eslint-plugin-security-node": "^1.0.14",
|
|
58
|
-
"eslint-plugin-unicorn": "
|
|
59
|
-
"prettier": "2.
|
|
58
|
+
"eslint-plugin-unicorn": "37.0.1",
|
|
59
|
+
"prettier": "2.4.1",
|
|
60
60
|
"rimraf": "^3.0.2",
|
|
61
|
-
"ts-node": "^
|
|
62
|
-
"typescript": "^4.
|
|
61
|
+
"ts-node": "^10.3.0",
|
|
62
|
+
"typescript": "^4.4.4"
|
|
63
63
|
},
|
|
64
64
|
"keywords": [
|
|
65
65
|
"git,sync,notebook,commit,rebase,note"
|