one-way-git-sync 3.1.1 → 3.2.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.
Files changed (4) hide show
  1. package/README.md +4 -4
  2. package/dist/index.js +28 -19
  3. package/dist/index.js.map +1 -1
  4. package/package.json +43 -37
package/README.md CHANGED
@@ -14,8 +14,8 @@ It provides three features:
14
14
 
15
15
  ### Initial Usage
16
16
 
17
- Since `one-way-git-sync` finds a sync commit from the commit history of the dest repo,
18
- you need to run `init` subcommand to add an initial sync commit
17
+ Because `one-way-git-sync` finds a sync commit from the commit history of the dest repo,
18
+ you need to run `init` subcommand to add an initial sync commit to the dest repo
19
19
  by replacing all the files of the dest repo with those of src repo at first.
20
20
  The sample command is as follows:
21
21
 
@@ -28,7 +28,7 @@ yarn one-way-git-sync init \
28
28
  ### Usual Usage
29
29
 
30
30
  If the last commit in the dest repo is a sync commit,
31
- `one-way-git-sync` safely synchronize the dest repo with the src repo.
31
+ `one-way-git-sync` safely synchronizes the dest repo with the src repo.
32
32
  The sample command is as follows:
33
33
 
34
34
  ```
@@ -60,4 +60,4 @@ The sample commands are as follows:
60
60
  - [sample-of-one-way-git-sync](https://github.com/WillBooster/sample-of-one-way-git-sync): an example synchronized repository.
61
61
  - [release.yml](.github/workflows/release.yml): releases a new npm package and add a tag automatically in this repository using `semantic-release`.
62
62
  - [sync.yml](.github/workflows/sync.yml): it synchronizes `sample-of-one-way-git-sync` repository using `one-way-git-sync` when a new version is released.
63
- - [force-sync.yml](.github/workflows/force-sync.yml): we can manually trigger this workflow which forces synchronizing `sample-of-one-way-git-sync` repository.
63
+ - [force-sync.yml](.github/workflows/sync-force.yml): we can manually trigger this workflow which forces synchronizing `sample-of-one-way-git-sync` repository.
package/dist/index.js CHANGED
@@ -31,7 +31,7 @@ const logger = winston.createLogger({
31
31
  });
32
32
 
33
33
  const syncDirPath = path__default["default"].join('node_modules', '.temp', 'sync-git-repo');
34
- const ignoreNames = ['.git', 'node_modules'];
34
+ const ignoreNames = ['.git', '.github', 'node_modules'];
35
35
  async function sync(opts, init) {
36
36
  await fsp__default["default"].mkdir(syncDirPath, {
37
37
  recursive: true
@@ -48,20 +48,29 @@ async function sync(opts, init) {
48
48
  async function syncCore(destRepoPath, opts, init) {
49
49
  var _srcLog$latest, _opts$prefix;
50
50
 
51
- await simpleGit__default["default"]().clone(opts.dest, destRepoPath, opts.force ? undefined : {
52
- '--depth': 1
53
- });
54
- logger.verbose('Cloned a destination repo');
55
- const dstGit = simpleGit__default["default"](destRepoPath);
51
+ const cloneOpts = {
52
+ '--single-branch': undefined
53
+ };
54
+
55
+ if (!opts.force) {
56
+ cloneOpts['--depth'] = 1;
57
+ }
56
58
 
57
59
  if (opts.branch) {
58
- try {
59
- await dstGit.checkout(opts.branch);
60
- } catch (_) {
61
- await dstGit.checkoutLocalBranch(opts.branch);
62
- }
60
+ cloneOpts['--branch'] = opts.branch;
63
61
  }
64
62
 
63
+ try {
64
+ await simpleGit__default["default"]().clone(opts.dest, destRepoPath, cloneOpts);
65
+ } catch (e) {
66
+ if (!init) throw e;
67
+ delete cloneOpts['--single-branch'];
68
+ await simpleGit__default["default"]().clone(opts.dest, destRepoPath, cloneOpts);
69
+ simpleGit__default["default"](destRepoPath).checkout(['-b', opts.branch]);
70
+ }
71
+
72
+ logger.verbose(`Cloned a destination repo on ${destRepoPath}`);
73
+ const dstGit = simpleGit__default["default"](destRepoPath);
65
74
  const dstLog = await dstGit.log();
66
75
  let from;
67
76
 
@@ -87,7 +96,7 @@ async function syncCore(destRepoPath, opts, init) {
87
96
  '--first-parent': undefined
88
97
  } : undefined);
89
98
  } catch (e) {
90
- logger.error('Failed to get source commit history:', e);
99
+ logger.error(`Failed to get source commit history: ${e.stack}`);
91
100
  return false;
92
101
  }
93
102
 
@@ -137,7 +146,7 @@ async function syncCore(destRepoPath, opts, init) {
137
146
  logger.verbose(`Created a commit: ${title}`);
138
147
  logger.verbose(` with body: ${body}`);
139
148
  } catch (e) {
140
- logger.error('Failed to commit changes:', e);
149
+ logger.error(`Failed to commit changes: ${e.stack}\`);`);
141
150
  return false;
