isaacscript 2.16.6 → 2.17.1
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 +1 -1
- package/src/commands/init/git.js +2 -2
- package/src/commands/init/git.js.map +1 -1
- package/src/commands/init/init.js +24 -2
- package/src/commands/init/init.js.map +1 -1
- package/src/exec.js +9 -1
- package/src/exec.js.map +1 -1
- package/src/packageManager.js +9 -1
- package/src/packageManager.js.map +1 -1
package/package.json
CHANGED
package/src/commands/init/git.js
CHANGED
|
@@ -13,8 +13,8 @@ const prompt_1 = require("../../prompt");
|
|
|
13
13
|
const utils_1 = require("../../utils");
|
|
14
14
|
const REQUIRED_GIT_MAJOR_VERSION = 2;
|
|
15
15
|
const REQUIRED_GIT_MINOR_VERSION = 30;
|
|
16
|
-
async function promptGitHubRepoOrGitRemoteURL(projectName, noGit, yes, verbose) {
|
|
17
|
-
if (noGit) {
|
|
16
|
+
async function promptGitHubRepoOrGitRemoteURL(projectName, noGit, yes, dev, verbose) {
|
|
17
|
+
if (noGit || dev) {
|
|
18
18
|
return undefined;
|
|
19
19
|
}
|
|
20
20
|
// Hard-code certain project names as never causing a Git repository to be initialized.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/init/git.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,4EAA2C;AAC3C,wDAAwB;AACxB,wDAAwB;AACxB,+CAA+C;AAC/C,qCAAuC;AACvC,yDAAmC;AAEnC,yCAA6D;AAC7D,uCAAiD;AAEjD,MAAM,0BAA0B,GAAG,CAAC,CAAC;AACrC,MAAM,0BAA0B,GAAG,EAAE,CAAC;AAE/B,KAAK,UAAU,8BAA8B,CAClD,WAAmB,EACnB,KAAc,EACd,GAAY,EACZ,OAAgB;IAEhB,IAAI,KAAK,EAAE;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/init/git.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,10 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
|
|
|
6
6
|
const command_exists_1 = tslib_1.__importDefault(require("command-exists"));
|
|
7
7
|
const path_1 = tslib_1.__importDefault(require("path"));
|
|
8
8
|
const constants_1 = require("../../constants");
|
|
9
|
+
const exec_1 = require("../../exec");
|
|
10
|
+
const file = tslib_1.__importStar(require("../../file"));
|
|
9
11
|
const packageManager_1 = require("../../packageManager");
|
|
12
|
+
const utils_1 = require("../../utils");
|
|
10
13
|
const checkIfProjectPathExists_1 = require("./checkIfProjectPathExists");
|
|
11
14
|
const checkModSubdirectory_1 = require("./checkModSubdirectory");
|
|
12
15
|
const checkModTargetDirectory_1 = require("./checkModTargetDirectory");
|
|
@@ -26,7 +29,7 @@ async function init(args) {
|
|
|
26
29
|
const vscode = args.vscode === true;
|
|
27
30
|
const yes = args.yes === true;
|
|
28
31
|
const forceName = args.forceName === true;
|
|
29
|
-
|
|
32
|
+
const dev = args.dev === true;
|
|
30
33
|
// Prompt the end-user for some information (and validate it as we go).
|
|
31
34
|
const [projectPath, createNewDir] = await (0, getProjectPath_1.getProjectPath)(args, useCurrentDir, yes, forceName);
|
|
32
35
|
await (0, checkIfProjectPathExists_1.checkIfProjectPathExists)(projectPath, yes, verbose);
|
|
@@ -35,13 +38,32 @@ async function init(args) {
|
|
|
35
38
|
const projectName = path_1.default.basename(projectPath);
|
|
36
39
|
await (0, checkModTargetDirectory_1.checkModTargetDirectory)(modsDirectory, projectName, yes, verbose);
|
|
37
40
|
const saveSlot = await (0, promptSaveSlot_1.promptSaveSlot)(args, yes);
|
|
38
|
-
const gitRemoteURL = await (0, git_1.promptGitHubRepoOrGitRemoteURL)(projectName, noGit, yes, verbose);
|
|
41
|
+
const gitRemoteURL = await (0, git_1.promptGitHubRepoOrGitRemoteURL)(projectName, noGit, yes, dev, verbose);
|
|
39
42
|
// Now that we have asked the user all of the questions we need, we can create the project.
|
|
40
43
|
(0, createMod_1.createMod)(projectName, projectPath, createNewDir, modsDirectory, saveSlot, gitRemoteURL, skipInstall, packageManager, verbose);
|
|
44
|
+
// Now that the project is created, we can perform the steps to link to a development version of
|
|
45
|
+
// "isaacscript-common", if necessary.
|
|
46
|
+
if (dev) {
|
|
47
|
+
linkDevelopmentIsaacScriptCommon(projectPath, verbose);
|
|
48
|
+
}
|
|
41
49
|
await openVSCode(projectPath, vscode, yes, verbose);
|
|
42
50
|
printFinishMessage(projectPath, projectName);
|
|
43
51
|
}
|
|
44
52
|
exports.init = init;
|
|
53
|
+
function linkDevelopmentIsaacScriptCommon(projectPath, verbose) {
|
|
54
|
+
const parentDirectory = path_1.default.join(projectPath, "..");
|
|
55
|
+
const isaacScriptMonorepoDirectory = path_1.default.join(parentDirectory, "isaacscript");
|
|
56
|
+
if (!file.exists(isaacScriptMonorepoDirectory, verbose) ||
|
|
57
|
+
!file.isDir(isaacScriptMonorepoDirectory, verbose)) {
|
|
58
|
+
console.error(`Failed to find the IsaacScript repository at: ${isaacScriptMonorepoDirectory}`);
|
|
59
|
+
(0, utils_1.error)("In order to link a development version of IsaacScript common, you must place the repositories side by side.");
|
|
60
|
+
}
|
|
61
|
+
// Build "isaacscript-common" and set up the link.
|
|
62
|
+
const linkScript = path_1.default.join(isaacScriptMonorepoDirectory, "link-isaacscript-common.sh");
|
|
63
|
+
(0, exec_1.execShell)("bash", [linkScript], verbose);
|
|
64
|
+
// Link this repository to the development version of "isaacscript-common".
|
|
65
|
+
(0, exec_1.execShell)("yarn", ["link", "isaacscript-common"], verbose);
|
|
66
|
+
}
|
|
45
67
|
async function openVSCode(projectPath, vscode, yes, verbose) {
|
|
46
68
|
const VSCodeCommand = getVSCodeCommand();
|
|
47
69
|
if (VSCodeCommand === null) {
|
|
@@ -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,wDAAwB;AACxB,+CAAoD;AACpD,yDAA0E;AAE1E,yEAAsE;AACtE,iEAA8D;AAC9D,uEAAoE;AACpE,2CAAwC;AACxC,6CAA0C;AAC1C,qDAAkD;AAClD,+BAAuD;AACvD,uEAAoE;AACpE,qDAAkD;AAClD,iDAA8C;AAEvC,KAAK,UAAU,IAAI,CAAC,IAAU;IACnC,MAAM,cAAc,GAAG,IAAA,mDAAkC,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,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/init/init.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,4EAA2C;AAC3C,wDAAwB;AACxB,+CAAoD;AACpD,qCAAuC;AACvC,yDAAmC;AACnC,yDAA0E;AAE1E,uCAAoC;AACpC,yEAAsE;AACtE,iEAA8D;AAC9D,uEAAoE;AACpE,2CAAwC;AACxC,6CAA0C;AAC1C,qDAAkD;AAClD,+BAAuD;AACvD,uEAAoE;AACpE,qDAAkD;AAClD,iDAA8C;AAEvC,KAAK,UAAU,IAAI,CAAC,IAAU;IACnC,MAAM,cAAc,GAAG,IAAA,mDAAkC,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,+BAAc,EACtD,IAAI,EACJ,aAAa,EACb,GAAG,EACH,SAAS,CACV,CAAC;IACF,MAAM,IAAA,mDAAwB,EAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC1D,MAAM,aAAa,GAAG,MAAM,IAAA,uBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACtD,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,GAAG,EAAE,OAAO,CAAC,CAAC;IACxE,MAAM,QAAQ,GAAG,MAAM,IAAA,+BAAc,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,IAAA,oCAA8B,EACvD,WAAW,EACX,KAAK,EACL,GAAG,EACH,GAAG,EACH,OAAO,CACR,CAAC;IAEF,2FAA2F;IAC3F,IAAA,qBAAS,EACP,WAAW,EACX,WAAW,EACX,YAAY,EACZ,aAAa,EACb,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,cAAc,EACd,OAAO,CACR,CAAC;IAEF,gGAAgG;IAChG,sCAAsC;IACtC,IAAI,GAAG,EAAE;QACP,gCAAgC,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KACxD;IAED,MAAM,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACpD,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC/C,CAAC;AArDD,oBAqDC;AAED,SAAS,gCAAgC,CACvC,WAAmB,EACnB,OAAgB;IAEhB,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACrD,MAAM,4BAA4B,GAAG,cAAI,CAAC,IAAI,CAC5C,eAAe,EACf,aAAa,CACd,CAAC;IACF,IACE,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC;QACnD,CAAC,IAAI,CAAC,KAAK,CAAC,4BAA4B,EAAE,OAAO,CAAC,EAClD;QACA,OAAO,CAAC,KAAK,CACX,iDAAiD,4BAA4B,EAAE,CAChF,CAAC;QACF,IAAA,aAAK,EACH,6GAA6G,CAC9G,CAAC;KACH;IAED,kDAAkD;IAClD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAC1B,4BAA4B,EAC5B,4BAA4B,CAC7B,CAAC;IACF,IAAA,gBAAS,EAAC,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IAEzC,2EAA2E;IAC3E,IAAA,gBAAS,EAAC,MAAM,EAAE,CAAC,MAAM,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,WAAmB,EACnB,MAAe,EACf,GAAY,EACZ,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,GAAG,EAAE,OAAO,CAAC,CAAC;AACvE,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"}
|
package/src/exec.js
CHANGED
|
@@ -47,7 +47,15 @@ function execPowershell(command, verbose = false, cwd = constants_1.CWD) {
|
|
|
47
47
|
return stdout;
|
|
48
48
|
}
|
|
49
49
|
exports.execPowershell = execPowershell;
|
|
50
|
-
/**
|
|
50
|
+
/**
|
|
51
|
+
* Returns a tuple of exit status and stdout. The stdout is trimmed for convenience.
|
|
52
|
+
*
|
|
53
|
+
* @param command The command to run.
|
|
54
|
+
* @param args Default is [].
|
|
55
|
+
* @param verbose Default is false.
|
|
56
|
+
* @param allowFailure Default is false.
|
|
57
|
+
* @param cwd Default is CWD.
|
|
58
|
+
*/
|
|
51
59
|
function execShell(command, args = [], verbose = false, allowFailure = false, cwd = constants_1.CWD) {
|
|
52
60
|
// On Windows, "spawnSync()" will not account for spaces in arguments. Thus, wrap everything in a
|
|
53
61
|
// double quote. This will cause arguments that naturally have double quotes to fail.
|
package/src/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/exec.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iDAKuB;AACvB,2CAAkC;AAClC,mCAAgC;AAEhC,SAAgB,OAAO,CACrB,IAAY,EACZ,IAAc,EACd,OAAgB,EAChB,GAAG,GAAG,eAAG;IAET,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;KAC1C;IAED,IAAI,MAAc,CAAC;IACnB,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,4BAAY,EAAC,IAAI,EAAE,IAAI,EAAE;YACtC,GAAG;SACJ,CAAC,CAAC;QACH,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;KACnC;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,aAAK,EAAC,kBAAkB,eAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KACrD;IAED,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC;KACzC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAzBD,0BAyBC;AAED,SAAgB,cAAc,CAC5B,OAAe,EACf,OAAO,GAAG,KAAK,EACf,GAAG,GAAG,eAAG;IAET,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,OAAO,EAAE,CAAC,CAAC;KACzD;IAED,IAAI,MAAc,CAAC;IACnB,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,OAAO,EAAE;YAC/B,KAAK,EAAE,gBAAgB;YACvB,GAAG;SACJ,CAAC,CAAC;QACH,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;KACnC;IAAC,OAAO,GAAG,EAAE;QACZ,IAAA,aAAK,EAAC,qCAAqC,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;KAC3E;IAED,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,gCAAgC,OAAO,EAAE,CAAC,CAAC;KACxD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAzBD,wCAyBC;AAED
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/exec.ts"],"names":[],"mappings":"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"}
|
package/src/packageManager.js
CHANGED
|
@@ -85,6 +85,14 @@ function getPackageManagerUsedForExistingProject(args, verbose) {
|
|
|
85
85
|
}
|
|
86
86
|
exports.getPackageManagerUsedForExistingProject = getPackageManagerUsedForExistingProject;
|
|
87
87
|
function getPackageManagerFromArgs(args) {
|
|
88
|
+
const dev = args.dev === true;
|
|
89
|
+
if (dev) {
|
|
90
|
+
const yarnExists = command_exists_1.default.sync("yarn");
|
|
91
|
+
if (!yarnExists) {
|
|
92
|
+
(0, utils_1.error)('You specified the "dev" flag, but "yarn" does not seem to be a valid command. The IsaacScript monorepo uses yarn, so in order to initiate a linked development mod, you must also have yarn installed. Try running "corepack enable" to install it.');
|
|
93
|
+
}
|
|
94
|
+
return PackageManager_1.PackageManager.YARN;
|
|
95
|
+
}
|
|
88
96
|
const npm = args.npm === true;
|
|
89
97
|
if (npm) {
|
|
90
98
|
const npmExists = command_exists_1.default.sync("npm");
|
|
@@ -95,7 +103,7 @@ function getPackageManagerFromArgs(args) {
|
|
|
95
103
|
}
|
|
96
104
|
const yarn = args.yarn === true;
|
|
97
105
|
if (yarn) {
|
|
98
|
-
const yarnExists = command_exists_1.default.sync("
|
|
106
|
+
const yarnExists = command_exists_1.default.sync("yarn");
|
|
99
107
|
if (!yarnExists) {
|
|
100
108
|
(0, utils_1.error)('You specified the "yarn" flag, but "yarn" does not seem to be a valid command.');
|
|
101
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/packageManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../../../packages/isaacscript-cli/src/packageManager.ts"],"names":[],"mappings":"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"}
|