isaacscript 3.6.31 → 3.6.33
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/static/_gitattributes +1 -2
- package/file-templates/static/nuke.sh +8 -8
- package/file-templates/static/update.sh +4 -4
- package/file-templates/static-mod/build.sh +1 -1
- package/file-templates/static-mod/lint.sh +1 -1
- package/file-templates/static-mod/publish.sh +1 -1
- package/file-templates/static-mod/run.sh +1 -1
- package/file-templates/static-ts/.vscode/extensions.json +1 -1
- package/file-templates/static-ts/build.sh +7 -7
- package/file-templates/static-ts/lint.sh +1 -1
- package/file-templates/static-ts/publish.sh +1 -1
- package/file-templates/static-ts/run.sh +7 -7
- package/package.json +3 -3
- package/src/commands/check/check.js +2 -2
- package/src/commands/check/check.js.map +1 -1
|
@@ -16,6 +16,5 @@ pull.rebase=true
|
|
|
16
16
|
|
|
17
17
|
# Specify the file type for some files that GitHub will not automatically characterize properly.
|
|
18
18
|
# https://github.com/github/linguist/blob/master/lib/linguist/languages.yml
|
|
19
|
-
.vscode
|
|
20
|
-
.vscode/settings.json linguist-language=JSON-with-Comments
|
|
19
|
+
.vscode/*.json linguist-language=JSON-with-Comments
|
|
21
20
|
tsconfig*.json linguist-language=JSON-with-Comments
|
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
#!/bin/bash
|
|
2
2
|
|
|
3
|
-
set -
|
|
3
|
+
set -euo pipefail # Exit on errors and undefined variables.
|
|
4
4
|
|
|
5
5
|
# Get the directory of this script:
|
|
6
6
|
# https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
|
|
7
7
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
|
8
8
|
|
|
9
9
|
NPM_LOCK="$DIR/package-lock.json"
|
|
10
|
-
if
|
|
10
|
+
if [[ -f "$NPM_LOCK" ]]; then
|
|
11
11
|
NPM_LOCK_EXISTS=1
|
|
12
12
|
rm -f "$NPM_LOCK"
|
|
13
13
|
echo "Successfully deleted: $NPM_LOCK"
|
|
14
14
|
fi
|
|
15
15
|
|
|
16
16
|
YARN_LOCK="$DIR/yarn.lock"
|
|
17
|
-
if
|
|
17
|
+
if [[ -f "$YARN_LOCK" ]]; then
|
|
18
18
|
YARN_LOCK_EXISTS=1
|
|
19
19
|
rm -f "$YARN_LOCK"
|
|
20
20
|
echo "Successfully deleted: $YARN_LOCK"
|
|
21
21
|
fi
|
|
22
22
|
|
|
23
23
|
PNPM_LOCK="$DIR/pnpm-lock.yaml"
|
|
24
|
-
if
|
|
24
|
+
if [[ -f "$PNPM_LOCK" ]]; then
|
|
25
25
|
PNPM_LOCK_EXISTS=1
|
|
26
26
|
rm -f "$PNPM_LOCK"
|
|
27
27
|
echo "Successfully deleted: $PNPM_LOCK"
|
|
28
28
|
fi
|
|
29
29
|
|
|
30
30
|
NODE_MODULES="$DIR/node_modules"
|
|
31
|
-
if
|
|
31
|
+
if [[ -d "$NODE_MODULES" ]]; then
|
|
32
32
|
rm -rf "$NODE_MODULES"
|
|
33
33
|
echo "Successfully deleted: $NODE_MODULES"
|
|
34
34
|
fi
|
|
@@ -36,11 +36,11 @@ fi
|
|
|
36
36
|
if [[ -z "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" && -z "$PNPM_LOCK_EXISTS" ]]; then
|
|
37
37
|
echo "No package manager lock files were found. You should manually invoke the package manager that you want to use for this project. e.g. \"npm install\""
|
|
38
38
|
exit 1
|
|
39
|
-
elif [[
|
|
39
|
+
elif [[ -n "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" && -z "$PNPM_LOCK_EXISTS" ]]; then
|
|
40
40
|
npm install
|
|
41
|
-
elif [[ -z "$NPM_LOCK_EXISTS" &&
|
|
41
|
+
elif [[ -z "$NPM_LOCK_EXISTS" && -n "$YARN_LOCK_EXISTS" && -z "$PNPM_LOCK_EXISTS" ]]; then
|
|
42
42
|
yarn install
|
|
43
|
-
elif [[ -z "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" &&
|
|
43
|
+
elif [[ -z "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" && -n "$PNPM_LOCK_EXISTS" ]]; then
|
|
44
44
|
pnpm install
|
|
45
45
|
else
|
|
46
46
|
echo "Error: Multiple different kinds of package manager lock files were found. You should delete the ones that you are not using so that this program can correctly detect your package manager."
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/bin/bash
|
|
2
2
|
|
|
3
|
-
set -
|
|
3
|
+
set -euo pipefail # Exit on errors and undefined variables.
|
|
4
4
|
|
|
5
5
|
# Get the directory of this script:
|
|
6
6
|
# https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
|
|
@@ -12,10 +12,10 @@ PACKAGE_JSON="$DIR/package.json"
|
|
|
12
12
|
OLD_HASH=$(md5sum "$PACKAGE_JSON")
|
|
13
13
|
npx npm-check-updates --upgrade --packageFile "$PACKAGE_JSON" --filterVersion "^*"
|
|
14
14
|
NEW_HASH=$(md5sum "$PACKAGE_JSON")
|
|
15
|
-
if [[ $OLD_HASH != $NEW_HASH ]]; then
|
|
16
|
-
if
|
|
15
|
+
if [[ "$OLD_HASH" != "$NEW_HASH" ]]; then
|
|
16
|
+
if [[ -f "$DIR/yarn.lock" ]]; then
|
|
17
17
|
yarn install
|
|
18
|
-
elif
|
|
18
|
+
elif [[ -f "$DIR/pnpm-lock.yaml" ]]; then
|
|
19
19
|
pnpm install
|
|
20
20
|
else
|
|
21
21
|
npm install
|
|
@@ -4,6 +4,6 @@
|
|
|
4
4
|
"recommendations": [
|
|
5
5
|
"esbenp.prettier-vscode", // The TypeScript formatter
|
|
6
6
|
"dbaeumer.vscode-eslint", // The TypeScript linter
|
|
7
|
-
"streetsidesoftware.code-spell-checker", // A spell-checker extension based on
|
|
7
|
+
"streetsidesoftware.code-spell-checker", // A spell-checker extension based on CSpell
|
|
8
8
|
],
|
|
9
9
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/bin/bash
|
|
2
2
|
|
|
3
|
-
set -
|
|
3
|
+
set -euo pipefail # Exit on errors and undefined variables.
|
|
4
4
|
|
|
5
5
|
# Get the directory of this script:
|
|
6
6
|
# https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
|
|
@@ -9,28 +9,28 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
|
|
9
9
|
SECONDS=0
|
|
10
10
|
|
|
11
11
|
NPM_LOCK="$DIR/package-lock.json"
|
|
12
|
-
if
|
|
12
|
+
if [[ -f "$NPM_LOCK" ]]; then
|
|
13
13
|
NPM_LOCK_EXISTS=1
|
|
14
14
|
fi
|
|
15
15
|
|
|
16
16
|
YARN_LOCK="$DIR/yarn.lock"
|
|
17
|
-
if
|
|
17
|
+
if [[ -f "$YARN_LOCK" ]]; then
|
|
18
18
|
YARN_LOCK_EXISTS=1
|
|
19
19
|
fi
|
|
20
20
|
|
|
21
21
|
PNPM_LOCK="$DIR/pnpm-lock.yaml"
|
|
22
|
-
if
|
|
22
|
+
if [[ -f "$PNPM_LOCK" ]]; then
|
|
23
23
|
PNPM_LOCK_EXISTS=1
|
|
24
24
|
fi
|
|
25
25
|
|
|
26
26
|
if [[ -z "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" && -z "$PNPM_LOCK_EXISTS" ]]; then
|
|
27
27
|
echo "No package manager lock files were found. You should manually invoke the package manager that you want to use for this project. e.g. \"npm install\""
|
|
28
28
|
exit 1
|
|
29
|
-
elif [[
|
|
29
|
+
elif [[ -n "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" && -z "$PNPM_LOCK_EXISTS" ]]; then
|
|
30
30
|
PACKAGE_MANAGER="npm"
|
|
31
|
-
elif [[ -z "$NPM_LOCK_EXISTS" &&
|
|
31
|
+
elif [[ -z "$NPM_LOCK_EXISTS" && -n "$YARN_LOCK_EXISTS" && -z "$PNPM_LOCK_EXISTS" ]]; then
|
|
32
32
|
PACKAGE_MANAGER="yarn"
|
|
33
|
-
elif [[ -z "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" &&
|
|
33
|
+
elif [[ -z "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" && -n "$PNPM_LOCK_EXISTS" ]]; then
|
|
34
34
|
PACKAGE_MANAGER="pnpm"
|
|
35
35
|
else
|
|
36
36
|
echo "Error: Multiple different kinds of package manager lock files were found. You should delete the ones that you are not using so that this program can correctly detect your package manager."
|
|
@@ -1,34 +1,34 @@
|
|
|
1
1
|
#!/bin/bash
|
|
2
2
|
|
|
3
|
-
set -
|
|
3
|
+
set -euo pipefail # Exit on errors and undefined variables.
|
|
4
4
|
|
|
5
5
|
# Get the directory of this script:
|
|
6
6
|
# https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
|
|
7
7
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
|
8
8
|
|
|
9
9
|
NPM_LOCK="$DIR/package-lock.json"
|
|
10
|
-
if
|
|
10
|
+
if [[ -f "$NPM_LOCK" ]]; then
|
|
11
11
|
NPM_LOCK_EXISTS=1
|
|
12
12
|
fi
|
|
13
13
|
|
|
14
14
|
YARN_LOCK="$DIR/yarn.lock"
|
|
15
|
-
if
|
|
15
|
+
if [[ -f "$YARN_LOCK" ]]; then
|
|
16
16
|
YARN_LOCK_EXISTS=1
|
|
17
17
|
fi
|
|
18
18
|
|
|
19
19
|
PNPM_LOCK="$DIR/pnpm-lock.yaml"
|
|
20
|
-
if
|
|
20
|
+
if [[ -f "$PNPM_LOCK" ]]; then
|
|
21
21
|
PNPM_LOCK_EXISTS=1
|
|
22
22
|
fi
|
|
23
23
|
|
|
24
24
|
if [[ -z "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" && -z "$PNPM_LOCK_EXISTS" ]]; then
|
|
25
25
|
echo "No package manager lock files were found. You should manually invoke the package manager that you want to use for this project. e.g. \"npm install\""
|
|
26
26
|
exit 1
|
|
27
|
-
elif [[
|
|
27
|
+
elif [[ -n "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" && -z "$PNPM_LOCK_EXISTS" ]]; then
|
|
28
28
|
PACKAGE_MANAGER="npm"
|
|
29
|
-
elif [[ -z "$NPM_LOCK_EXISTS" &&
|
|
29
|
+
elif [[ -z "$NPM_LOCK_EXISTS" && -n "$YARN_LOCK_EXISTS" && -z "$PNPM_LOCK_EXISTS" ]]; then
|
|
30
30
|
PACKAGE_MANAGER="yarn"
|
|
31
|
-
elif [[ -z "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" &&
|
|
31
|
+
elif [[ -z "$NPM_LOCK_EXISTS" && -z "$YARN_LOCK_EXISTS" && -n "$PNPM_LOCK_EXISTS" ]]; then
|
|
32
32
|
PACKAGE_MANAGER="pnpm"
|
|
33
33
|
else
|
|
34
34
|
echo "Error: Multiple different kinds of package manager lock files were found. You should delete the ones that you are not using so that this program can correctly detect your package manager."
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "isaacscript",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.33",
|
|
4
4
|
"description": "A command line tool for managing Isaac mods written in TypeScript.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"isaac",
|
|
@@ -41,10 +41,10 @@
|
|
|
41
41
|
"source-map-support": "^0.5.21",
|
|
42
42
|
"sync-directory": "^5.1.9",
|
|
43
43
|
"tslib": "^2.5.0",
|
|
44
|
-
"typescript-to-lua": "^1.
|
|
44
|
+
"typescript-to-lua": "^1.13.1",
|
|
45
45
|
"xml2js": "^0.4.23",
|
|
46
46
|
"yaml": "^2.2.1",
|
|
47
|
-
"yargs": "^17.
|
|
47
|
+
"yargs": "^17.7.0"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
50
|
"typescript": ">= 4.0.0"
|
|
@@ -106,8 +106,8 @@ function compareTextFiles(projectFilePath, templateFilePath, verbose) {
|
|
|
106
106
|
console.log(`The contents of the following file do not match: ${chalk_1.default.red(projectFilePath)}`);
|
|
107
107
|
printTemplateLocation(templateFilePath);
|
|
108
108
|
if (verbose) {
|
|
109
|
-
const originalTemplateFile = (0, file_js_1.readFile)(
|
|
110
|
-
const originalProjectFile = (0, file_js_1.readFile)(
|
|
109
|
+
const originalTemplateFile = (0, file_js_1.readFile)(templateFilePath, verbose);
|
|
110
|
+
const originalProjectFile = (0, file_js_1.readFile)(projectFilePath, verbose);
|
|
111
111
|
console.log("--- Original template file: ---\n");
|
|
112
112
|
console.log(originalTemplateFile);
|
|
113
113
|
console.log();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/check/check.ts"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAC1B,iEAA6D;AAC7D,kEAAiC;AACjC,kEAA6B;AAC7B,qDAO4B;AAC5B,qEAA+D;AAC/D,2CAA0C;AAC1C,2CAMuB;AACvB,+DAA4E;AAG5E,MAAM,UAAU,GACd,wGAAwG,CAAC;AAE3G,MAAM,0BAA0B,GAAG,+BAA+B,CAAC;AACnE,MAAM,wBAAwB,GAAG,6BAA6B,CAAC;AAC/D,MAAM,uBAAuB,GAAG,4BAA4B,CAAC;AAE7D,MAAM,uBAAuB,GAAG;IAC9B,sBAAsB;IACtB,iCAAiC;IACjC,gCAAgC;IAChC,GAAG,IAAA,qCAAa,EAAC,kCAAc,CAAC;IAChC,GAAG,IAAA,qDAAiC,GAAE;CAC9B,CAAC;AAEX,SAAgB,KAAK,CAAC,IAAU,EAAE,UAAmB;IACnD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;IACjC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC;IAEtC,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC;IAEpD,kGAAkG;IAClG,IACE,sBAAsB,CAAC,mCAAoB,EAAE,kBAAkB,EAAE,OAAO,CAAC,EACzE;QACA,eAAe,GAAG,IAAI,CAAC;KACxB;IAED,kGAAkG;IAClG,MAAM,eAAe,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAClD,MAAM,aAAa,GAAG,mBAAI,CAAC,IAAI,CAAC,4BAAa,EAAE,UAAU,eAAe,EAAE,CAAC,CAAC;IAC5E,IAAI,sBAAsB,CAAC,aAAa,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE;QACtE,eAAe,GAAG,IAAI,CAAC;KACxB;IAED,IAAI,oBAAoB,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE;QACrD,eAAe,GAAG,IAAI,CAAC;KACxB;IAED,IAAI,eAAe,EAAE;QACnB,IAAA,6BAAK,EAAC,2BAA2B,CAAC,CAAC;KACpC;AACH,CAAC;AA7BD,sBA6BC;AAED,SAAS,sBAAsB,CAC7B,iBAAyB,EACzB,kBAA+B,EAC/B,OAAgB;IAEhB,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,KAAK,MAAM,QAAQ,IAAI,IAAA,mBAAQ,EAAC,iBAAiB,CAAC,EAAE;QAClD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,IAAI,CAAC;QAEvC,IAAI,IAAA,eAAK,EAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE;YACpC,SAAS;SACV;QAED,MAAM,gBAAgB,GAAG,mBAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;QACzD,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAClC,SAAS;SACV;QAED,MAAM,wBAAwB,GAAG,mBAAI,CAAC,QAAQ,CAC5C,iBAAiB,EACjB,gBAAgB,CACjB,CAAC;QACF,MAAM,gBAAgB,GAAG,mBAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAEjE,IAAI,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,kBAAG,EAAE,wBAAwB,CAAC,CAAC;QAC/D,IAAI,gBAAgB,KAAK,eAAe,EAAE;YACxC,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;SACrE;aAAM,IAAI,gBAAgB,KAAK,cAAc,EAAE;YAC9C,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;SACnE;aAAM,IAAI,gBAAgB,KAAK,gBAAgB,EAAE;YAChD,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,EAAE,gBAAgB,CAAC,CAAC;SACtE;QAED,MAAM,eAAe,GAAG,mBAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QACvD,IAAI,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE;YAC3C,SAAS;SACV;QAED,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE;YACjE,eAAe,GAAG,IAAI,CAAC;SACxB;KACF;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,SAAS,oBAAoB,CAC3B,kBAA+B,EAC/B,OAAgB;IAEhB,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,qBAAM,CAAC,EAAE;QACnC,MAAM,gBAAgB,GAAG,mCAAoB,CAAC;QAC9C,MAAM,wBAAwB,GAAG,mBAAI,CAAC,QAAQ,CAC5C,oCAAqB,EACrB,gBAAgB,CACjB,CAAC;QACF,MAAM,eAAe,GAAG,mBAAI,CAAC,IAAI,CAAC,kBAAG,EAAE,wBAAwB,CAAC,CAAC;QACjE,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE;YACjE,eAAe,GAAG,IAAI,CAAC;SACxB;KACF;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAED,2FAA2F;AAC3F,SAAS,gBAAgB,CACvB,eAAuB,EACvB,gBAAwB,EACxB,OAAgB;IAEhB,IAAI,CAAC,IAAA,oBAAU,EAAC,eAAe,EAAE,OAAO,CAAC,EAAE;QACzC,OAAO,CAAC,GAAG,CAAC,sCAAsC,eAAe,EAAE,CAAC,CAAC;QACrE,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;QAExC,OAAO,KAAK,CAAC;KACd;IAED,MAAM,CAAC,mBAAmB,EAAE,WAAW,CAAC,GAAG,oBAAoB,CAC7D,eAAe,EACf,IAAI,GAAG,EAAE,EACT,OAAO,CACR,CAAC;IACF,MAAM,CAAC,oBAAoB,CAAC,GAAG,oBAAoB,CACjD,gBAAgB,EAChB,WAAW,EACX,OAAO,CACR,CAAC;IAEF,IAAI,oBAAoB,KAAK,mBAAmB,EAAE;QAChD,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CAAC,GAAG,CACT,oDAAoD,eAAK,CAAC,GAAG,CAC3D,eAAe,CAChB,EAAE,CACJ,CAAC;IACF,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IAExC,IAAI,OAAO,EAAE;QACX,MAAM,oBAAoB,GAAG,IAAA,kBAAQ,EAAC,
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../../../../../packages/isaacscript-cli/src/commands/check/check.ts"],"names":[],"mappings":"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"}
|