isaacscript 3.5.10-dev.4 → 3.5.10-dev.5
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/file-templates/dynamic/.github/workflows/ci.yml +9 -4
- package/file-templates/dynamic/{README.md → README.mod.md} +2 -2
- package/file-templates/dynamic/README.ts.md +3 -0
- package/file-templates/dynamic/gitignore +2 -0
- package/file-templates/dynamic/mod/metadata.xml +3 -3
- package/file-templates/dynamic/{package.json → package.mod.json} +3 -9
- package/file-templates/dynamic/package.ts.json +30 -0
- package/file-templates/dynamic/src/main.ts +1 -1
- package/file-templates/static/gitattributes +1 -0
- package/file-templates/{static → static-mod}/.eslintrc.template.cjs +1 -1
- package/file-templates/{static → static-mod}/.luarc.json +0 -0
- package/file-templates/{static → static-mod}/.prettierignore +0 -0
- package/file-templates/{static → static-mod}/.prettierrc.cjs +1 -0
- package/file-templates/{static → static-mod}/.vscode/extensions.json +0 -0
- package/file-templates/{static → static-mod}/.vscode/settings.json +1 -0
- package/file-templates/{static → static-mod}/build.sh +0 -0
- package/file-templates/{static → static-mod}/cspell.template.json +10 -1
- package/file-templates/{static → static-mod}/lint.sh +0 -0
- package/file-templates/{static → static-mod}/publish.sh +0 -0
- package/file-templates/{static → static-mod}/run.sh +0 -0
- package/file-templates/{static → static-mod}/tsconfig.json +0 -6
- package/file-templates/static-ts/.eslintrc.template.cjs +24 -0
- package/file-templates/static-ts/.prettierignore +7 -0
- package/file-templates/{static-alt/.prettierrc-base.cjs → static-ts/.prettierrc.cjs} +2 -2
- package/file-templates/{static-alt/.vscode/extensions-typescript.json → static-ts/.vscode/extensions.json} +0 -0
- package/file-templates/{static-alt/.vscode/settings-typescript.json → static-ts/.vscode/settings.json} +42 -0
- package/file-templates/static-ts/build.sh +43 -0
- package/file-templates/static-ts/cspell.template.json +27 -0
- package/file-templates/static-ts/lint.sh +32 -0
- package/file-templates/static-ts/publish.sh +10 -0
- package/file-templates/static-ts/run.sh +39 -0
- package/file-templates/static-ts/src/main.js +4 -0
- package/file-templates/static-ts/src/main.js.map +1 -0
- package/file-templates/static-ts/src/main.ts +3 -0
- package/file-templates/static-ts/tsconfig.json +14 -0
- package/package.json +1 -2
- package/src/commands/init/createProject.js +65 -47
- package/src/commands/init/createProject.js.map +1 -1
- package/src/commands/init/getModsDir.js +4 -1
- package/src/commands/init/getModsDir.js.map +1 -1
- package/src/commands/init/init.js +13 -7
- package/src/commands/init/init.js.map +1 -1
- package/src/commands/publish/publish.js +6 -6
- package/src/commands/publish/publish.js.map +1 -1
- package/src/configFile.js +7 -3
- package/src/configFile.js.map +1 -1
- package/src/constants.js +6 -8
- package/src/constants.js.map +1 -1
- package/src/main.js +7 -3
- package/src/main.js.map +1 -1
- package/src/parseArgs.js +4 -0
- package/src/parseArgs.js.map +1 -1
- package/src/parseArgsNew.js +30 -0
- package/src/parseArgsNew.js.map +1 -0
- package/file-templates/static-alt/.prettierignore-base +0 -2
|
@@ -12,33 +12,33 @@ const exec_js_1 = require("../../exec.js");
|
|
|
12
12
|
const file = tslib_1.__importStar(require("../../file.js"));
|
|
13
13
|
const git_js_1 = require("../../git.js");
|
|
14
14
|
const packageManager_js_1 = require("../../packageManager.js");
|
|
15
|
-
|
|
15
|
+
const TEMPLATE_MOD_MARKER = "@template-mod";
|
|
16
|
+
function createProject(projectName, authorName, projectPath, createNewDir, modsDirectory, saveSlot, gitRemoteURL, skipInstall, packageManager, ts, dev, verbose) {
|
|
16
17
|
if (createNewDir) {
|
|
17
18
|
file.makeDir(projectPath, verbose);
|
|
18
19
|
}
|
|
19
20
|
const config = new Config_js_1.Config(modsDirectory, saveSlot, dev);
|
|
20
|
-
(0, configFile_js_1.createConfigFile)(projectPath, config, verbose);
|
|
21
|
-
copyStaticFiles(projectPath, verbose);
|
|
22
|
-
copyDynamicFiles(projectName, authorName, projectPath, packageManager, dev, verbose);
|
|
21
|
+
(0, configFile_js_1.createConfigFile)(projectPath, config, ts, verbose);
|
|
22
|
+
copyStaticFiles(projectPath, ts, verbose);
|
|
23
|
+
copyDynamicFiles(projectName, authorName, projectPath, packageManager, dev, ts, verbose);
|
|
23
24
|
updateNodeModules(projectPath, packageManager, verbose);
|
|
24
25
|
installNodeModules(projectPath, skipInstall, packageManager, verbose);
|
|
25
26
|
formatFiles(projectPath, packageManager, verbose);
|
|
26
27
|
// Only make the initial commit once all of the files have been copied and formatted.
|
|
27
28
|
(0, git_js_1.initGitRepository)(projectPath, gitRemoteURL, verbose);
|
|
28
|
-
|
|
29
|
+
const noun = ts ? "project" : "mod";
|
|
30
|
+
console.log(`Successfully created ${noun}: ${chalk_1.default.green(projectName)}`);
|
|
29
31
|
}
|
|
30
32
|
exports.createProject = createProject;
|
|
31
33
|
/** Copy static files, like ".eslintrc.cjs", "tsconfig.json", etc. */
|
|
32
|
-
function copyStaticFiles(projectPath, verbose) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
// Rename ".eslintrc.template.js" to ".eslintrc.cjs". (If it is kept as ".eslintrc.cjs", then
|
|
34
|
+
function copyStaticFiles(projectPath, ts, verbose) {
|
|
35
|
+
// First, copy the static files that are shared between TypeScript projects and IsaacScript mods.
|
|
36
|
+
copyTemplateDirectoryWithoutOverwriting(constants_js_1.TEMPLATES_STATIC_DIR, projectPath, verbose);
|
|
37
|
+
// Second, copy files that are specific to either a TypeScript project or an IsaacScript mod.
|
|
38
|
+
const staticDirSuffix = ts ? "ts" : "mod";
|
|
39
|
+
const staticDirPath = node_path_1.default.join(constants_js_1.TEMPLATES_DIR, `static-${staticDirSuffix}`);
|
|
40
|
+
copyTemplateDirectoryWithoutOverwriting(staticDirPath, projectPath, verbose);
|
|
41
|
+
// Rename ".eslintrc.template.cjs" to ".eslintrc.cjs". (If it is kept as ".eslintrc.cjs", then
|
|
42
42
|
// local linting will fail.)
|
|
43
43
|
const ESLintConfigPath = node_path_1.default.join(projectPath, ".eslintrc.template.cjs");
|
|
44
44
|
const correctESLintConfigPath = node_path_1.default.join(projectPath, ".eslintrc.cjs");
|
|
@@ -54,8 +54,18 @@ function copyStaticFiles(projectPath, verbose) {
|
|
|
54
54
|
const correctCSpellConfigPath = node_path_1.default.join(projectPath, "cspell.json");
|
|
55
55
|
file.rename(cSpellConfigPath, correctCSpellConfigPath, verbose);
|
|
56
56
|
}
|
|
57
|
+
function copyTemplateDirectoryWithoutOverwriting(templateDirPath, projectPath, verbose) {
|
|
58
|
+
const dirList = file.getDirList(templateDirPath, verbose);
|
|
59
|
+
for (const fileName of dirList) {
|
|
60
|
+
const templateFilePath = node_path_1.default.join(templateDirPath, fileName);
|
|
61
|
+
const destinationFilePath = node_path_1.default.join(projectPath, fileName);
|
|
62
|
+
if (!file.exists(destinationFilePath, verbose)) {
|
|
63
|
+
file.copy(templateFilePath, destinationFilePath, verbose);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
57
67
|
/** Copy files that need to have text replaced inside of them. */
|
|
58
|
-
function copyDynamicFiles(projectName, authorName, projectPath, packageManager, dev, verbose) {
|
|
68
|
+
function copyDynamicFiles(projectName, authorName, projectPath, packageManager, dev, ts, verbose) {
|
|
59
69
|
const workflowsPath = node_path_1.default.join(projectPath, ".github", "workflows");
|
|
60
70
|
file.makeDir(workflowsPath, verbose);
|
|
61
71
|
// `.github/workflows/ci.yml`
|
|
@@ -63,13 +73,16 @@ function copyDynamicFiles(projectName, authorName, projectPath, packageManager,
|
|
|
63
73
|
const fileName = constants_js_1.CI_YML;
|
|
64
74
|
const templatePath = constants_js_1.CI_YML_TEMPLATE_PATH;
|
|
65
75
|
const template = file.read(templatePath, verbose);
|
|
76
|
+
// There are two versions of the template, one for TypeScript, and one for IsaacScript mods.
|
|
77
|
+
const modifiedTemplate = ts
|
|
78
|
+
? (0, isaacscript_common_ts_1.removeLinesBetweenMarkers)(template, TEMPLATE_MOD_MARKER)
|
|
79
|
+
: (0, isaacscript_common_ts_1.removeLinesMatching)(template, TEMPLATE_MOD_MARKER);
|
|
66
80
|
const lockFileName = (0, packageManager_js_1.getPackageManagerLockFileName)(packageManager);
|
|
67
81
|
const installCommand = (0, packageManager_js_1.getPackageManagerInstallCICommand)(packageManager);
|
|
68
|
-
const ciYML =
|
|
69
|
-
.replaceAll("
|
|
70
|
-
.replaceAll("
|
|
71
|
-
.replaceAll("
|
|
72
|
-
.replaceAll("PROJECT-NAME", projectName);
|
|
82
|
+
const ciYML = modifiedTemplate
|
|
83
|
+
.replaceAll("PACKAGE_MANAGER_NAME", packageManager)
|
|
84
|
+
.replaceAll("PACKAGE_MANAGER_LOCK_FILE_NAME", lockFileName)
|
|
85
|
+
.replaceAll("PACKAGE_MANAGER_INSTALL_COMMAND", installCommand);
|
|
73
86
|
const destinationPath = node_path_1.default.join(workflowsPath, fileName);
|
|
74
87
|
file.write(destinationPath, ciYML, verbose);
|
|
75
88
|
}
|
|
@@ -78,6 +91,10 @@ function copyDynamicFiles(projectName, authorName, projectPath, packageManager,
|
|
|
78
91
|
const fileName = constants_js_1.GITIGNORE;
|
|
79
92
|
const templatePath = constants_js_1.GITIGNORE_TEMPLATE_PATH;
|
|
80
93
|
const template = file.read(templatePath, verbose);
|
|
94
|
+
// There are two versions of the template, one for TypeScript, and one for IsaacScript mods.
|
|
95
|
+
const modifiedTemplate = ts
|
|
96
|
+
? (0, isaacscript_common_ts_1.removeLinesBetweenMarkers)(template, TEMPLATE_MOD_MARKER)
|
|
97
|
+
: (0, isaacscript_common_ts_1.removeLinesMatching)(template, TEMPLATE_MOD_MARKER);
|
|
81
98
|
// Prepend a header with the project name.
|
|
82
99
|
let separatorLine = "# ";
|
|
83
100
|
(0, isaacscript_common_ts_1.repeat)(projectName.length, () => {
|
|
@@ -85,63 +102,64 @@ function copyDynamicFiles(projectName, authorName, projectPath, packageManager,
|
|
|
85
102
|
});
|
|
86
103
|
separatorLine += "\n";
|
|
87
104
|
const gitignoreHeader = `${separatorLine}# ${projectName}\n${separatorLine}\n`;
|
|
88
|
-
const gitignore = gitignoreHeader +
|
|
89
|
-
const destinationPath = node_path_1.default.join(projectPath, `.${fileName}`); // We need to prepend a period
|
|
105
|
+
const gitignore = gitignoreHeader + modifiedTemplate;
|
|
106
|
+
const destinationPath = node_path_1.default.join(projectPath, `.${fileName}`); // We need to prepend a period.
|
|
90
107
|
file.write(destinationPath, gitignore, verbose);
|
|
91
108
|
}
|
|
92
109
|
// `package.json`
|
|
93
110
|
{
|
|
94
|
-
//
|
|
95
|
-
const
|
|
96
|
-
|
|
111
|
+
// There are two versions of the template, one for TypeScript, and one for IsaacScript mods.
|
|
112
|
+
const packageJSONTemplateFileName = ts
|
|
113
|
+
? "package.ts.json"
|
|
114
|
+
: "package.mod.json";
|
|
115
|
+
const templatePath = node_path_1.default.join(constants_js_1.TEMPLATES_DYNAMIC_DIR, packageJSONTemplateFileName);
|
|
97
116
|
const template = file.read(templatePath, verbose);
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
else {
|
|
104
|
-
packageJSON = packageJSON.replaceAll("AUTHOR-NAME", authorName);
|
|
105
|
-
}
|
|
106
|
-
const destinationPath = node_path_1.default.join(projectPath, fileName);
|
|
117
|
+
const packageJSON = template
|
|
118
|
+
.replaceAll("PROJECT_NAME", projectName)
|
|
119
|
+
.replaceAll("AUTHOR_NAME", authorName ?? "unknown")
|
|
120
|
+
.replaceAll("PACKAGE_MANAGER", packageManager);
|
|
121
|
+
const destinationPath = node_path_1.default.join(projectPath, constants_js_1.PACKAGE_JSON);
|
|
107
122
|
file.write(destinationPath, packageJSON, verbose);
|
|
108
123
|
}
|
|
109
124
|
// `README.md`
|
|
110
125
|
{
|
|
111
|
-
|
|
112
|
-
const
|
|
126
|
+
// There are two versions of the template, one for TypeScript, and one for IsaacScript mods.
|
|
127
|
+
const readmeMDTemplateFileName = ts ? "README.ts.json" : "README.mod.json";
|
|
128
|
+
const templatePath = node_path_1.default.join(constants_js_1.TEMPLATES_DYNAMIC_DIR, readmeMDTemplateFileName);
|
|
113
129
|
const template = file.read(templatePath, verbose);
|
|
114
|
-
|
|
115
|
-
|
|
130
|
+
// "PROJECT-NAME" must be hyphenated, as using an underscore will break Prettier for some
|
|
131
|
+
// reason.
|
|
132
|
+
const readmeMD = template.replaceAll("PROJECT-NAME", projectName);
|
|
133
|
+
const destinationPath = node_path_1.default.join(projectPath, constants_js_1.README_MD);
|
|
116
134
|
file.write(destinationPath, readmeMD, verbose);
|
|
117
135
|
}
|
|
118
|
-
const modPath = node_path_1.default.join(projectPath, "mod");
|
|
119
|
-
file.makeDir(modPath, verbose);
|
|
120
136
|
// `mod/metadata.xml`
|
|
121
|
-
{
|
|
137
|
+
if (!ts) {
|
|
138
|
+
const modPath = node_path_1.default.join(projectPath, "mod");
|
|
139
|
+
file.makeDir(modPath, verbose);
|
|
122
140
|
const fileName = constants_js_1.METADATA_XML;
|
|
123
141
|
const templatePath = constants_js_1.METADATA_XML_TEMPLATE_PATH;
|
|
124
142
|
const template = file.read(templatePath, verbose);
|
|
125
|
-
const metadataXML = template.replaceAll("
|
|
143
|
+
const metadataXML = template.replaceAll("PROJECT_NAME", projectName);
|
|
126
144
|
const destinationPath = node_path_1.default.join(modPath, fileName);
|
|
127
145
|
file.write(destinationPath, metadataXML, verbose);
|
|
128
146
|
}
|
|
129
147
|
const srcPath = node_path_1.default.join(projectPath, "src");
|
|
130
148
|
file.makeDir(srcPath, verbose);
|
|
131
|
-
// `src/main.ts`
|
|
132
|
-
{
|
|
149
|
+
// `src/main.ts` (TypeScript projects use the simple version from the "static-ts" directory.)
|
|
150
|
+
if (!ts) {
|
|
133
151
|
// Convert snake_case and kebab-case to camelCase. (Kebab-case in particular will make the
|
|
134
152
|
// example TypeScript file fail to compile.)
|
|
135
153
|
const fileName = constants_js_1.MAIN_TS;
|
|
136
154
|
const templatePath = constants_js_1.MAIN_TS_TEMPLATE_PATH;
|
|
137
155
|
const template = file.read(templatePath, verbose);
|
|
138
|
-
const mainTS = template.replaceAll("
|
|
156
|
+
const mainTS = template.replaceAll("PROJECT_NAME", projectName);
|
|
139
157
|
const destinationPath = node_path_1.default.join(srcPath, fileName);
|
|
140
158
|
file.write(destinationPath, mainTS, verbose);
|
|
141
159
|
}
|
|
142
160
|
// If we are initializing an IsaacScript project intended to be used for development, we can
|
|
143
161
|
// include a better starter file.
|
|
144
|
-
if (dev) {
|
|
162
|
+
if (!ts && dev) {
|
|
145
163
|
const fileName = constants_js_1.MAIN_TS;
|
|
146
164
|
const templatePath = constants_js_1.MAIN_DEV_TS_TEMPLATE_PATH;
|
|
147
165
|
const template = file.read(templatePath, verbose);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createProject.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/init/createProject.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"createProject.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/init/createProject.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,10 @@ const MODS = "mods";
|
|
|
12
12
|
const DEFAULT_MODS_PATH_WINDOWS = node_path_1.default.join("C:", "Program Files (x86)", "Steam", "steamapps", "common", "The Binding of Isaac Rebirth", MODS);
|
|
13
13
|
/** This is a subdirectory of `$HOME`. */
|
|
14
14
|
const DEFAULT_MODS_PATH_LINUX = node_path_1.default.join(constants_js_1.HOME_DIR, ".local", "share", "Steam", "steamapps", "common", "The Binding of Isaac Rebirth", MODS);
|
|
15
|
-
async function getModsDir(args, verbose) {
|
|
15
|
+
async function getModsDir(args, ts, verbose) {
|
|
16
|
+
if (ts) {
|
|
17
|
+
return undefined;
|
|
18
|
+
}
|
|
16
19
|
if (args.modsDirectory !== undefined) {
|
|
17
20
|
// They specified the "--mods-directory" command-line flag, so there is no need to prompt the
|
|
18
21
|
// user for it.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getModsDir.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/init/getModsDir.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iEAA8C;AAC9C,kEAA6B;AAC7B,qDAA8C;AAC9C,4DAAsC;AAEtC,+CAAiD;AAEjD,MAAM,IAAI,GAAG,MAAM,CAAC;AAEpB,MAAM,yBAAyB,GAAG,mBAAI,CAAC,IAAI,CACzC,IAAI,EACJ,qBAAqB,EACrB,OAAO,EACP,WAAW,EACX,QAAQ,EACR,8BAA8B,EAC9B,IAAI,CACL,CAAC;AAEF,yCAAyC;AACzC,MAAM,uBAAuB,GAAG,mBAAI,CAAC,IAAI,CACvC,uBAAQ,EACR,QAAQ,EACR,OAAO,EACP,OAAO,EACP,WAAW,EACX,QAAQ,EACR,8BAA8B,EAC9B,IAAI,CACL,CAAC;AAEK,KAAK,UAAU,UAAU,CAC9B,IAAU,EACV,OAAgB;IAEhB,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;QACpC,6FAA6F;QAC7F,eAAe;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;KAC3B;IAED,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE7D,IACE,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,EACpC;QACA,OAAO,eAAe,CAAC;KACxB;IAED,OAAO,CAAC,KAAK,CACX,0CAA0C,eAAK,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CACzE,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAc,EAClC,+BAA+B,IAAI,kFAAkF,CACtH,CAAC;IAEF,IAAI,OAAO,KAAK,EAAE,EAAE;QAClB,IAAA,6BAAK,EAAC,iDAAiD,CAAC,CAAC;KAC1D;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QAClC,IAAA,6BAAK,EACH,4BAA4B,eAAK,CAAC,KAAK,CACrC,OAAO,CACR,4BAA4B,CAC9B,CAAC;KACH;IAED,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QACjC,IAAA,6BAAK,EACH,uBAAuB,eAAK,CAAC,KAAK,CAChC,OAAO,CACR,gCAAgC,CAClC,CAAC;KACH;IAED,IAAI,mBAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;QACnC,IAAA,6BAAK,EACH,iCAAiC,eAAK,CAAC,KAAK,CAC1C,OAAO,CACR,wDAAwD,IAAI,wBAAwB,CACtF,CAAC;KACH;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;
|
|
1
|
+
{"version":3,"file":"getModsDir.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/init/getModsDir.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iEAA8C;AAC9C,kEAA6B;AAC7B,qDAA8C;AAC9C,4DAAsC;AAEtC,+CAAiD;AAEjD,MAAM,IAAI,GAAG,MAAM,CAAC;AAEpB,MAAM,yBAAyB,GAAG,mBAAI,CAAC,IAAI,CACzC,IAAI,EACJ,qBAAqB,EACrB,OAAO,EACP,WAAW,EACX,QAAQ,EACR,8BAA8B,EAC9B,IAAI,CACL,CAAC;AAEF,yCAAyC;AACzC,MAAM,uBAAuB,GAAG,mBAAI,CAAC,IAAI,CACvC,uBAAQ,EACR,QAAQ,EACR,OAAO,EACP,OAAO,EACP,WAAW,EACX,QAAQ,EACR,8BAA8B,EAC9B,IAAI,CACL,CAAC;AAEK,KAAK,UAAU,UAAU,CAC9B,IAAU,EACV,EAAW,EACX,OAAgB;IAEhB,IAAI,EAAE,EAAE;QACN,OAAO,SAAS,CAAC;KAClB;IAED,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,EAAE;QACpC,6FAA6F;QAC7F,eAAe;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;KAC3B;IAED,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE7D,IACE,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,EACpC;QACA,OAAO,eAAe,CAAC;KACxB;IAED,OAAO,CAAC,KAAK,CACX,0CAA0C,eAAK,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CACzE,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAc,EAClC,+BAA+B,IAAI,kFAAkF,CACtH,CAAC;IAEF,IAAI,OAAO,KAAK,EAAE,EAAE;QAClB,IAAA,6BAAK,EAAC,iDAAiD,CAAC,CAAC;KAC1D;IAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QAClC,IAAA,6BAAK,EACH,4BAA4B,eAAK,CAAC,KAAK,CACrC,OAAO,CACR,4BAA4B,CAC9B,CAAC;KACH;IAED,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE;QACjC,IAAA,6BAAK,EACH,uBAAuB,eAAK,CAAC,KAAK,CAChC,OAAO,CACR,gCAAgC,CAClC,CAAC;KACH;IAED,IAAI,mBAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;QACnC,IAAA,6BAAK,EACH,iCAAiC,eAAK,CAAC,KAAK,CAC1C,OAAO,CACR,wDAAwD,IAAI,wBAAwB,CACtF,CAAC;KACH;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AA5DD,gCA4DC;AAED,SAAS,kBAAkB,CAAC,QAAgB;IAC1C,QAAQ,QAAQ,EAAE;QAChB,KAAK,OAAO,CAAC,CAAC;YACZ,OAAO,yBAAyB,CAAC;SAClC;QAED,KAAK,OAAO,CAAC,CAAC;YACZ,OAAO,uBAAuB,CAAC;SAChC;QAED,OAAO,CAAC,CAAC;YACP,IAAA,6BAAK,EACH,gEAAgE,eAAK,CAAC,KAAK,CACzE,QAAQ,CACT,EAAE,CACJ,CAAC;SACH;KACF;AACH,CAAC"}
|
|
@@ -27,6 +27,7 @@ async function init(args) {
|
|
|
27
27
|
const vscode = args.vscode === true;
|
|
28
28
|
const yes = args.yes === true;
|
|
29
29
|
const forceName = args.forceName === true;
|
|
30
|
+
const ts = args.ts === true;
|
|
30
31
|
const dev = args.dev === true;
|
|
31
32
|
// Prompt the end-user for some information (and validate it as we go).
|
|
32
33
|
const [projectPath, createNewDir] = await (0, getProjectPath_js_1.getProjectPath)(args, useCurrentDir, yes, forceName);
|
|
@@ -34,14 +35,16 @@ async function init(args) {
|
|
|
34
35
|
const projectName = node_path_1.default.basename(projectPath);
|
|
35
36
|
const authorName = await (0, getAuthorName_js_1.getAuthorName)(args, verbose);
|
|
36
37
|
const gitRemoteURL = await (0, git_js_1.promptGitHubRepoOrGitRemoteURL)(projectName, noGit, yes, dev, verbose);
|
|
37
|
-
const modsDirectory = await (0, getModsDir_js_1.getModsDir)(args, verbose);
|
|
38
|
-
(
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
const modsDirectory = await (0, getModsDir_js_1.getModsDir)(args, ts, verbose);
|
|
39
|
+
if (modsDirectory !== undefined) {
|
|
40
|
+
(0, checkModSubdirectory_js_1.checkModSubdirectory)(projectPath, modsDirectory);
|
|
41
|
+
await (0, checkModTargetDirectory_js_1.checkModTargetDirectory)(modsDirectory, projectName, yes, verbose);
|
|
42
|
+
}
|
|
43
|
+
const saveSlot = ts ? undefined : await (0, promptSaveSlot_js_1.promptSaveSlot)(args, yes);
|
|
41
44
|
// Now that we have asked the user all of the questions we need, we can create the project.
|
|
42
|
-
(0, createProject_js_1.createProject)(projectName, authorName, projectPath, createNewDir, modsDirectory, saveSlot, gitRemoteURL, skipInstall, packageManager, dev, verbose);
|
|
45
|
+
(0, createProject_js_1.createProject)(projectName, authorName, projectPath, createNewDir, modsDirectory, saveSlot, gitRemoteURL, skipInstall, packageManager, ts, dev, verbose);
|
|
43
46
|
await openVSCode(projectPath, vscode, yes, verbose);
|
|
44
|
-
printFinishMessage(projectPath, projectName, packageManager);
|
|
47
|
+
printFinishMessage(projectPath, projectName, packageManager, ts);
|
|
45
48
|
}
|
|
46
49
|
exports.init = init;
|
|
47
50
|
async function openVSCode(projectPath, vscode, yes, verbose) {
|
|
@@ -61,7 +64,10 @@ function getVSCodeCommand() {
|
|
|
61
64
|
}
|
|
62
65
|
return undefined;
|
|
63
66
|
}
|
|
64
|
-
function printFinishMessage(projectPath, projectName, packageManager) {
|
|
67
|
+
function printFinishMessage(projectPath, projectName, packageManager, ts) {
|
|
68
|
+
if (ts) {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
65
71
|
let commandsToType = "";
|
|
66
72
|
if (projectPath !== constants_js_1.CWD) {
|
|
67
73
|
commandsToType += `"${chalk_1.default.green(`cd ${projectName}`)}" and `;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/init/init.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,4EAA2C;AAC3C,kEAA6B;AAC7B,qDAAuD;AAEvD,yCAA8D;AAC9D,+DAGiC;AAEjC,+EAAyE;AACzE,uEAAiE;AACjE,6EAAuE;AACvE,yDAAmD;AACnD,yDAAmD;AACnD,mDAA6C;AAC7C,2DAAqD;AACrD,6EAAuE;AACvE,2DAAqD;AACrD,uDAAiD;AAE1C,KAAK,UAAU,IAAI,CAAC,IAAU;IACnC,MAAM,cAAc,GAAG,IAAA,sDAAkC,EAAC,IAAI,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC;IAClC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC;IAC9C,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC;IAClD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IACtC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC;IACpC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC;IAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC;IAE9B,uEAAuE;IACvE,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,MAAM,IAAA,kCAAc,EACtD,IAAI,EACJ,aAAa,EACb,GAAG,EACH,SAAS,CACV,CAAC;IACF,MAAM,IAAA,sDAAwB,EAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,mBAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,MAAM,IAAA,gCAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,MAAM,IAAA,uCAA8B,EACvD,WAAW,EACX,KAAK,EACL,GAAG,EACH,GAAG,EACH,OAAO,CACR,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/init/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,10 +15,10 @@ const utils_js_1 = require("../../utils.js");
|
|
|
15
15
|
const copy_js_1 = require("../copy/copy.js");
|
|
16
16
|
const UPDATE_SCRIPT_NAME = "update.sh";
|
|
17
17
|
async function publish(args, config) {
|
|
18
|
-
const
|
|
18
|
+
const skipIncrement = args.skipIncrement === true;
|
|
19
19
|
const { setVersion } = args;
|
|
20
20
|
const dryRun = args.dryRun === true;
|
|
21
|
-
const
|
|
21
|
+
const uploadOnly = args.uploadOnly === true;
|
|
22
22
|
const verbose = args.verbose === true;
|
|
23
23
|
const packageManager = (0, packageManager_js_1.getPackageManagerUsedForExistingProject)(args, verbose);
|
|
24
24
|
const modTargetDirectoryName = (0, utils_js_1.getModTargetDirectoryName)(config);
|
|
@@ -26,11 +26,11 @@ async function publish(args, config) {
|
|
|
26
26
|
validateVersion(setVersion);
|
|
27
27
|
validateGitNotDirty(packageManager, verbose);
|
|
28
28
|
validateIsaacScriptOtherCopiesNotRunning(verbose);
|
|
29
|
-
if (
|
|
29
|
+
if (uploadOnly) {
|
|
30
30
|
uploadMod(modTargetPath, verbose);
|
|
31
31
|
return;
|
|
32
32
|
}
|
|
33
|
-
await startPublish(constants_js_1.MOD_SOURCE_PATH, modTargetPath,
|
|
33
|
+
await startPublish(constants_js_1.MOD_SOURCE_PATH, modTargetPath, skipIncrement, setVersion, dryRun, packageManager, verbose);
|
|
34
34
|
}
|
|
35
35
|
exports.publish = publish;
|
|
36
36
|
function validateVersion(setVersion) {
|
|
@@ -57,13 +57,13 @@ function validateIsaacScriptOtherCopiesNotRunning(verbose) {
|
|
|
57
57
|
(0, isaacscript_common_ts_1.error)(chalk_1.default.red(`Other copies of ${constants_js_1.PROJECT_NAME} appear to be running. You must close those copies before publishing.`));
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
|
-
async function startPublish(modSourcePath, modTargetPath,
|
|
60
|
+
async function startPublish(modSourcePath, modTargetPath, skipIncrement, setVersion, dryRun, packageManager, verbose) {
|
|
61
61
|
updateDeps(verbose);
|
|
62
62
|
// Since we updated the dependencies, things may not longer compile, so test to see if compilation
|
|
63
63
|
// passes before we update the version.
|
|
64
64
|
await (0, copy_js_1.compileAndCopy)(modSourcePath, modTargetPath, packageManager, verbose);
|
|
65
65
|
let version = setVersion === undefined ? getVersionFromPackageJSON(verbose) : setVersion;
|
|
66
|
-
if (!
|
|
66
|
+
if (!skipIncrement && setVersion === undefined) {
|
|
67
67
|
version = bumpVersionInPackageJSON(version, verbose);
|
|
68
68
|
}
|
|
69
69
|
else if (setVersion !== undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/publish/publish.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iEAAoE;AACpE,kEAA6B;AAE7B,qDAW4B;AAE5B,2CAAmE;AACnE,4DAAsC;AACtC,yCAA8D;AAC9D,2CAAyC;AACzC,+DAAkF;AAElF,6CAA2D;AAC3D,6CAAiD;AAEjD,MAAM,kBAAkB,GAAG,WAAW,CAAC;AAEhC,KAAK,UAAU,OAAO,CAAC,IAAU,EAAE,MAAc;IACtD,MAAM,
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/publish/publish.ts"],"names":[],"mappings":"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"}
|
package/src/configFile.js
CHANGED
|
@@ -14,16 +14,17 @@ const NUM_INDENT_SPACES = 2;
|
|
|
14
14
|
async function getConfigFromFile(args) {
|
|
15
15
|
const verbose = args.verbose === true;
|
|
16
16
|
const yes = args.yes === true;
|
|
17
|
+
const ts = args.ts === true;
|
|
17
18
|
const dev = args.dev === true;
|
|
18
19
|
const existingConfig = getExistingConfig(verbose);
|
|
19
20
|
if (existingConfig !== undefined) {
|
|
20
21
|
return existingConfig;
|
|
21
22
|
}
|
|
22
23
|
// No config file exists, so prompt the user for some information and create one.
|
|
23
|
-
const modsDirectory = await (0, getModsDir_js_1.getModsDir)(args, verbose);
|
|
24
|
+
const modsDirectory = await (0, getModsDir_js_1.getModsDir)(args, ts, verbose);
|
|
24
25
|
const saveSlot = await (0, promptSaveSlot_js_1.promptSaveSlot)(args, yes);
|
|
25
26
|
const config = new Config_js_1.Config(modsDirectory, saveSlot, dev);
|
|
26
|
-
createConfigFile(constants_js_1.CWD, config, verbose);
|
|
27
|
+
createConfigFile(constants_js_1.CWD, config, ts, verbose);
|
|
27
28
|
return config;
|
|
28
29
|
}
|
|
29
30
|
exports.getConfigFromFile = getConfigFromFile;
|
|
@@ -50,7 +51,10 @@ function validateMandatoryConfigFields(config) {
|
|
|
50
51
|
function errorMissing(field, description) {
|
|
51
52
|
(0, isaacscript_common_ts_1.error)(`The "${constants_js_1.CONFIG_FILE_NAME}" file is missing a "${field}" value. ${description} Please add it.`);
|
|
52
53
|
}
|
|
53
|
-
function createConfigFile(projectPath, config, verbose) {
|
|
54
|
+
function createConfigFile(projectPath, config, ts, verbose) {
|
|
55
|
+
if (ts) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
54
58
|
const configFilePath = node_path_1.default.join(projectPath, constants_js_1.CONFIG_FILE_NAME);
|
|
55
59
|
// Add a newline at the end to satisfy Prettier.
|
|
56
60
|
const configContents = JSON.stringify(config, undefined, NUM_INDENT_SPACES).concat("\n");
|
package/src/configFile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configFile.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/configFile.ts"],"names":[],"mappings":";;;;AAAA,iEAA8C;AAC9C,kEAA6B;AAC7B,mDAA6C;AAC7C,iEAA2D;AAC3D,yEAAmE;AACnE,iDAAyE;AACzE,wDAAkC;AAClC,uCAAqC;AAGrC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAErB,KAAK,UAAU,iBAAiB,CAAC,IAAU;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IACtC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC;IAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC;IAE9B,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,OAAO,cAAc,CAAC;KACvB;IAED,iFAAiF;IACjF,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"configFile.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/configFile.ts"],"names":[],"mappings":";;;;AAAA,iEAA8C;AAC9C,kEAA6B;AAC7B,mDAA6C;AAC7C,iEAA2D;AAC3D,yEAAmE;AACnE,iDAAyE;AACzE,wDAAkC;AAClC,uCAAqC;AAGrC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAErB,KAAK,UAAU,iBAAiB,CAAC,IAAU;IAChD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IACtC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC;IAC9B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC;IAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC;IAE9B,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,cAAc,KAAK,SAAS,EAAE;QAChC,OAAO,cAAc,CAAC;KACvB;IAED,iFAAiF;IACjF,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAU,EAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,IAAA,kCAAc,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,IAAI,kBAAM,CAAC,aAAa,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IACxD,gBAAgB,CAAC,kBAAG,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAE3C,OAAO,MAAM,CAAC;AAChB,CAAC;AAlBD,8CAkBC;AAED,SAAS,iBAAiB,CAAC,OAAgB;IACzC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,+BAAgB,EAAE,OAAO,CAAC,EAAE;QAC3C,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,MAAM,GAAG,IAAA,kBAAQ,EAAC,+BAAgB,EAAE,OAAO,CAAC,CAAC;IACnD,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAEtC,OAAO,MAA2B,CAAC;AACrC,CAAC;AAED;;;GAGG;AACH,SAAS,6BAA6B,CAAC,MAA+B;IACpE,IAAI,MAAM,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;QACzC,YAAY,CACV,eAAe,EACf,6EAA6E,CAC9E,CAAC;KACH;IAED,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,SAAS,EAAE;QACpC,YAAY,CACV,UAAU,EACV,mEAAmE,CACpE,CAAC;KACH;AACH,CAAC;AAED,SAAS,YAAY,CAAC,KAAa,EAAE,WAAmB;IACtD,IAAA,6BAAK,EACH,QAAQ,+BAAgB,wBAAwB,KAAK,YAAY,WAAW,iBAAiB,CAC9F,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAC9B,WAAmB,EACnB,MAAc,EACd,EAAW,EACX,OAAgB;IAEhB,IAAI,EAAE,EAAE;QACN,OAAO;KACR;IAED,MAAM,cAAc,GAAG,mBAAI,CAAC,IAAI,CAAC,WAAW,EAAE,+BAAgB,CAAC,CAAC;IAEhE,gDAAgD;IAChD,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CACnC,MAAM,EACN,SAAS,EACT,iBAAiB,CAClB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEf,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC;AApBD,4CAoBC"}
|
package/src/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.PUBLISH_POST_COPY_PY_PATH = exports.PUBLISH_PRE_COPY_PY_PATH = exports.VERSION_TXT_PATH = exports.METADATA_XML_PATH = exports.MAIN_LUA = exports.MOD_SOURCE_PATH = exports.CONSTANTS_TS_PATH = exports.PACKAGE_JSON_PATH = exports.TSCONFIG_JSON_PATH = exports.TSCONFIG_JSON = exports.CONFIG_FILE_PATH = exports.CONFIG_FILE_NAME = exports.ISAACSCRIPT_SCHEMA_PATH = exports.
|
|
3
|
+
exports.PUBLISH_POST_COPY_PY_PATH = exports.PUBLISH_PRE_COPY_PY_PATH = exports.VERSION_TXT_PATH = exports.METADATA_XML_PATH = exports.MAIN_LUA = exports.MOD_SOURCE_PATH = exports.CONSTANTS_TS_PATH = exports.PACKAGE_JSON_PATH = exports.PACKAGE_JSON = exports.TSCONFIG_JSON_PATH = exports.TSCONFIG_JSON = exports.CONFIG_FILE_PATH = exports.CONFIG_FILE_NAME = exports.ISAACSCRIPT_SCHEMA_PATH = exports.README_MD = exports.METADATA_XML_TEMPLATE_PATH = exports.METADATA_XML = exports.MAIN_DEV_TS_TEMPLATE_PATH = exports.MAIN_TS_TEMPLATE_PATH = exports.MAIN_TS = exports.GITIGNORE_TEMPLATE_PATH = exports.GITIGNORE = exports.CI_YML_TEMPLATE_PATH = exports.CI_YML = exports.TEMPLATES_DYNAMIC_DIR = exports.TEMPLATES_STATIC_DIR = exports.TEMPLATES_DIR = exports.WATCHER_MOD_SOURCE_PATH = exports.WATCHER_MOD_NAME = exports.DISABLE_IT_FILE = exports.XML_CONVERTER_PATH = exports.SHADERS_XML_PATH = exports.CUSTOM_STAGE_FILES_DIR = exports.REPO_ROOT = exports.PROJECT_NAME = exports.MOD_UPLOADER_PATH = exports.FILE_SYNCED_MESSAGE = exports.HOME_DIR = exports.CURRENT_DIRECTORY_NAME = exports.CWD = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const os = tslib_1.__importStar(require("node:os"));
|
|
6
6
|
const path = tslib_1.__importStar(require("node:path"));
|
|
@@ -23,11 +23,11 @@ exports.DISABLE_IT_FILE = "disable.it";
|
|
|
23
23
|
exports.WATCHER_MOD_NAME = "isaacscript-watcher";
|
|
24
24
|
exports.WATCHER_MOD_SOURCE_PATH = path.join(exports.REPO_ROOT, exports.WATCHER_MOD_NAME);
|
|
25
25
|
// `isaacscript/file-templates`
|
|
26
|
-
|
|
26
|
+
exports.TEMPLATES_DIR = path.join(exports.REPO_ROOT, "file-templates");
|
|
27
27
|
// `isaacscript/file-templates/static`
|
|
28
|
-
exports.TEMPLATES_STATIC_DIR = path.join(TEMPLATES_DIR, "static");
|
|
28
|
+
exports.TEMPLATES_STATIC_DIR = path.join(exports.TEMPLATES_DIR, "static");
|
|
29
29
|
// `isaacscript/file-templates/dynamic`
|
|
30
|
-
exports.TEMPLATES_DYNAMIC_DIR = path.join(TEMPLATES_DIR, "dynamic");
|
|
30
|
+
exports.TEMPLATES_DYNAMIC_DIR = path.join(exports.TEMPLATES_DIR, "dynamic");
|
|
31
31
|
exports.CI_YML = "ci.yml";
|
|
32
32
|
exports.CI_YML_TEMPLATE_PATH = path.join(exports.TEMPLATES_DYNAMIC_DIR, ".github", "workflows", exports.CI_YML);
|
|
33
33
|
exports.GITIGNORE = "gitignore"; // Not named ".gitignore" to prevent npm from deleting it.
|
|
@@ -37,10 +37,7 @@ exports.MAIN_TS_TEMPLATE_PATH = path.join(exports.TEMPLATES_DYNAMIC_DIR, "src",
|
|
|
37
37
|
exports.MAIN_DEV_TS_TEMPLATE_PATH = path.join(exports.TEMPLATES_DYNAMIC_DIR, "src", "main-dev.ts");
|
|
38
38
|
exports.METADATA_XML = "metadata.xml";
|
|
39
39
|
exports.METADATA_XML_TEMPLATE_PATH = path.join(exports.TEMPLATES_DYNAMIC_DIR, "mod", exports.METADATA_XML);
|
|
40
|
-
exports.PACKAGE_JSON = "package.json";
|
|
41
|
-
exports.PACKAGE_JSON_TEMPLATE_PATH = path.join(exports.TEMPLATES_DYNAMIC_DIR, exports.PACKAGE_JSON);
|
|
42
40
|
exports.README_MD = "README.md";
|
|
43
|
-
exports.README_MD_TEMPLATES_PATH = path.join(exports.TEMPLATES_DYNAMIC_DIR, exports.README_MD);
|
|
44
41
|
// `isaacscript/schemas`
|
|
45
42
|
const SCHEMAS_DIR = path.join(exports.REPO_ROOT, "schemas");
|
|
46
43
|
exports.ISAACSCRIPT_SCHEMA_PATH = path.join(SCHEMAS_DIR, "tsconfig-isaacscript-section-schema.json");
|
|
@@ -49,7 +46,8 @@ exports.CONFIG_FILE_NAME = "isaacscript.json";
|
|
|
49
46
|
exports.CONFIG_FILE_PATH = path.join(exports.CWD, exports.CONFIG_FILE_NAME);
|
|
50
47
|
exports.TSCONFIG_JSON = "tsconfig.json";
|
|
51
48
|
exports.TSCONFIG_JSON_PATH = path.join(exports.CWD, exports.TSCONFIG_JSON);
|
|
52
|
-
exports.
|
|
49
|
+
exports.PACKAGE_JSON = "package.json";
|
|
50
|
+
exports.PACKAGE_JSON_PATH = path.join(exports.CWD, exports.PACKAGE_JSON);
|
|
53
51
|
exports.CONSTANTS_TS_PATH = path.join(exports.CWD, "src", "constants.ts");
|
|
54
52
|
// `project/mod`
|
|
55
53
|
exports.MOD_SOURCE_PATH = path.join(exports.CWD, "mod");
|
package/src/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/constants.ts"],"names":[],"mappings":";;;;AAAA,oDAA8B;AAC9B,wDAAkC;AAElC,gBAAgB;AACH,QAAA,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;AACpB,QAAA,sBAAsB,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAG,CAAC,CAAC;AAC5C,QAAA,QAAQ,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;AACxB,QAAA,mBAAmB,GAAG,cAAc,CAAC;AACrC,QAAA,iBAAiB,GAC5B,sHAAsH,CAAC;AAC5G,QAAA,YAAY,GAAG,aAAa,CAAC;AAE1C,gBAAgB;AACH,QAAA,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAEpD,6BAA6B;AAC7B,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAS,EAAE,cAAc,CAAC,CAAC;AAClD,QAAA,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAC7C,iBAAiB,EACjB,0BAA0B,CAC3B,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;AAC/D,QAAA,kBAAkB,GAAG,IAAI,CAAC,IAAI,CACzC,iBAAiB,EACjB,mBAAmB,CACpB,CAAC;AAEF,oCAAoC;AACvB,QAAA,eAAe,GAAG,YAAY,CAAC;AAC/B,QAAA,gBAAgB,GAAG,qBAAqB,CAAC;AACzC,QAAA,uBAAuB,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAS,EAAE,wBAAgB,CAAC,CAAC;AAE9E,+BAA+B;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/constants.ts"],"names":[],"mappings":"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"}
|
package/src/main.js
CHANGED
|
@@ -18,6 +18,7 @@ const constants_js_1 = require("./constants.js");
|
|
|
18
18
|
const exec_js_1 = require("./exec.js");
|
|
19
19
|
const packageManager_js_1 = require("./packageManager.js");
|
|
20
20
|
const parseArgs_js_1 = require("./parseArgs.js");
|
|
21
|
+
const parseArgsNew_js_1 = require("./parseArgsNew.js");
|
|
21
22
|
const prompt_js_1 = require("./prompt.js");
|
|
22
23
|
const Command_js_1 = require("./types/Command.js");
|
|
23
24
|
const validateInIsaacScriptProject_js_1 = require("./validateInIsaacScriptProject.js");
|
|
@@ -30,6 +31,9 @@ main().catch((err) => {
|
|
|
30
31
|
async function main() {
|
|
31
32
|
source_map_support_1.default.install();
|
|
32
33
|
(0, prompt_js_1.promptInit)();
|
|
34
|
+
if (await (0, parseArgsNew_js_1.parseArgsNew)()) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
33
37
|
const args = (0, parseArgs_js_1.parseArgs)();
|
|
34
38
|
const verbose = args.verbose === true;
|
|
35
39
|
const command = getCommandFromArgs(args);
|
|
@@ -39,6 +43,9 @@ async function main() {
|
|
|
39
43
|
// Pre-flight checks
|
|
40
44
|
await (0, checkForWindowsTerminalBugs_js_1.checkForWindowsTerminalBugs)(verbose);
|
|
41
45
|
await handleCommands(command, args);
|
|
46
|
+
if (command !== "monitor") {
|
|
47
|
+
process.exit(0);
|
|
48
|
+
}
|
|
42
49
|
}
|
|
43
50
|
function getCommandFromArgs(args) {
|
|
44
51
|
const positionalArgs = args._;
|
|
@@ -100,9 +107,6 @@ async function handleCommands(command, args) {
|
|
|
100
107
|
break;
|
|
101
108
|
}
|
|
102
109
|
}
|
|
103
|
-
if (command !== "monitor") {
|
|
104
|
-
process.exit(0);
|
|
105
|
-
}
|
|
106
110
|
}
|
|
107
111
|
/**
|
|
108
112
|
* https://stackoverflow.com/questions/57016579/checking-if-package-json-dependencies-match-the-installed-dependencies
|
package/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/main.ts"],"names":[],"mappings":";;;;AAEA,0DAA0B;AAC1B,4DAA4B;AAC5B,iEAA8C;AAC9C,oFAAkD;AAClD,qFAA+E;AAC/E,mDAA6C;AAC7C,wDAAkD;AAClD,qDAA+C;AAC/C,qDAA+C;AAC/C,8DAAwD;AACxD,8DAAwD;AACxD,mDAAoD;AACpD,iDAA8C;AAC9C,uCAA4C;AAC5C,2DAG6B;AAC7B,iDAAiD;AACjD,2CAAyC;AACzC,mDAA8D;AAC9D,uFAAiF;AACjF,qEAA+D;AAC/D,mDAA6C;AAC7C,6CAAuD;AAEvD,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;IACnB,IAAA,6BAAK,EAAC,GAAG,2BAAY,UAAU,EAAE,GAAG,CAAC,CAAC;AACxC,CAAC,CAAC,CAAC;AAEH,KAAK,UAAU,IAAI;IACjB,4BAAgB,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAA,sBAAU,GAAE,CAAC;IAEb,MAAM,IAAI,GAAG,IAAA,wBAAS,GAAE,CAAC;IACzB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IACtC,MAAM,OAAO,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAEzC,IAAA,4CAAmB,GAAE,CAAC;IACtB,IAAA,0BAAU,EAAC,IAAI,CAAC,CAAC;IAEjB,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE9B,oBAAoB;IACpB,MAAM,IAAA,4DAA2B,EAAC,OAAO,CAAC,CAAC;IAE3C,MAAM,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/main.ts"],"names":[],"mappings":"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"}
|
package/src/parseArgs.js
CHANGED
|
@@ -128,6 +128,10 @@ function parseArgs() {
|
|
|
128
128
|
alias: "u",
|
|
129
129
|
type: "boolean",
|
|
130
130
|
description: "only upload the mod to the Steam Workshop (without doing anything else)",
|
|
131
|
+
})
|
|
132
|
+
.option("skip-lint", {
|
|
133
|
+
type: "boolean",
|
|
134
|
+
description: "skip linting before publishing",
|
|
131
135
|
})
|
|
132
136
|
.option("verbose", {
|
|
133
137
|
alias: "v",
|
package/src/parseArgs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseArgs.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/parseArgs.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAA8C;
|
|
1
|
+
{"version":3,"file":"parseArgs.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/parseArgs.ts"],"names":[],"mappings":"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"}
|