isaacscript 3.1.0 → 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.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "isaacscript",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.2.0",
|
|
4
4
|
"description": "A command line tool for managing Isaac mods written in TypeScript.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"isaac",
|
|
@@ -34,14 +34,15 @@
|
|
|
34
34
|
"fs-extra": "^10.1.0",
|
|
35
35
|
"git-dirty": "^1.0.2",
|
|
36
36
|
"glob": "^8.0.3",
|
|
37
|
-
"isaacscript-tsconfig": "^2.
|
|
37
|
+
"isaacscript-tsconfig": "^2.1.0",
|
|
38
38
|
"jsonc-parser": "^3.2.0",
|
|
39
39
|
"moment": "^2.29.4",
|
|
40
|
-
"npm-check-updates": "^16.1.
|
|
40
|
+
"npm-check-updates": "^16.1.3",
|
|
41
41
|
"prompt": "^1.3.0",
|
|
42
42
|
"source-map": "^0.7.4",
|
|
43
43
|
"source-map-support": "^0.5.21",
|
|
44
44
|
"sync-directory": "^5.1.7",
|
|
45
|
+
"touch": "^3.1.0",
|
|
45
46
|
"tslib": "^2.4.0",
|
|
46
47
|
"typescript-to-lua": "^1.10.0",
|
|
47
48
|
"update-notifier": "5.1.0",
|
|
@@ -5,9 +5,11 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const chalk_1 = tslib_1.__importDefault(require("chalk"));
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
7
7
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
8
|
+
const touch = tslib_1.__importStar(require("touch"));
|
|
8
9
|
const constants_1 = require("../../constants");
|
|
9
10
|
const customStage_1 = require("../../customStage");
|
|
10
11
|
const dev_1 = require("../../dev");
|
|
12
|
+
const PackageManager_1 = require("../../enums/PackageManager");
|
|
11
13
|
const exec_1 = require("../../exec");
|
|
12
14
|
const file = tslib_1.__importStar(require("../../file"));
|
|
13
15
|
const json_1 = require("../../json");
|
|
@@ -64,14 +66,14 @@ async function monitor(args, config) {
|
|
|
64
66
|
}
|
|
65
67
|
// Perform the steps to link to a development version of "isaacscript-common", if necessary.
|
|
66
68
|
if (config.isaacScriptCommonDev === true) {
|
|
67
|
-
linkDevelopmentIsaacScriptCommon(constants_1.CWD, verbose);
|
|
69
|
+
linkDevelopmentIsaacScriptCommon(constants_1.CWD, packageManager, verbose);
|
|
68
70
|
}
|
|
69
71
|
// Subprocess #1 - The "save#.dat" file writer.
|
|
70
72
|
(0, spawnSaveDatWriter_1.spawnSaveDatWriter)(config);
|
|
71
73
|
// Subprocess #2 - The mod directory syncer.
|
|
72
74
|
spawnModDirectorySyncer(config);
|
|
73
75
|
// Subprocess #3 - `tstl --watch` (to automatically convert TypeScript to Lua).
|
|
74
|
-
spawnTSTLWatcher(config, constants_1.CWD);
|
|
76
|
+
spawnTSTLWatcher(config, constants_1.CWD, verbose);
|
|
75
77
|
// Subprocess #4 - `tstl --watch` (for the development version of `isaacscript-common`).
|
|
76
78
|
if (config.isaacScriptCommonDev === true) {
|
|
77
79
|
const isaacScriptMonorepoDirectory = (0, dev_1.getAndValidateIsaacScriptMonorepoDirectory)(constants_1.CWD, verbose);
|
|
@@ -81,7 +83,7 @@ async function monitor(args, config) {
|
|
|
81
83
|
console.error(`The "isaacscript-common" directory does not exist at: ${isaacScriptCommonDirectory}`);
|
|
82
84
|
(0, utils_1.error)('Please make sure that the IsaacScript repository is placed next to this one. If you do not want to test a local version of "isaacscript-common", then set the "isaacScriptCommonDev" field to false in your "isaacscript.json" file.');
|
|
83
85
|
}
|
|
84
|
-
spawnTSTLWatcher(config, isaacScriptCommonDirectory);
|
|
86
|
+
spawnTSTLWatcher(config, isaacScriptCommonDirectory, verbose, constants_1.CWD);
|
|
85
87
|
}
|
|
86
88
|
// Also, start constantly pinging the watcher mod.
|
|
87
89
|
setInterval(() => {
|
|
@@ -111,7 +113,10 @@ function validatePackageJSONDependencies(args, verbose) {
|
|
|
111
113
|
}
|
|
112
114
|
}
|
|
113
115
|
}
|
|
114
|
-
function linkDevelopmentIsaacScriptCommon(projectPath, verbose) {
|
|
116
|
+
function linkDevelopmentIsaacScriptCommon(projectPath, packageManager, verbose) {
|
|
117
|
+
if (packageManager !== PackageManager_1.PackageManager.YARN) {
|
|
118
|
+
(0, utils_1.error)(`If you want to use this mod to develop/test "isaacscript-common", then the mod must be set up using the Yarn package manager instead of: ${packageManager}`);
|
|
119
|
+
}
|
|
115
120
|
const isaacScriptMonorepoDirectory = (0, dev_1.getAndValidateIsaacScriptMonorepoDirectory)(projectPath, verbose);
|
|
116
121
|
console.log('Building "isaacscript-common" and setting up the link...');
|
|
117
122
|
const linkScript = path_1.default.join(isaacScriptMonorepoDirectory, "link-isaacscript-common.sh");
|
|
@@ -143,7 +148,7 @@ function spawnModDirectorySyncer(config) {
|
|
|
143
148
|
(0, utils_1.error)(`Error: ${processDescription} subprocess exited with code: ${code}`);
|
|
144
149
|
});
|
|
145
150
|
}
|
|
146
|
-
function spawnTSTLWatcher(config, cwd) {
|
|
151
|
+
function spawnTSTLWatcher(config, cwd, verbose, modCWD) {
|
|
147
152
|
const processDescription = "tstl";
|
|
148
153
|
const tstl = (0, child_process_1.spawn)("npx", ["tstl", "--watch", "--preserveWatchOutput"], {
|
|
149
154
|
shell: true,
|
|
@@ -155,14 +160,11 @@ function spawnTSTLWatcher(config, cwd) {
|
|
|
155
160
|
if (msg.includes("Starting compilation in watch mode...")) {
|
|
156
161
|
const newMsg1 = `${constants_1.PROJECT_NAME} is now watching for future changes${suffix}.`;
|
|
157
162
|
notifyGame.msg(newMsg1);
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
const newMsg2 = "Compiling the mod for the first time...";
|
|
164
|
-
notifyGame.msg(newMsg2);
|
|
165
|
-
}
|
|
163
|
+
const target = suffix.includes("isaacscript-common")
|
|
164
|
+
? '"isaacscript-common"'
|
|
165
|
+
: "the mod";
|
|
166
|
+
const newMsg2 = `Compiling ${target} for the first time...`;
|
|
167
|
+
notifyGame.msg(newMsg2);
|
|
166
168
|
}
|
|
167
169
|
else if (msg.includes("File change detected. Starting incremental compilation...")) {
|
|
168
170
|
compilationStartTime = new Date();
|
|
@@ -175,6 +177,15 @@ function spawnTSTLWatcher(config, cwd) {
|
|
|
175
177
|
const elapsedTimeSeconds = elapsedTimeMilliseconds / 1000;
|
|
176
178
|
const newMsg = `${constants_2.COMPILATION_SUCCESSFUL} (in ${elapsedTimeSeconds} seconds)${suffix}`;
|
|
177
179
|
notifyGame.msg(newMsg);
|
|
180
|
+
// Sometimes, there is a bug where successful compilation of "isaacscript-common" will not
|
|
181
|
+
// trigger a recompilation in the mod. Work around this by always touching the "main.ts" file
|
|
182
|
+
// from the mod.
|
|
183
|
+
if (modCWD !== undefined) {
|
|
184
|
+
const mainTSPath = path_1.default.join(modCWD, "src", "main.ts");
|
|
185
|
+
if (file.exists(mainTSPath, verbose)) {
|
|
186
|
+
touch.sync(mainTSPath);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
178
189
|
}
|
|
179
190
|
else {
|
|
180
191
|
notifyGame.msg(msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/monitor/monitor.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA4C;AAC5C,wDAAwB;
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/monitor/monitor.ts"],"names":[],"mappings":"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"}
|