Skip to content

Commit b4dfc44

Browse files
authored
Update ts-node to 10.4.0 (#2123)
1 parent 85da1a5 commit b4dfc44

File tree

11 files changed

+334
-141
lines changed

11 files changed

+334
-141
lines changed

.github/workflows/test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
run: npm test
4343
- name: Build distribution files
4444
run: npm run build
45+
- name: Update entry file
46+
run: npm run prepare-ci
4547
- name: Test distribution
4648
run: npm test
4749
- name: Test browser build
@@ -63,6 +65,8 @@ jobs:
6365
run: npm test
6466
- name: Build distribution files
6567
run: npm run build
68+
- name: Update entry file
69+
run: npm run prepare-ci
6670
- name: Test distribution
6771
run: npm test
6872
- name: Test browser build
@@ -84,6 +88,8 @@ jobs:
8488
run: npm test
8589
- name: Build distribution files
8690
run: npm run build
91+
- name: Update entry file
92+
run: npm run prepare-ci
8793
- name: Test distribution
8894
run: npm test
8995
- name: Test browser build

cli/asc.js

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ if (process.removeAllListeners) {
8080

8181
// Use distribution files if present, otherwise run the sources directly.
8282
function loadAssemblyScriptJS() {
83-
var exports;
83+
var exports, tsNode;
8484
try {
8585
// note that this case will always trigger in recent node.js versions for typical installs
8686
// see: https://nodejs.org/api/packages.html#packages_self_referencing_a_package_using_its_name
@@ -90,18 +90,33 @@ function loadAssemblyScriptJS() {
9090
exports = dynrequire("../dist/assemblyscript.js");
9191
} catch (e) {
9292
try { // `asc` on the command line without dist files (unnecessary in recent node)
93-
dynrequire("ts-node").register({
93+
tsNode = dynrequire("ts-node");
94+
tsNode.register({
9495
project: path.join(__dirname, "..", "src", "tsconfig.json"),
96+
typeCheck: false,
97+
transpileOnly: true,
98+
compilerHost: true,
99+
files: true,
95100
skipIgnore: true,
96-
compilerOptions: { target: "ES2016" }
101+
moduleTypes: {
102+
"../src/glue/js/*": "cjs"
103+
},
104+
compilerOptions: {
105+
module: "esnext",
106+
target: "es2017"
107+
}
97108
});
98109
dynrequire("../src/glue/js");
99110
exports = dynrequire("../src");
100111
} catch (e_ts) {
101-
try { // `require("dist/asc.js")` in explicit browser tests
102-
exports = dynrequire("./assemblyscript");
103-
} catch (e) {
104-
throw Error(`${e_ts.stack}\n---\n${e.stack}`);
112+
if (!tsNode || !(e_ts instanceof tsNode.TSError)) {
113+
try { // `require("dist/asc.js")` in explicit browser tests
114+
exports = dynrequire("./assemblyscript");
115+
} catch (e) {
116+
throw Error(`${e_ts.stack}\n---\n${e.stack}`);
117+
}
118+
} else {
119+
throw e_ts;
105120
}
106121
}
107122
}

index.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
try { require("source-map-support").install(); } catch (e) { /* nop */ }
21
require("ts-node").register({
32
project: require("path").join(__dirname, "src", "tsconfig.json"),
4-
skipIgnore: true
3+
compilerHost: true,
4+
skipIgnore: true,
5+
files: true,
6+
compilerOptions: {
7+
removeComments: false
8+
}
59
});
610
require("./src/glue/js");
711
module.exports = require("./src");

0 commit comments

Comments
 (0)