isaacscript 3.6.17 → 3.6.19

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "isaacscript",
3
- "version": "3.6.17",
3
+ "version": "3.6.19",
4
4
  "description": "A command line tool for managing Isaac mods written in TypeScript.",
5
5
  "keywords": [
6
6
  "isaac",
@@ -11,7 +11,7 @@ const PackageManager_js_1 = require("../../enums/PackageManager.js");
11
11
  const exec_js_1 = require("../../exec.js");
12
12
  const file_js_1 = require("../../file.js");
13
13
  const packageManager_js_1 = require("../../packageManager.js");
14
- const URL_PREFIX = "https://raw.githubusercontent.com/IsaacScript/isaacscript/main/packages/isaacscript-cli/file-templates/static";
14
+ const URL_PREFIX = "https://raw.githubusercontent.com/IsaacScript/isaacscript/main/packages/isaacscript-cli/file-templates";
15
15
  const MARKER_CUSTOMIZATION_START = "@template-customization-start";
16
16
  const MARKER_CUSTOMIZATION_END = "@template-customization-end";
17
17
  const MARKER_IGNORE_NEXT_LINE = "@template-ignore-next-line";
@@ -96,7 +96,7 @@ function checkIndividualFiles(verbose) {
96
96
  function compareTextFiles(projectFilePath, templateFilePath, originalFileName, verbose) {
97
97
  if (!(0, file_js_1.fileExists)(projectFilePath, verbose)) {
98
98
  console.log(`Failed to find the following file: ${projectFilePath}`);
99
- printTemplateLocation(originalFileName);
99
+ printTemplateLocation(templateFilePath);
100
100
  return false;
101
101
  }
102
102
  const [projectFileContents, ignoreLines] = getTruncatedFileText(projectFilePath, new Set(), verbose);
@@ -192,8 +192,9 @@ function getTruncatedFileText(filePath, linesBeforeIgnore, verbose) {
192
192
  const newText = newLines.join("\n");
193
193
  return [newText, newLinesBeforeIgnore];
194
194
  }
195
- function printTemplateLocation(originalFileName) {
196
- console.log(`You can find the template at: ${chalk_1.default.green(`${URL_PREFIX}/${originalFileName}`)}\n`);
195
+ function printTemplateLocation(templateFilePath) {
196
+ const relativePath = node_path_1.default.relative(constants_js_1.TEMPLATES_DIR, templateFilePath);
197
+ console.log(`You can find the template at: ${chalk_1.default.green(`${URL_PREFIX}/${relativePath}`)}\n`);
197
198
  }
198
199
  function hasPackageManagerString(line) {
199
200
  return PACKAGE_MANAGER_STRINGS.some((string) => line.includes(string));
@@ -1 +1 @@
1
- {"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/check/check.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/check/check.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,7 @@ function prePublish(args, typeScript) {
19
19
  const verbose = args.verbose === true;
20
20
  const packageManager = (0, packageManager_js_1.getPackageManagerUsedForExistingProject)(args, verbose);
21
21
  (0, exec_js_1.execShellString)("git pull --rebase");
22
+ (0, exec_js_1.execShellString)("git push");
22
23
  updateDependencies(skipUpdate, dryRun, packageManager, verbose);
23
24
  incrementVersion(args, typeScript);
24
25
  tryRunBashScript(constants_js_1.BUILD_SCRIPT, verbose);
@@ -56,7 +57,7 @@ function incrementVersion(args, typeScript) {
56
57
  // We always use `npm` here to avoid differences with the version command between package
57
58
  // managers. The "--no-git-tag-version" flag will prevent npm from both making a commit and adding
58
59
  // a tag.
59
- (0, exec_js_1.execShellString)(`npm version --no-git-tag-version ${versionCommandArgument}`, verbose);
60
+ (0, exec_js_1.execShellString)(`npm version ${versionCommandArgument} --no-git-tag-version`, verbose);
60
61
  if (!typeScript) {
61
62
  const version = (0, json_js_1.getProjectPackageJSONField)("version", verbose);
62
63
  writeVersionToConstantsTS(version, verbose);
@@ -68,22 +69,22 @@ function getVersionCommandArgument(args) {
68
69
  const { setVersion } = args;
69
70
  if (setVersion !== undefined) {
70
71
  // They want to use a specific version, which was manually specified.
71
- return `--new-version ${setVersion}`;
72
+ return setVersion;
72
73
  }
73
74
  const major = args.major === true;
74
75
  if (major) {
75
- return "--major";
76
+ return "major";
76
77
  }
77
78
  const minor = args.minor === true;
78
79
  if (minor) {
79
- return "--minor";
80
+ return "minor";
80
81
  }
81
82
  const patch = args.patch === true;
82
83
  if (patch) {
83
- return "--patch";
84
+ return "patch";
84
85
  }
85
86
  // Default to a patch version.
86
- return "--patch";
87
+ return "patch";
87
88
  }
88
89
  function writeVersionToConstantsTS(version, verbose) {
89
90
  if (!(0, file_js_1.fileExists)(constants_js_1.CONSTANTS_TS_PATH, verbose)) {
@@ -1 +1 @@
1
- {"version":3,"file":"prePublish.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/publish/prePublish.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prePublish.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/publish/prePublish.ts"],"names":[],"mappings":"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"}