Skip to content

Commit 945fb99

Browse files
committed
Use Node-native TypeScript evaluation in build and test scripts
1 parent 2347256 commit 945fb99

17 files changed

Lines changed: 57 additions & 71 deletions

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
/dist/*.js text eol=lf -diff -merge
1+
/dist/*.cjs text eol=lf -diff -merge

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
node_modules/
2-
/test/

action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ inputs:
2323
default: ${{ github.token }}
2424
runs:
2525
using: node24
26-
main: dist/main.js
27-
post: dist/post.js
26+
main: dist/main.cjs
27+
post: dist/post.cjs

build.mjs renamed to build.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ await esbuild.build({
1414
target: ['node24.0'],
1515
format: 'cjs',
1616
outdir: 'dist',
17+
outExtension: { '.js': '.cjs' },
1718
});

dist/main.js renamed to dist/main.cjs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32258,8 +32258,8 @@ var require_lib3 = __commonJS({
3225832258
});
3225932259

3226032260
// src/main.ts
32261-
var import_promises5 = __toESM(require("node:fs/promises"));
32262-
var import_node_path5 = __toESM(require("node:path"));
32261+
var import_promises5 = __toESM(require("node:fs/promises"), 1);
32262+
var import_node_path5 = __toESM(require("node:path"), 1);
3226332263

3226432264
// node_modules/@actions/core/lib/command.js
3226532265
var os = __toESM(require("os"), 1);
@@ -38638,14 +38638,14 @@ function _getGlobal(key, defaultValue) {
3863838638
}
3863938639

3864038640
// src/config.ts
38641-
var import_promises2 = __toESM(require("node:fs/promises"));
38642-
var import_node_path2 = __toESM(require("node:path"));
38641+
var import_promises2 = __toESM(require("node:fs/promises"), 1);
38642+
var import_node_path2 = __toESM(require("node:path"), 1);
3864338643

3864438644
// src/temporary.ts
38645-
var import_node_crypto = __toESM(require("node:crypto"));
38646-
var import_promises = __toESM(require("node:fs/promises"));
38645+
var import_node_crypto = __toESM(require("node:crypto"), 1);
38646+
var import_promises = __toESM(require("node:fs/promises"), 1);
3864738647
var import_node_os = require("node:os");
38648-
var import_node_path = __toESM(require("node:path"));
38648+
var import_node_path = __toESM(require("node:path"), 1);
3864938649
function temporaryFileName(dirOrPattern, pattern) {
3865038650
const dir = pattern === void 0 || !dirOrPattern ? (0, import_node_os.tmpdir)() : dirOrPattern;
3865138651
const [prefix, suffix] = splitPattern(pattern ?? (dirOrPattern || ""));
@@ -38743,9 +38743,9 @@ var serveLogFilePathKey = "zbServeLogFile";
3874338743
var versionKey = "zbVersion";
3874438744

3874538745
// src/exec.ts
38746-
var import_node_child_process = __toESM(require("node:child_process"));
38747-
var import_promises3 = __toESM(require("node:fs/promises"));
38748-
var import_node_path3 = __toESM(require("node:path"));
38746+
var import_node_child_process = __toESM(require("node:child_process"), 1);
38747+
var import_promises3 = __toESM(require("node:fs/promises"), 1);
38748+
var import_node_path3 = __toESM(require("node:path"), 1);
3874938749
function exec2(command, args) {
3875038750
const subprocess = import_node_child_process.default.spawn(command, args, { stdio: "inherit" });
3875138751
return new Promise((resolve2, reject) => {
@@ -38794,8 +38794,8 @@ async function startDaemon(command, args, logPath) {
3879438794
}
3879538795

3879638796
// src/serve.ts
38797-
var import_promises4 = __toESM(require("node:fs/promises"));
38798-
var import_node_path4 = __toESM(require("node:path"));
38797+
var import_promises4 = __toESM(require("node:fs/promises"), 1);
38798+
var import_node_path4 = __toESM(require("node:path"), 1);
3879938799

3880038800
// node_modules/plist/dist/parse.js
3880138801
var import_xmldom = __toESM(require_lib2(), 1);

dist/post.js renamed to dist/post.cjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20822,9 +20822,9 @@ var require_semver2 = __commonJS({
2082220822
});
2082320823

2082420824
// src/post.ts
20825-
var import_promises2 = __toESM(require("node:fs/promises"));
20826-
var import_node_process = __toESM(require("node:process"));
20827-
var import_promises3 = __toESM(require("node:stream/promises"));
20825+
var import_promises2 = __toESM(require("node:fs/promises"), 1);
20826+
var import_node_process = __toESM(require("node:process"), 1);
20827+
var import_promises3 = __toESM(require("node:stream/promises"), 1);
2082820828

2082920829
// node_modules/@actions/core/lib/command.js
2083020830
var os = __toESM(require("os"), 1);
@@ -21265,7 +21265,7 @@ function getState(name) {
2126521265
}
2126621266

2126721267
// src/post.ts
21268-
var import_semver = __toESM(require_semver2());
21268+
var import_semver = __toESM(require_semver2(), 1);
2126921269

2127021270
// src/exec.ts
2127121271
function waitForProcessToExit(pid, abortSignal) {
@@ -21298,7 +21298,7 @@ var serveLogFilePathKey = "zbServeLogFile";
2129821298
var versionKey = "zbVersion";
2129921299

2130021300
// src/tail.ts
21301-
var import_promises = __toESM(require("node:fs/promises"));
21301+
var import_promises = __toESM(require("node:fs/promises"), 1);
2130221302
var import_node_stream = require("node:stream");
2130321303
function tail(filename, signal) {
2130421304
return new TailReadable(filename, { signal });

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"setup"
1111
],
1212
"private": true,
13-
"type": "commonjs",
14-
"main": "dist/main.js",
13+
"type": "module",
14+
"main": "dist/main.cjs",
1515
"scripts": {
16-
"build": "node build.mjs",
16+
"build": "node build.ts",
1717
"typecheck": "tsc",
18-
"test": "node test.mjs"
18+
"test": "node test.ts"
1919
},
2020
"engines": {
2121
"node": ">=24.0.0"

src/config.test.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import fs from 'node:fs/promises';
33
import path from 'node:path';
44
import { before, describe, it } from 'node:test';
55

6-
import { createConfigurationFiles, joinPathList } from './config';
7-
import type { ConfigurationInputs } from './config';
6+
import { createConfigurationFiles, joinPathList, type ConfigurationInputs } from './config.ts';
87

98
describe('createConfigurationFiles', () => {
109
const emptyInputs: Readonly<ConfigurationInputs> = {

src/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import path from 'node:path';
33

44
import * as core from '@actions/core';
55

6-
import { mkdirTemp } from './temporary';
6+
import { mkdirTemp } from './temporary.ts';
77

88
interface ZBConfiguration {
99
server?: ZBServerConfiguration;

src/exec.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import fs from 'node:fs/promises';
66
import process from 'node:process';
77
import { describe, it } from 'node:test';
88

9-
import { exec, startDaemon, waitForProcessToExit } from './exec';
10-
import { temporaryFileName } from './temporary';
9+
import { exec, startDaemon, waitForProcessToExit } from './exec.ts';
10+
import { temporaryFileName } from './temporary.ts';
1111

1212
const trueCommand = process.platform === 'win32'
1313
? {command: 'powershell.exe', args: ['-Command', '']}

0 commit comments

Comments
 (0)