Skip to content

Commit ecfcae1

Browse files
committed
fix: migrate helper scripts to .cjs extension to work with ESM extension
1 parent d56c7f3 commit ecfcae1

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"--extensionDevelopmentPath=${workspaceFolder}"
1414
],
1515
"outFiles": [
16-
"${workspaceFolder}/out/**/*.js"
16+
"${workspaceFolder}/out/**/*.{cjs,js}"
1717
],
1818
"autoAttachChildProcesses": true,
1919
"preLaunchTask": "npm: esbuild"
@@ -27,7 +27,7 @@
2727
"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
2828
],
2929
"outFiles": [
30-
"${workspaceFolder}/out/test/**/*.js"
30+
"${workspaceFolder}/out/test/**/*.{cjs,js}"
3131
],
3232
"preLaunchTask": "${defaultBuildTask}"
3333
},

electron/listMochaTests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const { retrieveSourceMap } = require(
2424
path.resolve(process.cwd(), "node_modules", "source-map-support"),
2525
);
2626
const { getFileContent } = require(
27-
path.resolve(__dirname, "electron-build-tools-typescript"),
27+
path.resolve(__dirname, "electron-build-tools-typescript.cjs"),
2828
);
2929

3030
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -133,7 +133,7 @@ app
133133
);
134134

135135
const mocha: MochaType = new Mocha({
136-
ui: path.resolve(__dirname, "mocha-interface.js"),
136+
ui: path.resolve(__dirname, "mocha-interface.cjs"),
137137
});
138138

139139
// Use a socket to pass filenames rather than command line

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,12 +1069,12 @@
10691069
"esbuild": "run-p \"esbuild:* -- {1}\" -- --sourcemap",
10701070
"watch": "run-p \"esbuild:* -- {1} {2}\" -- --sourcemap --watch",
10711071
"esbuild:extension": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --external:original-fs --format=esm --platform=node --banner:js=\"import { createRequire as createRequireBanner } from 'node:module'; var require = createRequireBanner(import.meta.url);\"",
1072-
"esbuild:list-tests": "esbuild ./electron/listMochaTests.ts --bundle --outfile=out/electron/listMochaTests.js --external:electron --format=cjs --platform=node",
1073-
"esbuild:mocha-interface": "esbuild ./electron/mocha-interface.ts --bundle --outfile=out/electron/mocha-interface.js --format=cjs --platform=node",
1074-
"esbuild:mocha-reporter": "esbuild ./electron/mocha-reporter.ts --bundle --outfile=out/electron/mocha-reporter.js --format=cjs --platform=node",
1075-
"esbuild:ts-compiler": "esbuild ./electron/electron-build-tools-typescript.ts --bundle --outfile=out/electron/electron-build-tools-typescript.js --format=cjs --platform=node",
1076-
"esbuild:echo-to-socket": "esbuild ./scripts/echo-to-socket.ts --bundle --outfile=out/scripts/echo-to-socket.js --format=cjs --platform=node",
1077-
"esbuild:lm-tests": "esbuild ./lm-tests/*.ts --bundle --external:vscode --outdir=out/lm-tests/ --format=cjs --platform=node",
1072+
"esbuild:list-tests": "esbuild ./electron/listMochaTests.ts --bundle --outfile=out/electron/listMochaTests.cjs --external:electron --format=cjs --platform=node",
1073+
"esbuild:mocha-interface": "esbuild ./electron/mocha-interface.ts --bundle --outfile=out/electron/mocha-interface.cjs --format=cjs --platform=node",
1074+
"esbuild:mocha-reporter": "esbuild ./electron/mocha-reporter.ts --bundle --outfile=out/electron/mocha-reporter.cjs --format=cjs --platform=node",
1075+
"esbuild:ts-compiler": "esbuild ./electron/electron-build-tools-typescript.ts --bundle --outfile=out/electron/electron-build-tools-typescript.cjs --format=cjs --platform=node",
1076+
"esbuild:echo-to-socket": "esbuild ./scripts/echo-to-socket.ts --bundle --outfile=out/scripts/echo-to-socket.cjs --format=cjs --platform=node",
1077+
"esbuild:lm-tests": "esbuild ./lm-tests/*.ts --bundle --external:vscode --out-extension:.js=.cjs --outdir=out/lm-tests/ --format=cjs --platform=node",
10781078
"lint": "eslint electron src && yarn prettier:check",
10791079
"prepare": "husky",
10801080
"pretest": "yarn run esbuild && yarn run lint",

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ function registerElectronBuildToolsCommands(
267267
// Use a custom reporter to send output to an OutputChannel, and
268268
// also output the number of continuations a given test needed
269269
const reporterModule = await import(
270-
vscode.Uri.joinPath(context.extensionUri, "out/lm-tests/reporter.js")
270+
vscode.Uri.joinPath(context.extensionUri, "out/lm-tests/reporter.cjs")
271271
.fsPath
272272
);
273273

src/tasks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export function runAsTask({
5757
// base64 encode the command to get around shell quoting issues
5858
const b64command = Buffer.from(command).toString("base64");
5959

60-
const script = context.asAbsolutePath("out/scripts/echo-to-socket.js");
60+
const script = context.asAbsolutePath("out/scripts/echo-to-socket.cjs");
6161

6262
const task = new vscode.Task(
6363
{ type: "electron-build-tools", task: taskName },

src/tests.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export async function createTestController(
160160
const env: Record<string, string> = {
161161
MOCHA_REPORTER: "mocha-multi-reporters",
162162
MOCHA_MULTI_REPORTERS: `${context.asAbsolutePath(
163-
"out/electron/mocha-reporter.js",
163+
"out/electron/mocha-reporter.cjs",
164164
)}, spec`,
165165
ELECTRON_ROOT: electronRoot.fsPath,
166166
};
@@ -668,7 +668,7 @@ export async function createTestController(
668668
}
669669

670670
const specRunnerContents = await vscode.workspace.fs.readFile(
671-
vscode.Uri.joinPath(electronRoot, "script", "spec-runner.js"),
671+
vscode.Uri.joinPath(electronRoot, "script", "spec-runner.cjs"),
672672
);
673673

674674
if (
@@ -796,9 +796,9 @@ async function getElectronTests(
796796
const electronExe = await vscode.commands.executeCommand<string>(
797797
`${commandPrefix}.show.exec`,
798798
);
799-
const scriptName = context.asAbsolutePath("out/electron/listMochaTests.js");
799+
const scriptName = context.asAbsolutePath("out/electron/listMochaTests.cjs");
800800
const tsNodeCompiler = context.asAbsolutePath(
801-
"out/electron/electron-build-tools-typescript.js",
801+
"out/electron/electron-build-tools-typescript.cjs",
802802
);
803803
const socketName = generateSocketName();
804804

0 commit comments

Comments
 (0)