From c91c7e65fd8a0426e36dab86fc9147769c56e582 Mon Sep 17 00:00:00 2001 From: Moritz Jung Date: Mon, 6 Apr 2026 17:23:52 +0200 Subject: [PATCH] fix scripts --- automation/build/esbuild.config.ts | 6 +++--- automation/build/esbuild.dev.config.ts | 4 ++-- automation/fetchSchemas.ts | 2 +- automation/release.ts | 6 +++--- automation/tsconfig.json | 3 +-- automation/utils/versionUtils.ts | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/automation/build/esbuild.config.ts b/automation/build/esbuild.config.ts index 20d35b8..f99de5c 100644 --- a/automation/build/esbuild.config.ts +++ b/automation/build/esbuild.config.ts @@ -1,8 +1,8 @@ -import builtins from 'builtin-modules'; +import { builtinModules } from 'node:module'; import esbuild from 'esbuild'; import esbuildSvelte from 'esbuild-svelte'; import { sveltePreprocess } from 'svelte-preprocess'; -import { getBuildBanner } from 'build/buildBanner'; +import { getBuildBanner } from './buildBanner'; const banner = getBuildBanner('Release Build', version => version); @@ -26,7 +26,7 @@ const build = await esbuild.build({ '@lezer/common', '@lezer/highlight', '@lezer/lr', - ...builtins, + ...builtinModules, ], format: 'cjs', target: 'es2018', diff --git a/automation/build/esbuild.dev.config.ts b/automation/build/esbuild.dev.config.ts index 8d0e515..463f3fe 100644 --- a/automation/build/esbuild.dev.config.ts +++ b/automation/build/esbuild.dev.config.ts @@ -2,8 +2,8 @@ import esbuild from 'esbuild'; import copy from 'esbuild-plugin-copy-watch'; import esbuildSvelte from 'esbuild-svelte'; import { sveltePreprocess } from 'svelte-preprocess'; -import manifest from '../../manifest.json' assert { type: 'json' }; -import { getBuildBanner } from 'build/buildBanner'; +import manifest from '../../manifest.json' with { type: 'json' }; +import { getBuildBanner } from './buildBanner'; const banner = getBuildBanner('Dev Build', _ => 'Dev Build'); diff --git a/automation/fetchSchemas.ts b/automation/fetchSchemas.ts index f3e2d48..c5c2102 100644 --- a/automation/fetchSchemas.ts +++ b/automation/fetchSchemas.ts @@ -1,4 +1,4 @@ -import { $ } from 'utils/shellUtils'; +import { $ } from './utils/shellUtils'; async function fetchSchema() { // https://docs.api.jikan.moe/ diff --git a/automation/release.ts b/automation/release.ts index 0ce8f0e..9c60136 100644 --- a/automation/release.ts +++ b/automation/release.ts @@ -1,7 +1,7 @@ -import { UserError } from 'utils/utils'; -import { CanaryVersion, Version, getIncrementOptions, parseVersion, stringifyVersion } from 'utils/versionUtils'; +import { UserError } from './utils/utils'; +import { CanaryVersion, Version, getIncrementOptions, parseVersion, stringifyVersion } from './utils/versionUtils'; import config from './config.json'; -import { $choice as $choice, $confirm, $seq, CMD_FMT, Verboseness } from 'utils/shellUtils'; +import { $choice as $choice, $confirm, $seq, CMD_FMT, Verboseness } from './utils/shellUtils'; async function runPreconditions(): Promise { // run preconditions diff --git a/automation/tsconfig.json b/automation/tsconfig.json index 1fd339b..45c2472 100644 --- a/automation/tsconfig.json +++ b/automation/tsconfig.json @@ -1,6 +1,5 @@ { "compilerOptions": { - "baseUrl": ".", "module": "ESNext", "target": "ESNext", "allowJs": true, @@ -8,7 +7,7 @@ "strict": true, "strictNullChecks": true, "noImplicitReturns": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "isolatedModules": true, "lib": ["DOM", "ES5", "ES6", "ES7", "Es2021"], diff --git a/automation/utils/versionUtils.ts b/automation/utils/versionUtils.ts index 62aad22..8ad3fa2 100644 --- a/automation/utils/versionUtils.ts +++ b/automation/utils/versionUtils.ts @@ -2,7 +2,7 @@ import { Parser } from '@lemons_dev/parsinom/lib/Parser'; import { P_UTILS } from '@lemons_dev/parsinom/lib/ParserUtils'; import { P } from '@lemons_dev/parsinom/lib/ParsiNOM'; import Moment from 'moment'; -import { UserError } from 'utils/utils'; +import { UserError } from './utils'; export class Version { major: number;