142
151
  }
143
152
 
@@ -148,7 +157,7 @@ async function syncCore(destRepoPath, opts, init) {
148
157
  await dstGit.addTag(destTag);
149
158
  logger.verbose(`Created a tag: ${destTag}`);
150
159
  } catch (e) {
151
- logger.error('Failed to commit changes:', e);
160
+ logger.error(`Failed to commit changes: ${e.stack}\`);`);
152
161
  return false;
153
162
  }
154
163
  }
@@ -167,11 +176,11 @@ async function syncCore(destRepoPath, opts, init) {
167
176
  });
168
177
  }
169
178
  } catch (e) {
170
- logger.error('Failed to push a commit:', e);
179
+ logger.error(`Failed to push the commit: ${e.stack}`);
171
180
  return false;
172
181
  }
173
182
 
174
- logger.verbose('Pushed a commit');
183
+ logger.verbose('Pushed the commit');
175
184
  return true;
176
185
  }
177
186
 
@@ -189,7 +198,7 @@ function extractCommitHash(logResult) {
189
198
  }
190
199
  }
191
200
 
192
- logger.error('No sync commit: ', logResult.all[0]);
201
+ logger.error(`No sync commit: ${logResult.all[0].message}`);
193
202
  return;
194
203
  }
195
204
 
