From f73f2822afad750b76c894e73c0a786d4dd16564 Mon Sep 17 00:00:00 2001 From: Shigma Date: Tue, 13 Feb 2024 04:38:26 +0800 Subject: [PATCH] fix: set `absWorkingDir` for consistency --- .github/workflows/build.yml | 2 +- examples/cross-platform/lib/index.cjs | 2 +- examples/cross-platform/lib/index.mjs | 2 +- packages/core/src/index.ts | 9 +++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 381578a..32341f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: yarn build examples/node-hybrid yarn build examples/node-next yarn build examples/wildcard - git status + git diff --exit-code lint: runs-on: ubuntu-latest diff --git a/examples/cross-platform/lib/index.cjs b/examples/cross-platform/lib/index.cjs index c358734..83bac8e 100644 --- a/examples/cross-platform/lib/index.cjs +++ b/examples/cross-platform/lib/index.cjs @@ -23,7 +23,7 @@ __export(src_exports, { foo: () => foo }); module.exports = __toCommonJS(src_exports); -var import_adapter = require("@dunble-examples/cross-platform/adapter"); +var import_adapter = require("@dumble-examples/cross-platform/adapter"); function foo() { return console.log((0, import_adapter.platform)()); } diff --git a/examples/cross-platform/lib/index.mjs b/examples/cross-platform/lib/index.mjs index a7c23d3..b1cd378 100644 --- a/examples/cross-platform/lib/index.mjs +++ b/examples/cross-platform/lib/index.mjs @@ -2,7 +2,7 @@ var __defProp = Object.defineProperty; var __name = (target, value) => __defProp(target, "name", { value, configurable: true }); // src/index.ts -import { platform } from "@dunble-examples/cross-platform/adapter"; +import { platform } from "@dumble-examples/cross-platform/adapter"; function foo() { return console.log(platform()); } diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index ab5cd7b..e41a540 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -46,11 +46,11 @@ function display(prefix: string) { const displayError = display(kleur.red('error:')) const displayWarning = display(kleur.yellow('warning:')) -function bundle(options: BuildOptions) { +function bundle(options: BuildOptions, base: string) { // show entry list for (const [key, value] of Object.entries(options.entryPoints!)) { - const source = relative(process.cwd(), value) - const target = relative(process.cwd(), resolve(options.outdir!, key + options.outExtension!['.js'])) + const source = relative(base, value) + const target = relative(base, resolve(options.outdir!, key + options.outExtension!['.js'])) console.log('esbuild:', source, '->', target) } @@ -212,6 +212,7 @@ async function dumble(cwd: string, manifest: PackageJson, tsconfig: TsConfig, op } matrix.push({ + absWorkingDir: cwd, outdir, outbase, target: tsconfig.compilerOptions?.target as any, @@ -287,7 +288,7 @@ async function dumble(cwd: string, manifest: PackageJson, tsconfig: TsConfig, op await Promise.all(matrix.map(async (options) => { try { - await bundle(options) + await bundle(options, process.cwd()) } catch (error) { console.error(error) }