isaacscript 1.2.2 → 1.2.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/package.json +3 -3
- package/dist/src/commands/copy/copy.js +12 -10
- package/dist/src/commands/copy/copy.js.map +1 -1
- package/dist/src/commands/init/checkIfProjectPathExists.js +2 -2
- package/dist/src/commands/init/checkIfProjectPathExists.js.map +1 -1
- package/dist/src/commands/init/checkModTargetDirectory.js +2 -2
- package/dist/src/commands/init/checkModTargetDirectory.js.map +1 -1
- package/dist/src/commands/init/createMod.js +55 -34
- package/dist/src/commands/init/createMod.js.map +1 -1
- package/dist/src/commands/init/init.js +10 -8
- package/dist/src/commands/init/init.js.map +1 -1
- package/dist/src/commands/init/installVSCodeExtensions.js +3 -2
- package/dist/src/commands/init/installVSCodeExtensions.js.map +1 -1
- package/dist/src/commands/init/promptVSCode.js +7 -7
- package/dist/src/commands/init/promptVSCode.js.map +1 -1
- package/dist/src/commands/monitor/copyWatcherMod.js +7 -7
- package/dist/src/commands/monitor/copyWatcherMod.js.map +1 -1
- package/dist/src/commands/monitor/monitor.js +4 -3
- package/dist/src/commands/monitor/monitor.js.map +1 -1
- package/dist/src/commands/monitor/saveDatWriter/saveDatWriter.js +1 -1
- package/dist/src/commands/monitor/saveDatWriter/saveDatWriter.js.map +1 -1
- package/dist/src/commands/monitor/touchWatcherSaveDatFiles.js +3 -3
- package/dist/src/commands/monitor/touchWatcherSaveDatFiles.js.map +1 -1
- package/dist/src/commands/publish/publish.js +48 -46
- package/dist/src/commands/publish/publish.js.map +1 -1
- package/dist/src/configFile.js +4 -3
- package/dist/src/configFile.js.map +1 -1
- package/dist/src/exec.js +79 -0
- package/dist/src/exec.js.map +1 -0
- package/dist/src/file.js +35 -5
- package/dist/src/file.js.map +1 -1
- package/dist/src/main.js +1 -1
- package/dist/src/main.js.map +1 -1
- package/dist/src/monkeyPatch.js +4 -4
- package/dist/src/monkeyPatch.js.map +1 -1
- package/dist/src/parseArgs.js +20 -1
- package/dist/src/parseArgs.js.map +1 -1
- package/dist/src/util.js +22 -57
- package/dist/src/util.js.map +1 -1
- package/dist/src/validateNodeVersion.js +6 -24
- package/dist/src/validateNodeVersion.js.map +1 -1
- package/package.json +3 -3
- package/src/commands/copy/copy.ts +19 -10
- package/src/commands/init/checkIfProjectPathExists.ts +2 -1
- package/src/commands/init/checkModTargetDirectory.ts +2 -1
- package/src/commands/init/createMod.ts +87 -29
- package/src/commands/init/init.ts +15 -7
- package/src/commands/init/installVSCodeExtensions.ts +4 -2
- package/src/commands/init/promptVSCode.ts +12 -7
- package/src/commands/monitor/copyWatcherMod.ts +10 -7
- package/src/commands/monitor/monitor.ts +5 -3
- package/src/commands/monitor/saveDatWriter/saveDatWriter.ts +1 -1
- package/src/commands/monitor/touchWatcherSaveDatFiles.ts +6 -3
- package/src/commands/publish/publish.ts +65 -55
- package/src/configFile.ts +9 -3
- package/src/exec.ts +102 -0
- package/src/file.ts +48 -5
- package/src/main.ts +1 -1
- package/src/monkeyPatch.ts +4 -2
- package/src/parseArgs.ts +22 -1
- package/src/util.ts +29 -79
- package/src/validateNodeVersion.ts +7 -39
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "isaacscript",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.3",
|
|
4
4
|
"description": "A command line tool for managing Isaac mods written in TypeScript",
|
|
5
5
|
"homepage": "https://isaacscript.github.io/",
|
|
6
6
|
"bugs": {
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"isaacscript-tsconfig": "^1.1.8",
|
|
26
26
|
"jsonc-parser": "^3.0.0",
|
|
27
27
|
"moment": "^2.29.1",
|
|
28
|
-
"npm-check-updates": "^12.
|
|
28
|
+
"npm-check-updates": "^12.3.0",
|
|
29
29
|
"prompt": "^1.2.1",
|
|
30
30
|
"source-map": "^0.7.3",
|
|
31
31
|
"source-map-support": "^0.5.21",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@types/command-exists": "^1.2.0",
|
|
40
40
|
"@types/figlet": "^1.5.4",
|
|
41
41
|
"@types/fs-extra": "^9.0.13",
|
|
42
|
-
"@types/node": "^17.0.
|
|
42
|
+
"@types/node": "^17.0.18",
|
|
43
43
|
"@types/prompt": "^1.1.2",
|
|
44
44
|
"@types/source-map-support": "^0.5.4",
|
|
45
45
|
"@types/update-notifier": "^5.1.0",
|
|
@@ -25,29 +25,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
25
25
|
exports.compileAndCopy = exports.copy = void 0;
|
|
26
26
|
const path_1 = __importDefault(require("path"));
|
|
27
27
|
const constants_1 = require("../../constants");
|
|
28
|
+
const exec_1 = require("../../exec");
|
|
28
29
|
const file = __importStar(require("../../file"));
|
|
29
30
|
const util_1 = require("../../util");
|
|
30
|
-
function copy(config) {
|
|
31
|
+
function copy(argv, config) {
|
|
32
|
+
const verbose = argv.verbose === true;
|
|
31
33
|
const modTargetDirectoryName = (0, util_1.getModTargetDirectoryName)(config);
|
|
32
34
|
const modTargetPath = path_1.default.join(config.modsDirectory, modTargetDirectoryName);
|
|
33
|
-
compileAndCopy(constants_1.MOD_SOURCE_PATH, modTargetPath);
|
|
35
|
+
compileAndCopy(constants_1.MOD_SOURCE_PATH, modTargetPath, verbose);
|
|
34
36
|
}
|
|
35
37
|
exports.copy = copy;
|
|
36
|
-
function compileAndCopy(modSourcePath, modTargetPath) {
|
|
37
|
-
compile();
|
|
38
|
+
function compileAndCopy(modSourcePath, modTargetPath, verbose) {
|
|
39
|
+
compile(verbose);
|
|
38
40
|
// monkeyPatchMainLua(modSourcePath);
|
|
39
|
-
copyMod(modSourcePath, modTargetPath);
|
|
41
|
+
copyMod(modSourcePath, modTargetPath, verbose);
|
|
40
42
|
}
|
|
41
43
|
exports.compileAndCopy = compileAndCopy;
|
|
42
|
-
function compile() {
|
|
43
|
-
(0,
|
|
44
|
+
function compile(verbose) {
|
|
45
|
+
(0, exec_1.execShell)("npx", ["tstl"], verbose);
|
|
44
46
|
console.log("Mod compiled successfully.");
|
|
45
47
|
}
|
|
46
|
-
function copyMod(modSourcePath, modTargetPath) {
|
|
48
|
+
function copyMod(modSourcePath, modTargetPath, verbose) {
|
|
47
49
|
if (file.exists(modTargetPath)) {
|
|
48
|
-
file.deleteFileOrDirectory(modTargetPath);
|
|
50
|
+
file.deleteFileOrDirectory(modTargetPath, verbose);
|
|
49
51
|
}
|
|
50
|
-
file.copy(modSourcePath, modTargetPath);
|
|
52
|
+
file.copy(modSourcePath, modTargetPath, verbose);
|
|
51
53
|
console.log("Mod copied successfully.");
|
|
52
54
|
}
|
|
53
55
|
//# sourceMappingURL=copy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../../../src/commands/copy/copy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,+CAAkD;AAClD,iDAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../../../src/commands/copy/copy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,+CAAkD;AAClD,qCAAuC;AACvC,iDAAmC;AAEnC,qCAAuD;AAEvD,SAAgB,IAAI,CAAC,IAA6B,EAAE,MAAc;IAChE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IAEtC,MAAM,sBAAsB,GAAG,IAAA,gCAAyB,EAAC,MAAM,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC;IAE9E,cAAc,CAAC,2BAAe,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;AAC1D,CAAC;AAPD,oBAOC;AAED,SAAgB,cAAc,CAC5B,aAAqB,EACrB,aAAqB,EACrB,OAAgB;IAEhB,OAAO,CAAC,OAAO,CAAC,CAAC;IACjB,qCAAqC;IACrC,OAAO,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC;AARD,wCAQC;AAED,SAAS,OAAO,CAAC,OAAgB;IAC/B,IAAA,gBAAS,EAAC,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IACpC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,OAAO,CACd,aAAqB,EACrB,aAAqB,EACrB,OAAgB;IAEhB,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC9B,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;KACpD;IACD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -28,7 +28,7 @@ const constants_1 = require("../../constants");
|
|
|
28
28
|
const file = __importStar(require("../../file"));
|
|
29
29
|
const prompt_1 = require("../../prompt");
|
|
30
30
|
const util_1 = require("../../util");
|
|
31
|
-
async function checkIfProjectPathExists(projectPath) {
|
|
31
|
+
async function checkIfProjectPathExists(projectPath, verbose) {
|
|
32
32
|
if (projectPath !== constants_1.CWD && file.exists(projectPath)) {
|
|
33
33
|
const fileType = file.isDir(projectPath) ? "directory" : "file";
|
|
34
34
|
console.log(`A ${fileType} already exists with a name of "${chalk_1.default.green(projectPath)}".`);
|
|
@@ -36,7 +36,7 @@ async function checkIfProjectPathExists(projectPath) {
|
|
|
36
36
|
if (!shouldDelete) {
|
|
37
37
|
(0, util_1.error)("Ok then. Good-bye.");
|
|
38
38
|
}
|
|
39
|
-
file.deleteFileOrDirectory(projectPath);
|
|
39
|
+
file.deleteFileOrDirectory(projectPath, verbose);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
exports.checkIfProjectPathExists = checkIfProjectPathExists;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkIfProjectPathExists.js","sourceRoot":"","sources":["../../../../src/commands/init/checkIfProjectPathExists.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,+CAAsC;AACtC,iDAAmC;AACnC,yCAA6C;AAC7C,qCAAmC;AAE5B,KAAK,UAAU,wBAAwB,CAC5C,WAAmB;
|
|
1
|
+
{"version":3,"file":"checkIfProjectPathExists.js","sourceRoot":"","sources":["../../../../src/commands/init/checkIfProjectPathExists.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,+CAAsC;AACtC,iDAAmC;AACnC,yCAA6C;AAC7C,qCAAmC;AAE5B,KAAK,UAAU,wBAAwB,CAC5C,WAAmB,EACnB,OAAgB;IAEhB,IAAI,WAAW,KAAK,eAAG,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC;QAChE,OAAO,CAAC,GAAG,CACT,KAAK,QAAQ,mCAAmC,eAAK,CAAC,KAAK,CACzD,WAAW,CACZ,IAAI,CACN,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,IAAA,sBAAa,EAAC,8BAA8B,CAAC,CAAC;QAEzE,IAAI,CAAC,YAAY,EAAE;YACjB,IAAA,YAAK,EAAC,oBAAoB,CAAC,CAAC;SAC7B;QAED,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAClD;AACH,CAAC;AApBD,4DAoBC"}
|
|
@@ -29,7 +29,7 @@ const constants_1 = require("../../constants");
|
|
|
29
29
|
const file = __importStar(require("../../file"));
|
|
30
30
|
const prompt_1 = require("../../prompt");
|
|
31
31
|
const util_1 = require("../../util");
|
|
32
|
-
async function checkModTargetDirectory(modsDirectory, projectName) {
|
|
32
|
+
async function checkModTargetDirectory(modsDirectory, projectName, verbose) {
|
|
33
33
|
const modTargetPath = path_1.default.join(modsDirectory, projectName);
|
|
34
34
|
if (!file.exists(modTargetPath)) {
|
|
35
35
|
return;
|
|
@@ -40,7 +40,7 @@ async function checkModTargetDirectory(modsDirectory, projectName) {
|
|
|
40
40
|
if (!shouldDeleteDirectory) {
|
|
41
41
|
(0, util_1.error)("Ok then. You delete it yourself. Good bye.");
|
|
42
42
|
}
|
|
43
|
-
file.deleteFileOrDirectory(modTargetPath);
|
|
43
|
+
file.deleteFileOrDirectory(modTargetPath, verbose);
|
|
44
44
|
}
|
|
45
45
|
exports.checkModTargetDirectory = checkModTargetDirectory;
|
|
46
46
|
//# sourceMappingURL=checkModTargetDirectory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkModTargetDirectory.js","sourceRoot":"","sources":["../../../../src/commands/init/checkModTargetDirectory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,gDAAwB;AACxB,+CAA+C;AAC/C,iDAAmC;AACnC,yCAA6C;AAC7C,qCAAmC;AAE5B,KAAK,UAAU,uBAAuB,CAC3C,aAAqB,EACrB,WAAmB;
|
|
1
|
+
{"version":3,"file":"checkModTargetDirectory.js","sourceRoot":"","sources":["../../../../src/commands/init/checkModTargetDirectory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,gDAAwB;AACxB,+CAA+C;AAC/C,iDAAmC;AACnC,yCAA6C;AAC7C,qCAAmC;AAE5B,KAAK,UAAU,uBAAuB,CAC3C,aAAqB,EACrB,WAAmB,EACnB,OAAgB;IAEhB,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IAC5D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO;KACR;IAED,OAAO,CAAC,KAAK,CACX,kCAAkC,eAAK,CAAC,KAAK,CAC3C,aAAa,CACd,mBAAmB,CACrB,CAAC;IACF,OAAO,CAAC,KAAK,CACX,gBAAgB,wBAAY,4FAA4F,CACzH,CAAC;IAEF,MAAM,qBAAqB,GAAG,MAAM,IAAA,sBAAa,EAC/C,gHAAgH,CACjH,CAAC;IAEF,IAAI,CAAC,qBAAqB,EAAE;QAC1B,IAAA,YAAK,EAAC,4CAA4C,CAAC,CAAC;KACrD;IAED,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AACrD,CAAC;AA5BD,0DA4BC"}
|
|
@@ -29,45 +29,48 @@ const path_1 = __importDefault(require("path"));
|
|
|
29
29
|
const yaml_1 = __importDefault(require("yaml"));
|
|
30
30
|
const configFile = __importStar(require("../../configFile"));
|
|
31
31
|
const constants_1 = require("../../constants");
|
|
32
|
+
const exec_1 = require("../../exec");
|
|
32
33
|
const file = __importStar(require("../../file"));
|
|
33
34
|
const prompt_1 = require("../../prompt");
|
|
34
35
|
const util_1 = require("../../util");
|
|
35
|
-
|
|
36
|
+
const REQUIRED_GIT_MAJOR_VERSION = 2;
|
|
37
|
+
const REQUIRED_GIT_MINOR_VERSION = 30;
|
|
38
|
+
async function createMod(projectName, projectPath, createNewDir, modsDirectory, saveSlot, skipNPMInstall, verbose) {
|
|
36
39
|
if (createNewDir) {
|
|
37
|
-
file.makeDir(projectPath);
|
|
40
|
+
file.makeDir(projectPath, verbose);
|
|
38
41
|
}
|
|
39
42
|
const config = configFile.createObject(modsDirectory, saveSlot);
|
|
40
|
-
configFile.createFile(projectPath, config);
|
|
43
|
+
configFile.createFile(projectPath, config, verbose);
|
|
41
44
|
const targetModDirectory = path_1.default.join(config.modsDirectory, projectName);
|
|
42
|
-
makeSubdirectories(projectPath);
|
|
43
|
-
copyStaticFiles(projectPath);
|
|
44
|
-
copyDynamicFiles(projectName, projectPath, targetModDirectory);
|
|
45
|
-
updateNodeModules(projectPath);
|
|
46
|
-
await initGitRepository(projectPath, projectName);
|
|
47
|
-
installNodeModules(projectPath, skipNPMInstall);
|
|
45
|
+
makeSubdirectories(projectPath, verbose);
|
|
46
|
+
copyStaticFiles(projectPath, verbose);
|
|
47
|
+
copyDynamicFiles(projectName, projectPath, targetModDirectory, verbose);
|
|
48
|
+
updateNodeModules(projectPath, verbose);
|
|
49
|
+
await initGitRepository(projectPath, projectName, verbose);
|
|
50
|
+
installNodeModules(projectPath, skipNPMInstall, verbose);
|
|
48
51
|
console.log(`Successfully created mod: ${chalk_1.default.green(projectName)}`);
|
|
49
52
|
}
|
|
50
53
|
exports.createMod = createMod;
|
|
51
|
-
function makeSubdirectories(projectPath) {
|
|
54
|
+
function makeSubdirectories(projectPath, verbose) {
|
|
52
55
|
// The "src" directory is created during copying of static files
|
|
53
56
|
for (const subdirectory of ["mod"]) {
|
|
54
57
|
const srcPath = path_1.default.join(projectPath, subdirectory);
|
|
55
|
-
file.makeDir(srcPath);
|
|
58
|
+
file.makeDir(srcPath, verbose);
|
|
56
59
|
}
|
|
57
60
|
}
|
|
58
61
|
// Copy static files, like ".eslintrc.js", "tsconfig.json", etc.
|
|
59
|
-
function copyStaticFiles(projectPath) {
|
|
62
|
+
function copyStaticFiles(projectPath, verbose) {
|
|
60
63
|
const staticFileList = file.getDirList(constants_1.TEMPLATES_STATIC_DIR);
|
|
61
64
|
staticFileList.forEach((fileName) => {
|
|
62
65
|
const templateFilePath = path_1.default.join(constants_1.TEMPLATES_STATIC_DIR, fileName);
|
|
63
66
|
const destinationFilePath = path_1.default.join(projectPath, fileName);
|
|
64
67
|
if (!file.exists(destinationFilePath)) {
|
|
65
|
-
file.copy(templateFilePath, destinationFilePath);
|
|
68
|
+
file.copy(templateFilePath, destinationFilePath, verbose);
|
|
66
69
|
}
|
|
67
70
|
});
|
|
68
71
|
}
|
|
69
72
|
// Copy files that need to have text replaced inside of them
|
|
70
|
-
function copyDynamicFiles(projectName, projectPath, targetModDirectory) {
|
|
73
|
+
function copyDynamicFiles(projectName, projectPath, targetModDirectory, verbose) {
|
|
71
74
|
// ".gitignore"
|
|
72
75
|
{
|
|
73
76
|
const fileName = constants_1.GITIGNORE;
|
|
@@ -82,7 +85,7 @@ function copyDynamicFiles(projectName, projectPath, targetModDirectory) {
|
|
|
82
85
|
const gitignoreHeader = `${separatorLine}# ${projectName}\n${separatorLine}\n`;
|
|
83
86
|
const gitignore = gitignoreHeader + template;
|
|
84
87
|
const destinationPath = path_1.default.join(projectPath, `.${fileName}`); // We need to prepend a period
|
|
85
|
-
file.write(destinationPath, gitignore);
|
|
88
|
+
file.write(destinationPath, gitignore, verbose);
|
|
86
89
|
}
|
|
87
90
|
// "package.json"
|
|
88
91
|
{
|
|
@@ -92,7 +95,7 @@ function copyDynamicFiles(projectName, projectPath, targetModDirectory) {
|
|
|
92
95
|
const template = file.read(templatePath);
|
|
93
96
|
const packageJSON = template.replace(/MOD_NAME_TO_REPLACE/g, projectName);
|
|
94
97
|
const destinationPath = path_1.default.join(projectPath, fileName);
|
|
95
|
-
file.write(destinationPath, packageJSON);
|
|
98
|
+
file.write(destinationPath, packageJSON, verbose);
|
|
96
99
|
}
|
|
97
100
|
// "README.md"
|
|
98
101
|
{
|
|
@@ -101,7 +104,7 @@ function copyDynamicFiles(projectName, projectPath, targetModDirectory) {
|
|
|
101
104
|
const template = file.read(templatePath);
|
|
102
105
|
const readmeMD = template.replace(/MOD_NAME_TO_REPLACE/g, projectName);
|
|
103
106
|
const destinationPath = path_1.default.join(projectPath, fileName);
|
|
104
|
-
file.write(destinationPath, readmeMD);
|
|
107
|
+
file.write(destinationPath, readmeMD, verbose);
|
|
105
108
|
}
|
|
106
109
|
// "mod/metadata.xml"
|
|
107
110
|
{
|
|
@@ -111,7 +114,7 @@ function copyDynamicFiles(projectName, projectPath, targetModDirectory) {
|
|
|
111
114
|
const metadataXML = template.replace(/MOD_NAME_TO_REPLACE/g, projectName);
|
|
112
115
|
const modPath = path_1.default.join(projectPath, "mod");
|
|
113
116
|
const destinationPath = path_1.default.join(modPath, fileName);
|
|
114
|
-
file.write(destinationPath, metadataXML);
|
|
117
|
+
file.write(destinationPath, metadataXML, verbose);
|
|
115
118
|
}
|
|
116
119
|
// "mod/metadata.vdf"
|
|
117
120
|
{
|
|
@@ -121,7 +124,7 @@ function copyDynamicFiles(projectName, projectPath, targetModDirectory) {
|
|
|
121
124
|
const metadataVDF = template.replace(/MOD_TARGET_DIR/g, targetModDirectory);
|
|
122
125
|
const modPath = path_1.default.join(projectPath, "mod");
|
|
123
126
|
const destinationPath = path_1.default.join(modPath, fileName);
|
|
124
|
-
file.write(destinationPath, metadataVDF);
|
|
127
|
+
file.write(destinationPath, metadataVDF, verbose);
|
|
125
128
|
}
|
|
126
129
|
// "src/main.ts"
|
|
127
130
|
{
|
|
@@ -133,28 +136,29 @@ function copyDynamicFiles(projectName, projectPath, targetModDirectory) {
|
|
|
133
136
|
const template = file.read(templatePath);
|
|
134
137
|
const mainTS = template.replace(/MOD_NAME_TO_REPLACE/g, projectName);
|
|
135
138
|
const destinationPath = path_1.default.join(srcPath, fileName);
|
|
136
|
-
file.write(destinationPath, mainTS);
|
|
139
|
+
file.write(destinationPath, mainTS, verbose);
|
|
137
140
|
}
|
|
138
141
|
}
|
|
139
|
-
function updateNodeModules(projectPath) {
|
|
142
|
+
function updateNodeModules(projectPath, verbose) {
|
|
140
143
|
console.log("Finding out the latest versions of the NPM packages...");
|
|
141
|
-
(0,
|
|
144
|
+
(0, exec_1.execShell)("npx", ["npm-check-updates", "--upgrade", "--packageFile", "package.json"], verbose, false, projectPath);
|
|
142
145
|
}
|
|
143
|
-
async function initGitRepository(projectPath, projectName) {
|
|
146
|
+
async function initGitRepository(projectPath, projectName, verbose) {
|
|
144
147
|
if (!command_exists_1.default.sync("git")) {
|
|
145
148
|
console.log('Git does not seem to be installed. (The "git" command is not in the path.) Skipping Git-related things.');
|
|
146
149
|
return;
|
|
147
150
|
}
|
|
151
|
+
checkOldGitVersion(verbose);
|
|
148
152
|
const remoteURL = await getGitRemoteURL(projectName);
|
|
149
153
|
if (remoteURL === "") {
|
|
150
154
|
return;
|
|
151
155
|
}
|
|
152
|
-
(0,
|
|
153
|
-
(0,
|
|
154
|
-
(0,
|
|
155
|
-
if (isGitNameAndEmailConfigured()) {
|
|
156
|
-
(0,
|
|
157
|
-
(0,
|
|
156
|
+
(0, exec_1.execShell)("git", ["init"], verbose, false, projectPath);
|
|
157
|
+
(0, exec_1.execShell)("git", ["branch", "-M", "main"], verbose, false, projectPath);
|
|
158
|
+
(0, exec_1.execShell)("git", ["remote", "add", "origin", remoteURL], verbose, false, projectPath);
|
|
159
|
+
if (isGitNameAndEmailConfigured(verbose)) {
|
|
160
|
+
(0, exec_1.execShell)("git", ["add", "--all"], verbose, false, projectPath);
|
|
161
|
+
(0, exec_1.execShell)("git", ["commit", "--message", `${constants_1.PROJECT_NAME} template`], verbose, false, projectPath);
|
|
158
162
|
}
|
|
159
163
|
}
|
|
160
164
|
async function getGitRemoteURL(projectName) {
|
|
@@ -173,6 +177,23 @@ ${chalk_1.default.green("https://github.com/Alice/green-candle.git")}
|
|
|
173
177
|
If you don't want to initialize a Git repository for this project, press enter to skip.
|
|
174
178
|
`);
|
|
175
179
|
}
|
|
180
|
+
function checkOldGitVersion(verbose) {
|
|
181
|
+
const [, stdout] = (0, exec_1.execShell)("git", ["--version"], verbose);
|
|
182
|
+
const outputPrefix = "git version ";
|
|
183
|
+
if (!stdout.startsWith(outputPrefix)) {
|
|
184
|
+
(0, util_1.error)(`Failed to parse the output from the "git --version" command: ${stdout}`);
|
|
185
|
+
}
|
|
186
|
+
const gitVersionString = stdout.slice(outputPrefix.length);
|
|
187
|
+
const [majorVersion, minorVersion] = (0, util_1.parseSemVer)(gitVersionString);
|
|
188
|
+
if (majorVersion >= REQUIRED_GIT_MAJOR_VERSION &&
|
|
189
|
+
minorVersion >= REQUIRED_GIT_MINOR_VERSION) {
|
|
190
|
+
return;
|
|
191
|
+
}
|
|
192
|
+
console.error(`Your Git version is: ${chalk_1.default.red(gitVersionString)}`);
|
|
193
|
+
console.error(`${constants_1.PROJECT_NAME} requires a Git version of ${chalk_1.default.red(`${REQUIRED_GIT_MAJOR_VERSION}.${REQUIRED_GIT_MINOR_VERSION}.0`)} or greater.`);
|
|
194
|
+
console.error(`Please upgrade your version of Git before using ${constants_1.PROJECT_NAME}.`);
|
|
195
|
+
process.exit(1);
|
|
196
|
+
}
|
|
176
197
|
function guessRemoteURL(projectName) {
|
|
177
198
|
const gitHubUsername = getGitHubUsername();
|
|
178
199
|
if (gitHubUsername === undefined) {
|
|
@@ -203,16 +224,16 @@ function getGitHubUsername() {
|
|
|
203
224
|
}
|
|
204
225
|
return user;
|
|
205
226
|
}
|
|
206
|
-
function isGitNameAndEmailConfigured() {
|
|
207
|
-
const [nameExitStatus] = (0,
|
|
208
|
-
const [emailExitStatus] = (0,
|
|
227
|
+
function isGitNameAndEmailConfigured(verbose) {
|
|
228
|
+
const [nameExitStatus] = (0, exec_1.execShell)("git", ["config", "--global", "user.name"], verbose, true);
|
|
229
|
+
const [emailExitStatus] = (0, exec_1.execShell)("git", ["config", "--global", "user.email"], verbose, true);
|
|
209
230
|
return nameExitStatus === 0 && emailExitStatus === 0;
|
|
210
231
|
}
|
|
211
|
-
function installNodeModules(projectPath, skipNPMInstall) {
|
|
232
|
+
function installNodeModules(projectPath, skipNPMInstall, verbose) {
|
|
212
233
|
if (skipNPMInstall) {
|
|
213
234
|
return;
|
|
214
235
|
}
|
|
215
236
|
console.log("Installing node modules... (This can take a long time.)");
|
|
216
|
-
(0,
|
|
237
|
+
(0, exec_1.execShell)("npm", ["install"], verbose, false, projectPath);
|
|
217
238
|
}
|
|
218
239
|
//# sourceMappingURL=createMod.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMod.js","sourceRoot":"","sources":["../../../../src/commands/init/createMod.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,oEAA2C;AAC3C,gDAAwB;AACxB,gDAAwB;AACxB,6DAA+C;AAC/C,+CAeyB;AACzB,iDAAmC;AACnC,yCAA6D;AAE7D,
|
|
1
|
+
{"version":3,"file":"createMod.js","sourceRoot":"","sources":["../../../../src/commands/init/createMod.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,28 +18,30 @@ const installVSCodeExtensions_1 = require("./installVSCodeExtensions");
|
|
|
18
18
|
const promptSaveSlot_1 = require("./promptSaveSlot");
|
|
19
19
|
const promptVSCode_1 = require("./promptVSCode");
|
|
20
20
|
async function init(argv) {
|
|
21
|
+
const vscode = argv.vscode === true;
|
|
22
|
+
const skipNPMInstall = argv.skipNpmInstall === true;
|
|
23
|
+
const verbose = argv.verbose === true;
|
|
21
24
|
// Prompt the end-user for some information (and validate it as we go)
|
|
22
25
|
const [projectPath, createNewDir] = await (0, getProjectPath_1.getProjectPath)(argv);
|
|
23
|
-
await (0, checkIfProjectPathExists_1.checkIfProjectPathExists)(projectPath);
|
|
26
|
+
await (0, checkIfProjectPathExists_1.checkIfProjectPathExists)(projectPath, verbose);
|
|
24
27
|
const modsDirectory = await (0, getModsDir_1.getModsDir)(argv);
|
|
25
28
|
(0, checkModSubdirectory_1.checkModSubdirectory)(projectPath, modsDirectory);
|
|
26
29
|
const projectName = path_1.default.basename(projectPath);
|
|
27
|
-
await (0, checkModTargetDirectory_1.checkModTargetDirectory)(modsDirectory, projectName);
|
|
30
|
+
await (0, checkModTargetDirectory_1.checkModTargetDirectory)(modsDirectory, projectName, verbose);
|
|
28
31
|
const saveSlot = await (0, promptSaveSlot_1.promptSaveSlot)(argv);
|
|
29
|
-
|
|
30
|
-
await (
|
|
31
|
-
await openVSCode(projectPath, argv);
|
|
32
|
+
await (0, createMod_1.createMod)(projectName, projectPath, createNewDir, modsDirectory, saveSlot, skipNPMInstall, verbose);
|
|
33
|
+
await openVSCode(projectPath, vscode, verbose);
|
|
32
34
|
printFinishMessage(projectPath, projectName);
|
|
33
35
|
}
|
|
34
36
|
exports.init = init;
|
|
35
|
-
async function openVSCode(projectPath,
|
|
37
|
+
async function openVSCode(projectPath, vscode, verbose) {
|
|
36
38
|
const VSCodeCommand = getVSCodeCommand();
|
|
37
39
|
if (VSCodeCommand === null) {
|
|
38
40
|
console.log('VSCode does not seem to be installed. (The "code" command is not in the path.) Skipping VSCode-related things.');
|
|
39
41
|
return;
|
|
40
42
|
}
|
|
41
|
-
(0, installVSCodeExtensions_1.installVSCodeExtensions)(projectPath, VSCodeCommand);
|
|
42
|
-
await (0, promptVSCode_1.promptVSCode)(projectPath,
|
|
43
|
+
(0, installVSCodeExtensions_1.installVSCodeExtensions)(projectPath, VSCodeCommand, verbose);
|
|
44
|
+
await (0, promptVSCode_1.promptVSCode)(projectPath, VSCodeCommand, vscode, verbose);
|
|
43
45
|
}
|
|
44
46
|
function getVSCodeCommand() {
|
|
45
47
|
for (const VSCodeCommand of ["code", "codium", "code-oss", "code-insiders"]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/commands/init/init.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oEAA2C;AAC3C,gDAAwB;AACxB,+CAAoD;AACpD,yEAAsE;AACtE,iEAA8D;AAC9D,uEAAoE;AACpE,2CAAwC;AACxC,6CAA0C;AAC1C,qDAAkD;AAClD,uEAAoE;AACpE,qDAAkD;AAClD,iDAA8C;AAEvC,KAAK,UAAU,IAAI,CAAC,IAA6B;IACtD,sEAAsE;IACtE,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,MAAM,IAAA,+BAAc,EAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,IAAA,mDAAwB,EAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../src/commands/init/init.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oEAA2C;AAC3C,gDAAwB;AACxB,+CAAoD;AACpD,yEAAsE;AACtE,iEAA8D;AAC9D,uEAAoE;AACpE,2CAAwC;AACxC,6CAA0C;AAC1C,qDAAkD;AAClD,uEAAoE;AACpE,qDAAkD;AAClD,iDAA8C;AAEvC,KAAK,UAAU,IAAI,CAAC,IAA6B;IACtD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC;IACpC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,KAAK,IAAI,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IAEtC,sEAAsE;IACtE,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,MAAM,IAAA,+BAAc,EAAC,IAAI,CAAC,CAAC;IAC/D,MAAM,IAAA,mDAAwB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,MAAM,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC;IAC7C,IAAA,2CAAoB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,cAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,IAAA,iDAAuB,EAAC,aAAa,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM,IAAA,+BAAc,EAAC,IAAI,CAAC,CAAC;IAE5C,MAAM,IAAA,qBAAS,EACb,WAAW,EACX,WAAW,EACX,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,cAAc,EACd,OAAO,CACR,CAAC;IACF,MAAM,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC/C,CAAC;AAzBD,oBAyBC;AAED,KAAK,UAAU,UAAU,CACvB,WAAmB,EACnB,MAAe,EACf,OAAgB;IAEhB,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IACzC,IAAI,aAAa,KAAK,IAAI,EAAE;QAC1B,OAAO,CAAC,GAAG,CACT,gHAAgH,CACjH,CAAC;QACF,OAAO;KACR;IAED,IAAA,iDAAuB,EAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;IAC7D,MAAM,IAAA,2BAAY,EAAC,WAAW,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AAClE,CAAC;AAED,SAAS,gBAAgB;IACvB,KAAK,MAAM,aAAa,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC,EAAE;QAC3E,IAAI,wBAAa,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;YACrC,OAAO,aAAa,CAAC;SACtB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB,EAAE,WAAmB;IAClE,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,WAAW,KAAK,eAAG,EAAE;QACvB,cAAc,IAAI,IAAI,eAAK,CAAC,KAAK,CAAC,MAAM,WAAW,EAAE,CAAC,QAAQ,CAAC;KAChE;IACD,cAAc,IAAI,IAAI,eAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,cAAc,wBAAY,cAAc,cAAc,GAAG,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -26,12 +26,13 @@ exports.installVSCodeExtensions = void 0;
|
|
|
26
26
|
const chalk_1 = __importDefault(require("chalk"));
|
|
27
27
|
const JSONC = __importStar(require("jsonc-parser"));
|
|
28
28
|
const path_1 = __importDefault(require("path"));
|
|
29
|
+
const exec_1 = require("../../exec");
|
|
29
30
|
const file = __importStar(require("../../file"));
|
|
30
31
|
const util_1 = require("../../util");
|
|
31
|
-
function installVSCodeExtensions(projectPath, VSCodeCommand) {
|
|
32
|
+
function installVSCodeExtensions(projectPath, VSCodeCommand, verbose) {
|
|
32
33
|
const extensions = getExtensionsFromJSON(projectPath);
|
|
33
34
|
for (const extensionName of extensions) {
|
|
34
|
-
(0,
|
|
35
|
+
(0, exec_1.execShell)(VSCodeCommand, ["--install-extension", extensionName], verbose);
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
exports.installVSCodeExtensions = installVSCodeExtensions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installVSCodeExtensions.js","sourceRoot":"","sources":["../../../../src/commands/init/installVSCodeExtensions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,oDAAsC;AACtC,gDAAwB;AACxB,iDAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"installVSCodeExtensions.js","sourceRoot":"","sources":["../../../../src/commands/init/installVSCodeExtensions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,oDAAsC;AACtC,gDAAwB;AACxB,qCAAuC;AACvC,iDAAmC;AACnC,qCAAmC;AAEnC,SAAgB,uBAAuB,CACrC,WAAmB,EACnB,aAAqB,EACrB,OAAgB;IAEhB,MAAM,UAAU,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACtD,KAAK,MAAM,aAAa,IAAI,UAAU,EAAE;QACtC,IAAA,gBAAS,EAAC,aAAa,EAAE,CAAC,qBAAqB,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC,CAAC;KAC3E;AACH,CAAC;AATD,0DASC;AAMD,SAAS,qBAAqB,CAAC,WAAmB;IAChD,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAClC,WAAW,EACX,SAAS,EACT,iBAAiB,CAClB,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;QACpC,OAAO,EAAE,CAAC;KACX;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAExD,IAAI,cAA8B,CAAC;IACnC,IAAI;QACF,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAmB,CAAC;KACnE;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,YAAK,EACH,wBAAwB,eAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAS,EAChE,GAAG,CACJ,CAAC;KACH;IAED,OAAO,cAAc,CAAC,eAAe,CAAC;AACxC,CAAC"}
|
|
@@ -6,23 +6,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.promptVSCode = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const constants_1 = require("../../constants");
|
|
9
|
+
const exec_1 = require("../../exec");
|
|
9
10
|
const prompt_1 = require("../../prompt");
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
if (argv.vscode !== undefined) {
|
|
11
|
+
async function promptVSCode(projectPath, VSCodeCommand, vscode, verbose) {
|
|
12
|
+
if (vscode) {
|
|
13
13
|
// They supplied the "--vscode" command-line flag,
|
|
14
14
|
// so there is no need to prompt the user
|
|
15
|
-
openVSCode(projectPath, VSCodeCommand);
|
|
15
|
+
openVSCode(projectPath, VSCodeCommand, verbose);
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
18
|
const shouldOpenVSCode = await (0, prompt_1.getInputYesNo)("Do you want to open your new project in VSCode now?");
|
|
19
19
|
if (shouldOpenVSCode) {
|
|
20
|
-
openVSCode(projectPath, VSCodeCommand);
|
|
20
|
+
openVSCode(projectPath, VSCodeCommand, verbose);
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
exports.promptVSCode = promptVSCode;
|
|
24
|
-
function openVSCode(projectPath, VSCodeCommand) {
|
|
24
|
+
function openVSCode(projectPath, VSCodeCommand, verbose) {
|
|
25
25
|
const MAIN_TS_PATH = path_1.default.join(projectPath, "src", constants_1.MAIN_TS);
|
|
26
|
-
(0,
|
|
26
|
+
(0, exec_1.execShell)(VSCodeCommand, [projectPath, MAIN_TS_PATH], verbose);
|
|
27
27
|
}
|
|
28
28
|
//# sourceMappingURL=promptVSCode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promptVSCode.js","sourceRoot":"","sources":["../../../../src/commands/init/promptVSCode.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,+CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"promptVSCode.js","sourceRoot":"","sources":["../../../../src/commands/init/promptVSCode.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,+CAA0C;AAC1C,qCAAuC;AACvC,yCAA6C;AAEtC,KAAK,UAAU,YAAY,CAChC,WAAmB,EACnB,aAAqB,EACrB,MAAe,EACf,OAAgB;IAEhB,IAAI,MAAM,EAAE;QACV,kDAAkD;QAClD,yCAAyC;QACzC,UAAU,CAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO;KACR;IAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,sBAAa,EAC1C,qDAAqD,CACtD,CAAC;IACF,IAAI,gBAAgB,EAAE;QACpB,UAAU,CAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;KACjD;AACH,CAAC;AAnBD,oCAmBC;AAED,SAAS,UAAU,CACjB,WAAmB,EACnB,aAAqB,EACrB,OAAgB;IAEhB,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,mBAAO,CAAC,CAAC;IAC5D,IAAA,gBAAS,EAAC,aAAa,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;AACjE,CAAC"}
|
|
@@ -26,7 +26,7 @@ exports.copyWatcherMod = void 0;
|
|
|
26
26
|
const path_1 = __importDefault(require("path"));
|
|
27
27
|
const constants_1 = require("../../constants");
|
|
28
28
|
const file = __importStar(require("../../file"));
|
|
29
|
-
function copyWatcherMod(config) {
|
|
29
|
+
function copyWatcherMod(config, verbose) {
|
|
30
30
|
// Check to see if this mod was disabled
|
|
31
31
|
const watcherModPath = path_1.default.join(config.modsDirectory, constants_1.WATCHER_MOD_NAME);
|
|
32
32
|
const disableItPath = path_1.default.join(watcherModPath, constants_1.DISABLE_IT_FILE);
|
|
@@ -34,18 +34,18 @@ function copyWatcherMod(config) {
|
|
|
34
34
|
// Delete and re-copy the watcher mod every time IsaacScript starts
|
|
35
35
|
// This ensures that it is always the latest version
|
|
36
36
|
if (file.exists(watcherModPath)) {
|
|
37
|
-
file.deleteFileOrDirectory(watcherModPath);
|
|
37
|
+
file.deleteFileOrDirectory(watcherModPath, verbose);
|
|
38
38
|
}
|
|
39
|
-
file.copy(constants_1.WATCHER_MOD_SOURCE_PATH, watcherModPath);
|
|
39
|
+
file.copy(constants_1.WATCHER_MOD_SOURCE_PATH, watcherModPath, verbose);
|
|
40
40
|
if (watcherModDisabled) {
|
|
41
41
|
// Since we deleted the directory, the "disable.it" file was deleted
|
|
42
42
|
// Restore it
|
|
43
|
-
file.write(disableItPath, "");
|
|
43
|
+
file.write(disableItPath, "", verbose);
|
|
44
44
|
}
|
|
45
45
|
// By default, the IsaacScript watcher mod automatically restarts the game,
|
|
46
46
|
// so we only need to disable it if the config option is explicitly set to false
|
|
47
47
|
if (config.enableIsaacScriptWatcherAutoRestart === false) {
|
|
48
|
-
disableIsaacScriptWatcherAutomaticRestart(watcherModPath);
|
|
48
|
+
disableIsaacScriptWatcherAutomaticRestart(watcherModPath, verbose);
|
|
49
49
|
}
|
|
50
50
|
// If we copied a new version of the watcher mod into place,
|
|
51
51
|
// but the user currently has the game open, then the old version will stay loaded
|
|
@@ -53,10 +53,10 @@ function copyWatcherMod(config) {
|
|
|
53
53
|
// so there is no automated solution for this
|
|
54
54
|
}
|
|
55
55
|
exports.copyWatcherMod = copyWatcherMod;
|
|
56
|
-
function disableIsaacScriptWatcherAutomaticRestart(watcherModPath) {
|
|
56
|
+
function disableIsaacScriptWatcherAutomaticRestart(watcherModPath, verbose) {
|
|
57
57
|
const mainLuaPath = path_1.default.join(watcherModPath, constants_1.MAIN_LUA);
|
|
58
58
|
const mainLua = file.read(mainLuaPath);
|
|
59
59
|
const modifiedMainLua = mainLua.replace("local RESTART_GAME_ON_RECOMPILATION = true", "local RESTART_GAME_ON_RECOMPILATION = false");
|
|
60
|
-
file.write(mainLuaPath, modifiedMainLua);
|
|
60
|
+
file.write(mainLuaPath, modifiedMainLua, verbose);
|
|
61
61
|
}
|
|
62
62
|
//# sourceMappingURL=copyWatcherMod.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copyWatcherMod.js","sourceRoot":"","sources":["../../../../src/commands/monitor/copyWatcherMod.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,+CAKyB;AACzB,iDAAmC;AAGnC,SAAgB,cAAc,CAAC,MAAc;
|
|
1
|
+
{"version":3,"file":"copyWatcherMod.js","sourceRoot":"","sources":["../../../../src/commands/monitor/copyWatcherMod.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,+CAKyB;AACzB,iDAAmC;AAGnC,SAAgB,cAAc,CAAC,MAAc,EAAE,OAAgB;IAC7D,wCAAwC;IACxC,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,4BAAgB,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,2BAAe,CAAC,CAAC;IACjE,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAEtD,mEAAmE;IACnE,oDAAoD;IACpD,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QAC/B,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;KACrD;IAED,IAAI,CAAC,IAAI,CAAC,mCAAuB,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IAE5D,IAAI,kBAAkB,EAAE;QACtB,oEAAoE;QACpE,aAAa;QACb,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;KACxC;IAED,2EAA2E;IAC3E,gFAAgF;IAChF,IAAI,MAAM,CAAC,mCAAmC,KAAK,KAAK,EAAE;QACxD,yCAAyC,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;KACpE;IAED,4DAA4D;IAC5D,kFAAkF;IAClF,mEAAmE;IACnE,6CAA6C;AAC/C,CAAC;AA9BD,wCA8BC;AAED,SAAS,yCAAyC,CAChD,cAAsB,EACtB,OAAgB;IAEhB,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,oBAAQ,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAEvC,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CACrC,4CAA4C,EAC5C,6CAA6C,CAC9C,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC"}
|
|
@@ -35,6 +35,7 @@ const notifyGame = __importStar(require("./notifyGame"));
|
|
|
35
35
|
const spawnSaveDatWriter_1 = require("./spawnSaveDatWriter");
|
|
36
36
|
const touchWatcherSaveDatFiles_1 = require("./touchWatcherSaveDatFiles");
|
|
37
37
|
function monitor(argv, config) {
|
|
38
|
+
const verbose = argv.verbose === true;
|
|
38
39
|
// If they specified some command-line flags, override the values found in the config file
|
|
39
40
|
if (argv.modsDirectory !== undefined) {
|
|
40
41
|
config.modsDirectory = argv.modsDirectory; // eslint-disable-line no-param-reassign
|
|
@@ -48,12 +49,12 @@ function monitor(argv, config) {
|
|
|
48
49
|
const modTargetDirectoryName = (0, util_1.getModTargetDirectoryName)(config);
|
|
49
50
|
const modTargetPath = path_1.default.join(config.modsDirectory, modTargetDirectoryName);
|
|
50
51
|
// Prepare the IsaacScript watcher mod
|
|
51
|
-
(0, copyWatcherMod_1.copyWatcherMod)(config);
|
|
52
|
-
(0, touchWatcherSaveDatFiles_1.touchWatcherSaveDatFiles)(config);
|
|
52
|
+
(0, copyWatcherMod_1.copyWatcherMod)(config, verbose);
|
|
53
|
+
(0, touchWatcherSaveDatFiles_1.touchWatcherSaveDatFiles)(config, verbose);
|
|
53
54
|
// Delete and re-copy the mod every time IsaacScript starts
|
|
54
55
|
// This ensures that it is always the latest version
|
|
55
56
|
if (file.exists(modTargetPath)) {
|
|
56
|
-
file.deleteFileOrDirectory(modTargetPath);
|
|
57
|
+
file.deleteFileOrDirectory(modTargetPath, true);
|
|
57
58
|
}
|
|
58
59
|
// Subprocess #1 - The "save#.dat" file writer
|
|
59
60
|
(0, spawnSaveDatWriter_1.spawnSaveDatWriter)(config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../../src/commands/monitor/monitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,iDAA4E;AAC5E,gDAAwB;AACxB,+CAOyB;AACzB,iDAAmC;AAEnC,qCAA8D;AAC9D,qDAAkD;AAClD,6DAA0D;AAC1D,yDAA2C;AAC3C,6DAA0D;AAC1D,yEAAsE;AAEtE,SAAgB,OAAO,CAAC,IAA6B,EAAE,MAAc;IACnE,0FAA0F;IAC1F,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;QACpC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,aAAuB,CAAC,CAAC,wCAAwC;KAC9F;IACD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAAE;QAC/B,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAkB,CAAC,CAAC,wCAAwC;KACpF;IAED,gCAAgC;IAChC,MAAM,eAAe,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAC7C,MAAM,mBAAmB,GAAG,cAAI,CAAC,OAAO,CAAC,eAAG,EAAE,eAAe,CAAC,CAAC;IAC/D,MAAM,sBAAsB,GAAG,IAAA,gCAAyB,EAAC,MAAM,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC;IAE9E,sCAAsC;IACtC,IAAA,+BAAc,EAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../../../src/commands/monitor/monitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ function init() {
|
|
|
42
42
|
// Check to see if the data directory exists
|
|
43
43
|
const watcherModDataPath = path_1.default.dirname(saveDatPath);
|
|
44
44
|
if (!file.exists(watcherModDataPath)) {
|
|
45
|
-
file.makeDir(watcherModDataPath);
|
|
45
|
+
file.makeDir(watcherModDataPath, false);
|
|
46
46
|
}
|
|
47
47
|
// Listen for messages from the parent process
|
|
48
48
|
process.on("message", (msg) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveDatWriter.js","sourceRoot":"","sources":["../../../../../src/commands/monitor/saveDatWriter/saveDatWriter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,oDAAsC;AACtC,gDAAwB;AACxB,kDAAkD;AAClD,oDAAsC;AACtC,wCAAsD;AAGtD,MAAM,YAAY,GAAG,GAAG,CAAC;AAEzB,IAAI,WAAmB,CAAC;AACxB,IAAI,eAAuB,CAAC;AAE5B,IAAI,EAAE,CAAC;AAEP,SAAS,IAAI;IACX,MAAM,OAAO,GAAG,CAAC,CAAC;IAClB,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,GAAG,OAAO,EAAE;QACvC,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;KACH;IAED,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9B,eAAe,GAAG,cAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE7C,4CAA4C;IAC5C,MAAM,kBAAkB,GAAG,cAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACrD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,EAAE;QACpC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"saveDatWriter.js","sourceRoot":"","sources":["../../../../../src/commands/monitor/saveDatWriter/saveDatWriter.ts"],"names":[],"mappings":"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"}
|