@@ -234,7 +243,7 @@ const yargsOptions = {
234
243
  tag: {
235
244
  type: 'string',
236
245
  alias: 't',
237
- describe: 'Specify tag created in destination repo.'
246
+ describe: 'Specify tag to be created in destination repo.'
238
247
  },
239
248
  'tag-hash': {
240
249
  type: 'boolean',
@@ -242,7 +251,7 @@ const yargsOptions = {
242
251
  },
243
252
  'tag-version': {
244
253
  type: 'boolean',
245
- describe: 'Create version tag (e.g. v1.31.5). It may be a non-unique tag.'
254
+ describe: 'Create version tag (e.g. v1.31.5). It could be a non-unique tag.'
246
255
  },
247
256
  dry: {
248
257
  type: 'boolean',
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":["../src/logger.ts","../src/index.ts","../src/initCommand.ts","../src/syncCommand.ts","../src/yargsOptions.ts","../src/cli.ts"],"sourcesContent":["import { createLogger, format, transports } from 'winston';\n\nexport const logger = createLogger({\n transports: [\n new transports.Console({\n format: format.cli({ colors: { error: 'red' } }),\n }),\n ],\n});\n","import child_process from 'child_process';\nimport fsp from 'fs/promises';\nimport path from 'path';\n\nimport fse from 'fs-extra';\nimport simpleGit, { SimpleGit } from 'simple-git';\nimport type { LogResult } from 'simple-git/typings/response';\nimport { InferredOptionTypes } from 'yargs';\n\nimport { logger } from './logger';\nimport { yargsOptions } from './yargsOptions';\n\nconst syncDirPath = path.join('node_modules', '.temp', 'sync-git-repo');\nconst ignoreNames = ['.git', 'node_modules'];\n\nexport async function sync(opts: InferredOptionTypes<typeof yargsOptions>, init: boolean): Promise<void> {\n await fsp.mkdir(syncDirPath, { recursive: true });\n const dirPath = await fsp.mkdtemp(path.join(syncDirPath, 'repo-'));\n const ret = await syncCore(dirPath, opts, init);\n await fsp.rm(dirPath, { recursive: true, force: true });\n process.exit(ret ? 0 : 1);\n}\n\nasync function syncCore(\n destRepoPath: string,\n opts: InferredOptionTypes<typeof yargsOptions>,\n init: boolean\n): Promise<boolean> {\n await simpleGit().clone(opts.dest, destRepoPath, opts.force ? undefined : { '--depth': 1 });\n logger.verbose('Cloned a destination repo');\n\n const dstGit: SimpleGit = simpleGit(destRepoPath);\n if (opts.branch) {\n try {\n await dstGit.checkout(opts.branch);\n } catch (_) {\n await dstGit.checkoutLocalBranch(opts.branch);\n }\n }\n const dstLog = await dstGit.log();\n\n let from: string | undefined;\n if (!init) {\n from = extractCommitHash(dstLog);\n if (!from) {\n logger.error('No valid commit in destination repo');\n return false;\n }\n logger.verbose(`Extracted a valid commit: ${from}`);\n }\n\n const srcGit: SimpleGit = simpleGit();\n let srcLog: LogResult;\n try {\n // '--first-parent' hides children commits of merge commits\n srcLog = await srcGit.log(from ? { from, to: 'HEAD', '--first-parent': undefined } : undefined);\n } catch (e) {\n logger.error('Failed to get source commit history:', e);\n return false;\n }\n\n const latestHash = srcLog.latest?.hash;\n if (!latestHash) {\n logger.info('No synchronizable commit');\n return true;\n }\n\n const [destFiles, srcFiles] = await Promise.all([fsp.readdir(destRepoPath), fsp.readdir('.')]);\n for (const destFile of destFiles) {\n if (ignoreNames.includes(destFile)) continue;\n await fsp.rm(path.join(destRepoPath, destFile), { recursive: true, force: true });\n }\n for (const srcFile of srcFiles) {\n if (ignoreNames.includes(srcFile)) continue;\n fse.copySync(srcFile, path.join(destRepoPath, srcFile));\n }\n await dstGit.add('-A');\n\n let srcTag = '';\n if (opts['tag-hash'] || opts['tag-version']) {\n // e.g. `--abbrev=0` changes `v1.31.5-2-gcdde507` to `v1.31.5`\n const describeCommand = `git describe --tags --always ${opts['tag-version'] ? '--abbrev=0' : ''}`;\n srcTag = child_process.execSync(describeCommand).toString().trim();\n }\n let prefix = opts.prefix ?? '';\n if (prefix && !prefix.endsWith('/')) {\n prefix += '/';\n }\n const link = `${prefix}${latestHash}`;\n const title = srcTag ? `sync ${srcTag} (${link})` : `sync ${link}`;\n const body = init\n ? `Initialize one-way-git-sync by replacing all the files with those of ${opts.dest}`\n : srcLog.all.map((l) => `* ${l.message}`).join('\\n\\n');\n try {\n await dstGit.commit(`${title}\\n\\n${body}`);\n logger.verbose(`Created a commit: ${title}`);\n logger.verbose(` with body: ${body}`);\n } catch (e) {\n logger.error('Failed to commit changes:', e);\n return false;\n }\n\n const destTag = srcTag || opts.tag;\n if (destTag) {\n try {\n await dstGit.addTag(destTag);\n logger.verbose(`Created a tag: ${destTag}`);\n } catch (e) {\n logger.error('Failed to commit changes:', e);\n return false;\n }\n }\n\n if (opts.dry) {\n logger.verbose('Finished dry run');\n return true;\n }\n\n try {\n await dstGit.push();\n if (destTag) {\n await dstGit.push({ '--tags': null });\n }\n } catch (e) {\n logger.error('Failed to push a commit:', e);\n return false;\n }\n\n logger.verbose('Pushed a commit');\n return true;\n}\n\nfunction extractCommitHash(logResult: LogResult): string | undefined {\n if (logResult.all.length === 0) {\n logger.error('No commit history');\n return;\n }\n\n for (const log of logResult.all) {\n const [head, ...words] = log.message.replace(/[()]/g, '').split(/[\\s/]/);\n if (head === 'sync' && words.length) {\n return words[words.length - 1];\n }\n }\n logger.error('No sync commit: ', logResult.all[0]);\n return;\n}\n","import type { CommandModule, InferredOptionTypes } from 'yargs';\n\nimport { yargsOptions } from './yargsOptions';\n\nimport { sync } from './index';\n\nexport const initCommand: CommandModule<unknown, InferredOptionTypes<typeof yargsOptions>> = {\n command: 'init',\n describe: 'Initialize a destination git repository',\n async handler(argv) {\n await sync(argv, true);\n },\n};\n","import type { CommandModule, InferredOptionTypes } from 'yargs';\n\nimport { yargsOptions } from './yargsOptions';\n\nimport { sync } from './index';\n\nexport const syncCommand: CommandModule<unknown, InferredOptionTypes<typeof yargsOptions>> = {\n command: 'sync',\n describe: 'Synchronize a destination git repository with a source git repository',\n async handler(argv) {\n await sync(argv, false);\n },\n};\n","export const yargsOptions = {\n dest: {\n type: 'string',\n alias: 'd',\n describe: 'A URL of a destination git repository.',\n demand: true,\n },\n prefix: {\n type: 'string',\n alias: 'p',\n describe: `A prefix of a commit hash used to generate a commit title, e.g. 'sync <prefix>/<hash>'.\n A typical value is like 'https://github.com/WillBooster/one-way-git-sync/commits'`,\n },\n branch: {\n type: 'string',\n alias: 'b',\n describe: 'Specify branch of destination repo.',\n },\n tag: {\n type: 'string',\n alias: 't',\n describe: 'Specify tag created in destination repo.',\n },\n 'tag-hash': {\n type: 'boolean',\n describe: 'Create version+hash tag (e.g. v1.31.5-2-gcdde507). It should be a unique tag.',\n },\n 'tag-version': {\n type: 'boolean',\n describe: 'Create version tag (e.g. v1.31.5). It may be a non-unique tag.',\n },\n dry: {\n type: 'boolean',\n describe: 'Enable dry-run mode.',\n },\n force: {\n type: 'boolean',\n describe: 'Force to overwrite the destination git repository.',\n },\n verbose: {\n type: 'boolean',\n alias: 'v',\n describe: 'Show details logs.',\n },\n} as const;\n","import { hideBin } from 'yargs/helpers';\nimport yargs from 'yargs/yargs';\n\nimport { initCommand } from './initCommand';\nimport { logger } from './logger';\nimport { syncCommand } from './syncCommand';\nimport { yargsOptions } from './yargsOptions';\n\nexport async function cli(argv: string[]): Promise<void> {\n await yargs(hideBin(argv))\n .options(yargsOptions)\n .middleware((argv) => {\n logger.level = argv.verbose ? 'verbose' : 'info';\n })\n .command(initCommand)\n .command(syncCommand).argv;\n}\n"],"names":["logger","createLogger","transports","Console","format","cli","colors","error","syncDirPath","path","join","ignoreNames","sync","opts","init","fsp","mkdir","recursive","dirPath","mkdtemp","ret","syncCore","rm","force","process","exit","destRepoPath","simpleGit","clone","dest","undefined","verbose","dstGit","branch","checkout","_","checkoutLocalBranch","dstLog","log","from","extractCommitHash","srcGit","srcLog","to","e","latestHash","latest","hash","info","destFiles","srcFiles","Promise","all","readdir","destFile","includes","srcFile","fse","copySync","add","srcTag","describeCommand","child_process","execSync","toString","trim","prefix","endsWith","link","title","body","map","l","message","commit","destTag","tag","addTag","dry","push","logResult","length","head","words","replace","split","initCommand","command","describe","handler","argv","syncCommand","yargsOptions","type","alias","demand","yargs","hideBin","options","middleware","level"],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sources":["../src/logger.ts","../src/index.ts","../src/initCommand.ts","../src/syncCommand.ts","../src/yargsOptions.ts","../src/cli.ts"],"sourcesContent":["import { createLogger, format, transports } from 'winston';\n\nexport const logger = createLogger({\n transports: [\n new transports.Console({\n format: format.cli({ colors: { error: 'red' } }),\n }),\n ],\n});\n","import child_process from 'child_process';\nimport fsp from 'fs/promises';\nimport path from 'path';\n\nimport fse from 'fs-extra';\nimport type { LogResult, TaskOptions } from 'simple-git';\nimport simpleGit, { SimpleGit } from 'simple-git';\nimport { InferredOptionTypes } from 'yargs';\n\nimport { logger } from './logger';\nimport { yargsOptions } from './yargsOptions';\n\nconst syncDirPath = path.join('node_modules', '.temp', 'sync-git-repo');\nconst ignoreNames = ['.git', '.github', 'node_modules'];\n\nexport async function sync(opts: InferredOptionTypes<typeof yargsOptions>, init: boolean): Promise<void> {\n await fsp.mkdir(syncDirPath, { recursive: true });\n const dirPath = await fsp.mkdtemp(path.join(syncDirPath, 'repo-'));\n const ret = await syncCore(dirPath, opts, init);\n await fsp.rm(dirPath, { recursive: true, force: true });\n process.exit(ret ? 0 : 1);\n}\n\nasync function syncCore(\n destRepoPath: string,\n opts: InferredOptionTypes<typeof yargsOptions>,\n init: boolean\n): Promise<boolean> {\n const cloneOpts: Record<string, any> = { '--single-branch': undefined };\n if (!opts.force) {\n cloneOpts['--depth'] = 1;\n }\n if (opts.branch) {\n cloneOpts['--branch'] = opts.branch;\n }\n try {\n await simpleGit().clone(opts.dest, destRepoPath, cloneOpts);\n } catch (e) {\n if (!init) throw e;\n\n delete cloneOpts['--single-branch'];\n await simpleGit().clone(opts.dest, destRepoPath, cloneOpts);\n simpleGit(destRepoPath).checkout(['-b', opts.branch] as TaskOptions);\n }\n logger.verbose(`Cloned a destination repo on ${destRepoPath}`);\n\n const dstGit: SimpleGit = simpleGit(destRepoPath);\n const dstLog = await dstGit.log();\n\n let from: string | undefined;\n if (!init) {\n from = extractCommitHash(dstLog);\n if (!from) {\n logger.error('No valid commit in destination repo');\n return false;\n }\n logger.verbose(`Extracted a valid commit: ${from}`);\n }\n\n const srcGit: SimpleGit = simpleGit();\n let srcLog: LogResult;\n try {\n // '--first-parent' hides children commits of merge commits\n srcLog = await srcGit.log(from ? { from, to: 'HEAD', '--first-parent': undefined } : undefined);\n } catch (e) {\n logger.error(`Failed to get source commit history: ${(e as Error).stack}`);\n return false;\n }\n\n const latestHash = srcLog.latest?.hash;\n if (!latestHash) {\n logger.info('No synchronizable commit');\n return true;\n }\n\n const [destFiles, srcFiles] = await Promise.all([fsp.readdir(destRepoPath), fsp.readdir('.')]);\n for (const destFile of destFiles) {\n if (ignoreNames.includes(destFile)) continue;\n await fsp.rm(path.join(destRepoPath, destFile), { recursive: true, force: true });\n }\n for (const srcFile of srcFiles) {\n if (ignoreNames.includes(srcFile)) continue;\n fse.copySync(srcFile, path.join(destRepoPath, srcFile));\n }\n await dstGit.add('-A');\n\n let srcTag = '';\n if (opts['tag-hash'] || opts['tag-version']) {\n // e.g. `--abbrev=0` changes `v1.31.5-2-gcdde507` to `v1.31.5`\n const describeCommand = `git describe --tags --always ${opts['tag-version'] ? '--abbrev=0' : ''}`;\n srcTag = child_process.execSync(describeCommand).toString().trim();\n }\n let prefix = opts.prefix ?? '';\n if (prefix && !prefix.endsWith('/')) {\n prefix += '/';\n }\n const link = `${prefix}${latestHash}`;\n const title = srcTag ? `sync ${srcTag} (${link})` : `sync ${link}`;\n const body = init\n ? `Initialize one-way-git-sync by replacing all the files with those of ${opts.dest}`\n : srcLog.all.map((l) => `* ${l.message}`).join('\\n\\n');\n try {\n await dstGit.commit(`${title}\\n\\n${body}`);\n logger.verbose(`Created a commit: ${title}`);\n logger.verbose(` with body: ${body}`);\n } catch (e) {\n logger.error(`Failed to commit changes: ${(e as Error).stack}\\`);`);\n return false;\n }\n\n const destTag = srcTag || opts.tag;\n if (destTag) {\n try {\n await dstGit.addTag(destTag);\n logger.verbose(`Created a tag: ${destTag}`);\n } catch (e) {\n logger.error(`Failed to commit changes: ${(e as Error).stack}\\`);`);\n return false;\n }\n }\n\n if (opts.dry) {\n logger.verbose('Finished dry run');\n return true;\n }\n\n try {\n await dstGit.push();\n if (destTag) {\n await dstGit.push({ '--tags': null });\n }\n } catch (e) {\n logger.error(`Failed to push the commit: ${(e as Error).stack}`);\n return false;\n }\n\n logger.verbose('Pushed the commit');\n return true;\n}\n\nfunction extractCommitHash(logResult: LogResult): string | undefined {\n if (logResult.all.length === 0) {\n logger.error('No commit history');\n return;\n }\n\n for (const log of logResult.all) {\n const [head, ...words] = log.message.replace(/[()]/g, '').split(/[\\s/]/);\n if (head === 'sync' && words.length) {\n return words[words.length - 1];\n }\n }\n logger.error(`No sync commit: ${logResult.all[0].message}`);\n return;\n}\n","import type { CommandModule, InferredOptionTypes } from 'yargs';\n\nimport { yargsOptions } from './yargsOptions';\n\nimport { sync } from './index';\n\nexport const initCommand: CommandModule<unknown, InferredOptionTypes<typeof yargsOptions>> = {\n command: 'init',\n describe: 'Initialize a destination git repository',\n async handler(argv) {\n await sync(argv, true);\n },\n};\n","import type { CommandModule, InferredOptionTypes } from 'yargs';\n\nimport { yargsOptions } from './yargsOptions';\n\nimport { sync } from './index';\n\nexport const syncCommand: CommandModule<unknown, InferredOptionTypes<typeof yargsOptions>> = {\n command: 'sync',\n describe: 'Synchronize a destination git repository with a source git repository',\n async handler(argv) {\n await sync(argv, false);\n },\n};\n","export const yargsOptions = {\n dest: {\n type: 'string',\n alias: 'd',\n describe: 'A URL of a destination git repository.',\n demand: true,\n },\n prefix: {\n type: 'string',\n alias: 'p',\n describe: `A prefix of a commit hash used to generate a commit title, e.g. 'sync <prefix>/<hash>'.\n A typical value is like 'https://github.com/WillBooster/one-way-git-sync/commits'`,\n },\n branch: {\n type: 'string',\n alias: 'b',\n describe: 'Specify branch of destination repo.',\n },\n tag: {\n type: 'string',\n alias: 't',\n describe: 'Specify tag to be created in destination repo.',\n },\n 'tag-hash': {\n type: 'boolean',\n describe: 'Create version+hash tag (e.g. v1.31.5-2-gcdde507). It should be a unique tag.',\n },\n 'tag-version': {\n type: 'boolean',\n describe: 'Create version tag (e.g. v1.31.5). It could be a non-unique tag.',\n },\n dry: {\n type: 'boolean',\n describe: 'Enable dry-run mode.',\n },\n force: {\n type: 'boolean',\n describe: 'Force to overwrite the destination git repository.',\n },\n verbose: {\n type: 'boolean',\n alias: 'v',\n describe: 'Show details logs.',\n },\n} as const;\n","import { hideBin } from 'yargs/helpers';\nimport yargs from 'yargs/yargs';\n\nimport { initCommand } from './initCommand';\nimport { logger } from './logger';\nimport { syncCommand } from './syncCommand';\nimport { yargsOptions } from './yargsOptions';\n\nexport async function cli(argv: string[]): Promise<void> {\n await yargs(hideBin(argv))\n .options(yargsOptions)\n .middleware((argv) => {\n logger.level = argv.verbose ? 'verbose' : 'info';\n })\n .command(initCommand)\n .command(syncCommand).argv;\n}\n"],"names":["logger","createLogger","transports","Console","format","cli","colors","error","syncDirPath","path","join","ignoreNames","sync","opts","init","fsp","mkdir","recursive","dirPath","mkdtemp","ret","syncCore","rm","force","process","exit","destRepoPath","cloneOpts","undefined","branch","simpleGit","clone","dest","e","checkout","verbose","dstGit","dstLog","log","from","extractCommitHash","srcGit","srcLog","to","stack","latestHash","latest","hash","info","destFiles","srcFiles","Promise","all","readdir","destFile","includes","srcFile","fse","copySync","add","srcTag","describeCommand","child_process","execSync","toString","trim","prefix","endsWith","link","title","body","map","l","message","commit","destTag","tag","addTag","dry","push","logResult","length","head","words","replace","split","initCommand","command","describe","handler","argv","syncCommand","yargsOptions","type","alias","demand","yargs","hideBin","options","middleware","level"],"mappings":"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"}
package/package.json CHANGED
@@ -18,67 +18,73 @@
18
18
  "cleanup": "yarn format && yarn lint-fix",
19
19
  "format": "sort-package-json && yarn prettify",
20
20
  "_postinstall": "husky install",
21
- "lint": "eslint --color \"./{src,__tests__}/**/*.{js,jsx,ts,tsx}\"",
21
+ "lint": "eslint --color \"./{src,__tests__}/**/*.{cjs,js,jsx,mjs,ts,tsx}\"",
22
22
  "lint-fix": "yarn lint --fix",
23
23
  "prepublishOnly": "pinst --disable",
24
- "prettify": "prettier --color --write \"**/{.*/,}*.{css,htm,html,js,json,json5,jsx,md,scss,ts,tsx,vue,yaml,yml}\" \"!**/test-fixtures/**\"",
24
+ "prettify": "prettier --color --write \"**/{.*/,}*.{cjs,css,htm,html,js,json,json5,jsx,md,mjs,scss,ts,tsx,vue,yaml,yml}\" \"!**/test-fixtures/**\"",
25
25
  "postpublish": "pinst --enable",
26
- "start": "yarn && babel-node -x .js,.jsx,.es6,.es,.ts -- src/start.ts",
27
- "start-prod": "yarn && yarn build && yarn one-way-git-sync",
26
+ "release": "yarn build && semantic-release",
27
+ "start": "babel-node -x .js,.jsx,.es6,.es,.ts -- src/start.ts",
28
+ "start-prod": "yarn build && yarn one-way-git-sync",
28
29
  "typecheck": "tsc --noEmit --Pretty"
29
30
  },
30
31
  "prettier": "@willbooster/prettier-config",
32
+ "resolutions": {
33
+ "npm/chalk": "^4.1.2"
34
+ },
31
35
  "dependencies": {
32
36
  "fs-extra": "10.0.0",
33
- "simple-git": "2.47.0",
34
- "winston": "3.3.3",
35
- "yargs": "17.2.1"
37
+ "simple-git": "3.2.6",
38
+ "winston": "3.6.0",
39
+ "yargs": "17.3.1"
36
40
  },
37
41
  "devDependencies": {
38
- "@babel/core": "7.16.0",
39
- "@babel/helper-plugin-utils": "7.14.5",
40
- "@babel/node": "7.16.0",
41
- "@babel/plugin-proposal-class-properties": "7.16.0",
42
- "@babel/plugin-proposal-numeric-separator": "7.16.0",
43
- "@babel/preset-env": "7.16.0",
44
- "@babel/preset-typescript": "7.16.0",
42
+ "@babel/core": "7.17.5",
43
+ "@babel/helper-plugin-utils": "7.16.7",
44
+ "@babel/node": "7.16.8",
45
+ "@babel/plugin-proposal-class-properties": "7.16.7",
46
+ "@babel/plugin-proposal-numeric-separator": "7.16.7",
47
+ "@babel/preset-env": "7.16.11",
48
+ "@babel/preset-typescript": "7.16.7",
45
49
  "@rollup/plugin-babel": "5.3.0",
46
50
  "@rollup/plugin-commonjs": "21.0.1",
47
- "@rollup/plugin-node-resolve": "13.0.6",
48
- "@types/eslint": "7.28.2",
51
+ "@rollup/plugin-node-resolve": "13.1.3",
52
+ "@types/eslint": "8.4.1",
49
53
  "@types/fs-extra": "9.0.13",
50
54
  "@types/micromatch": "4.0.2",
51
- "@types/semantic-release": "17.2.2",
52
- "@types/yargs": "17.0.5",
53
- "@typescript-eslint/eslint-plugin": "5.2.0",
54
- "@typescript-eslint/parser": "5.2.0",
55
- "@willbooster/eslint-config-ts": "6.4.2",
56
- "@willbooster/prettier-config": "6.4.0",
57
- "@willbooster/renovate-config": "6.4.2",
55
+ "@types/semantic-release": "17.2.3",
56
+ "@types/yargs": "17.0.8",
57
+ "@typescript-eslint/eslint-plugin": "5.12.0",
58
+ "@typescript-eslint/parser": "5.12.0",
59
+ "@willbooster/eslint-config-ts": "9.0.0",
60
+ "@willbooster/prettier-config": "9.0.0",
61
+ "@willbooster/renovate-config": "9.2.0",
58
62
  "babel-plugin-transform-remove-console": "6.9.4",
59
63
  "babel-plugin-unassert": "3.2.0",
60
64
  "babel-preset-power-assert": "3.0.0",
61
- "conventional-changelog-conventionalcommits": "4.6.1",
62
- "core-js": "3.19.0",
63
- "eslint": "8.1.0",
65
+ "conventional-changelog-conventionalcommits": "4.6.3",
66
+ "core-js": "3.21.1",
67
+ "eslint": "8.9.0",
64
68
  "eslint-config-prettier": "8.3.0",
65
- "eslint-import-resolver-node": "0.3.6",
66
- "eslint-plugin-import": "2.25.2",
69
+ "eslint-import-resolver-typescript": "2.5.0",
70
+ "eslint-plugin-import": "2.25.4",
71
+ "eslint-plugin-sort-class-members": "1.14.1",
72
+ "eslint-plugin-sort-destructure-keys": "1.4.0",
67
73
  "husky": "7.0.4",
68
- "lint-staged": "11.2.6",
74
+ "lint-staged": "12.3.4",
69
75
  "micromatch": "4.0.4",
70
76
  "pinst": "2.1.6",
71
77
  "power-assert": "1.6.1",
72
- "prettier": "2.4.1",
73
- "rollup": "2.58.3",
74
- "rollup-plugin-node-externals": "2.2.0",
75
- "semantic-release": "18.0.0",
76
- "sort-package-json": "1.52.0",
77
- "typescript": "4.4.4"
78
+ "prettier": "2.5.1",
79
+ "rollup": "2.67.3",
80
+ "rollup-plugin-node-externals": "4.0.0",
81
+ "semantic-release": "19.0.2",
82
+ "sort-package-json": "1.54.0",
83
+ "typescript": "4.5.5"
78
84
  },
79
85
  "engines": {
80
86
  "node": ">=14"
81
87
  },
82
- "packageManager": "yarn@3.0.2",
83
- "version": "3.1.1"
88
+ "packageManager": "yarn@3.2.0-rc.15",
89
+ "version": "3.2.0"
84
90
  }