Skip to content

Commit 1dec7d2

Browse files
GordonSmithGordonSmith
committed
fix: Improve type-leaks test
Was missing some node deps still in devDeps Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
1 parent 0dc9787 commit 1dec7d2

14 files changed

Lines changed: 445 additions & 205 deletions

File tree

‎package-lock.json‎

Lines changed: 37 additions & 73 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"update-major": "run-p update-major-workspaces update-major root"
3636
},
3737
"devDependencies": {
38+
"@types/esbuild-copy-static-files": "0.1.4",
3839
"@typescript-eslint/eslint-plugin": "8.29.0",
3940
"@typescript-eslint/parser": "8.29.0",
4041
"@vitest/browser": "3.2.4",

‎packages/comms/esbuild.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ import { nodeTpl, nodeBoth } from "@hpcc-js/esbuild-plugins";
22

33
// config ---
44
await Promise.all([
5-
nodeBoth("src/index.node.ts", "dist/node/index"),
5+
nodeBoth("src/index.node.ts", "dist/node/index", { packages: "bundle" }),
66
nodeTpl("utils/index.ts", "lib-esm/index")
77
]);

‎packages/comms/src/clienttools/eclMeta.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as fs from "fs";
2-
import * as path from "path";
1+
import * as fs from "node:fs";
2+
import * as path from "node:path";
33

44
import { Dictionary, DictionaryNoCase, find, SAXStackParser, scopedLogger, XMLNode } from "@hpcc-js/util";
55
import { ClientTools, locateClientTools } from "./eclcc.ts";

‎packages/comms/src/clienttools/eclcc.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import * as cp from "child_process";
2-
import * as fs from "fs";
3-
import * as os from "os";
4-
import * as path from "path";
1+
import * as cp from "node:child_process";
2+
import * as fs from "node:fs";
3+
import * as os from "node:os";
4+
import * as path from "node:path";
55
import * as tmp from "tmp";
66

77
import { exists, scopedLogger, xml2json, XMLNode } from "@hpcc-js/util";

‎packages/comms/src/ecl/scope.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import { StateObject, StringAnyMap } from "@hpcc-js/util";
2-
// import { utcFormat, utcParse } from "d3-time-format";
32
import { WsWorkunits } from "../services/wsWorkunits.ts";
43
import { Workunit } from "./workunit.ts";
54

6-
// const formatter = utcFormat("%Y-%m-%dT%H:%M:%S.%LZ");
7-
// const parser = utcParse("%Y-%m-%dT%H:%M:%S.%LZ");
8-
95
export interface AttributeEx extends WsWorkunits.Property {
106
FormattedEnd?: string;
117
}

‎packages/comms/src/index.node.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ root.DOMParser = DOMParser;
66
// fetch polyfill ---
77
import fetch, { Headers, Request, Response, } from "node-fetch";
88

9-
import * as https from "https";
9+
import * as https from "node:https";
1010
import { Agent, setGlobalDispatcher } from "undici";
1111

1212
if (typeof root.fetch === "undefined") {

‎packages/esbuild-plugins/src/build.ts‎

Lines changed: 85 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ import * as path from "path";
44
import * as esbuild from "esbuild";
55
import type { BuildOptions, Format, Loader, Plugin } from "esbuild";
66
import { umdWrapper } from "esbuild-plugin-umd-wrapper";
7+
import * as copyStaticFiles from "esbuild-copy-static-files";
78
import { inlineCSS } from "./inline-css.ts";
89
import { rebuildLogger } from "./rebuild-logger.ts";
910

10-
//@ts-ignore
11-
import _copyStaticFiles from "esbuild-copy-static-files";
12-
export const copyStaticFiles: Plugin = _copyStaticFiles;
11+
export { copyStaticFiles };
1312

1413
export const pkg = JSON.parse(readFileSync(path.join(process.cwd(), "./package.json"), "utf8"));
1514
export const NODE_MJS = pkg.type === "module" ? "js" : "mjs";
1615
export const NODE_CJS = pkg.type === "module" ? "cjs" : "js";
1716

18-
export async function buildWatch(input: string, format: Format | "umd" = "esm", external: string[] = [], config: BuildOptions, isDevelopment: boolean = process.argv.includes("--development"), isWatch: boolean = process.argv.includes("--watch")): Promise<void> {
17+
export async function buildWatch(inputs: string[] | Record<string, string> | { in: string, out: string }[], config: BuildOptions): Promise<void> {
18+
const isDevelopment = process.argv.includes("--development");
19+
const isWatch = process.argv.includes("--watch");
1920
const isProduction = !isDevelopment;
21+
2022
if (isProduction && existsSync(path.join(process.cwd(), "../../package.json"))) {
2123
const rootPkg = JSON.parse(readFileSync(path.join(process.cwd(), "../../package.json"), "utf8"));
2224
writeFileSync(path.join(process.cwd(), "src/__package__.ts"), `\
@@ -26,20 +28,39 @@ export const BUILD_VERSION = "${rootPkg.version}";
2628
`, "utf8");
2729
}
2830

29-
const ctx = await esbuild.context({
30-
entryPoints: [input],
31-
format: format as Format,
31+
config = {
32+
entryPoints: inputs,
33+
format: "esm",
3234
bundle: true,
3335
minify: isProduction,
3436
sourcemap: true,
35-
external,
37+
external: [
38+
...config.external ?? []
39+
],
3640
...config,
41+
loader: {
42+
...config.loader
43+
},
44+
outExtension: {
45+
...config.outExtension
46+
},
47+
banner: {
48+
...config.banner
49+
},
50+
footer: {
51+
...config.footer
52+
},
3753
plugins: [
3854
...(isWatch ? [rebuildLogger(config)] : []),
39-
...(config.plugins ?? []),
55+
...config.plugins ?? [],
4056
inlineCSS()
57+
],
58+
nodePaths: [
59+
...config.nodePaths ?? []
4160
]
42-
});
61+
};
62+
console.log("config", config);
63+
const ctx = await esbuild.context(config);
4364

4465
if (isWatch) {
4566
await ctx.watch();
@@ -68,35 +89,54 @@ export type TplOptions = {
6889
supported?: Record<string, boolean>;
6990
alias?: Record<string, string>;
7091
define?: { [key: string]: string };
92+
packages?: "bundle" | "external" | "auto";
7193
};
7294

73-
export function browserTpl(input: string, output: string, { format = "esm", globalName, libraryName, keepNames, external = [], plugins = [], alias = {}, define = {}, loader = {} }: TplOptions = {}) {
74-
return buildWatch(input, format, external, {
75-
outfile: `${output}.${format === "esm" ? "js" : `${format}.js`}`,
95+
function autoExternal(external?: string[]): string[] {
96+
return [
97+
...pkg.dependencies ? Object.keys(pkg.dependencies) : [], ...pkg.peerDependencies ? Object.keys(pkg.peerDependencies) : [],
98+
...external ?? []
99+
];
100+
}
101+
102+
export function browserTpl(input: string, output: string, options: TplOptions = {}) {
103+
options.format = options.format ?? "esm";
104+
105+
return buildWatch([input], {
106+
format: options.format === "umd" ? "esm" : options.format,
107+
external: options.external ?? [],
108+
outfile: `${output}.${options.format === "esm" ? "js" : `${options.format}.js`}`,
76109
platform: "browser",
77110
target: "es2022",
78-
globalName,
79-
keepNames,
80-
plugins: format === "umd" ? [umdWrapper({ libraryName }), ...plugins] : [...plugins],
81-
alias,
82-
define,
83-
loader
84-
} as BuildOptions);
111+
globalName: options.globalName,
112+
keepNames: options.keepNames,
113+
plugins: options.format === "umd" ? [umdWrapper({ libraryName: options.libraryName }), ...options.plugins ?? []] : [...options.plugins ?? []],
114+
alias: options.alias,
115+
define: options.define,
116+
loader: options.loader,
117+
});
85118
}
86119

87-
export function nodeTpl(input: string, output: string, { format = "esm", external = [], supported = {} }: TplOptions = {}) {
88-
return buildWatch(input, format, external, {
89-
outfile: `${output}.${format === "esm" ? NODE_MJS : NODE_CJS}`,
120+
export function nodeTpl(input: string, output: string, options: TplOptions = {}) {
121+
options.packages = options.packages ?? "external";
122+
if (options.packages === "auto") {
123+
options.external = autoExternal(options.external);
124+
}
125+
126+
return buildWatch([input], {
127+
format: options.format === "umd" ? "esm" : options.format,
128+
outfile: `${output}.${options.format === "esm" ? NODE_MJS : NODE_CJS}`,
90129
platform: "node",
91-
target: "node20",
92-
packages: "external",
93-
supported
130+
target: "node22",
131+
packages: options.packages === "auto" ? "bundle" : options.packages,
94132
});
95133
}
96134

97-
export function neutralTpl(input: string, output: string, { format = "esm", globalName, libraryName, keepNames, external = [] }: TplOptions = {}) {
135+
export function neutralTpl(input: string, output: string, options: TplOptions = {}) {
136+
options.format = options.format ?? "esm";
137+
98138
let postfix = "";
99-
switch (format) {
139+
switch (options.format) {
100140
case "iife":
101141
postfix = "iife.js";
102142
break;
@@ -110,35 +150,36 @@ export function neutralTpl(input: string, output: string, { format = "esm", glob
110150
postfix = "umd.js";
111151
break;
112152
default:
113-
throw new Error(`Unknown format: ${format}`);
153+
throw new Error(`Unknown format: ${options.format}`);
114154
}
115-
return buildWatch(input, format, external, {
116-
outfile: `${output}.${format === "esm" ? "js" : `${format}.js`}`,
155+
return buildWatch([input], {
156+
format: options.format === "umd" ? "esm" : options.format,
157+
outfile: `${output}.${options.format === "esm" ? "js" : `${options.format}.js`}`,
117158
platform: "neutral",
118159
target: "es2022",
119-
globalName,
120-
keepNames,
121-
plugins: format === "umd" ? [umdWrapper({ libraryName })] : [] as Plugin[]
122-
} as BuildOptions);
160+
globalName: options.globalName,
161+
keepNames: options.keepNames,
162+
plugins: options.format === "umd" ? [umdWrapper({ libraryName: options.libraryName })] : [] as Plugin[]
163+
});
123164
}
124165

125-
export function browserBoth(input: string, output: string, globalName?: string, libraryName?: string, external: string[] = []) {
166+
export function browserBoth(input: string, output: string, options: TplOptions = {}) {
126167
return Promise.all([
127-
browserTpl(input, output, { format: "esm", globalName, libraryName, external }),
128-
browserTpl(input, output, { format: "umd", globalName, libraryName, external })
168+
browserTpl(input, output, { format: "esm", ...options }),
169+
browserTpl(input, output, { format: "umd", ...options })
129170
]);
130171
}
131172

132-
export function nodeBoth(input: string, output: string, external: string[] = []) {
173+
export function nodeBoth(input: string, output: string, options: TplOptions = {}) {
133174
return Promise.all([
134-
nodeTpl(input, output, { format: "esm", external }),
135-
nodeTpl(input, output, { format: "cjs", external })
175+
nodeTpl(input, output, { format: "esm", ...options }),
176+
nodeTpl(input, output, { format: "cjs", ...options })
136177
]);
137178
}
138179

139-
export function bothTpl(input: string, output: string, globalName?: string, libraryName?: string, external: string[] = []) {
180+
export function bothTpl(input: string, output: string, options: TplOptions = {}) {
140181
return Promise.all([
141-
browserBoth(input, output, globalName, libraryName, external),
142-
nodeTpl(input, output, { format: "cjs", external })
182+
browserBoth(input, output, { ...options }),
183+
nodeTpl(input, output, { format: "cjs", ...options })
143184
]);
144185
}

‎packages/markdown-it-plugins/esbuild.js‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
import { nodeTpl } from "@hpcc-js/esbuild-plugins";
2+
import pkg from "./package.json" with { type: "json" };
23

34
// config ---
45
await Promise.all([
5-
nodeTpl("src/loader.ts", "dist/loader.node", { supported: { "dynamic-import": true } }),
6-
nodeTpl("src/ecl-lang/index.ts", "dist/ecl-lang"),
6+
nodeTpl("src/loader.ts", "dist/loader.node", {
7+
packages: "bundle",
8+
supported: { "dynamic-import": true },
9+
external: [
10+
...Object.keys(pkg.dependencies || {}),
11+
...Object.keys(pkg.peerDependencies || {})
12+
]
13+
}),
14+
nodeTpl("src/ecl-lang/index.ts", "dist/ecl-lang", {
15+
packages: "bundle",
16+
external: [
17+
...Object.keys(pkg.dependencies || {}),
18+
...Object.keys(pkg.peerDependencies || {})
19+
]
20+
}),
721
]);

‎packages/markdown-it-plugins/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@
5858
"@types/markdown-it": "14.1.2"
5959
},
6060
"peerDependencies": {
61-
"markdown-it": "14.1.0"
61+
"apache-arrow": "19.0.1",
62+
"markdown-it": "14.1.0",
63+
"shiki": "2.5.0"
6264
},
6365
"devDependencies": {
6466
"@hpcc-js/esbuild-plugins": "^1.4.2",
65-
"apache-arrow": "19.0.1",
6667
"d3-dsv": "3.0.1",
6768
"d3-fetch": "3.0.1",
6869
"dotenv": "16.4.7",
69-
"shiki": "2.5.0",
7070
"tsx": "4.19.3"
7171
},
7272
"repository": {

0 commit comments

Comments
 (0)