From 6b56983615958afd424e47071255dd150c78f142 Mon Sep 17 00:00:00 2001 From: Taosh Date: Tue, 10 Oct 2023 05:53:48 +0000 Subject: [PATCH] feat: json5 support for midway build --- packages/cli-plugin-build/package.json | 3 ++- packages/cli-plugin-build/src/index.ts | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/cli-plugin-build/package.json b/packages/cli-plugin-build/package.json index 8f23ad76..d92247a3 100644 --- a/packages/cli-plugin-build/package.json +++ b/packages/cli-plugin-build/package.json @@ -7,7 +7,8 @@ "@midwayjs/command-core": "^2.1.0", "@vercel/ncc": "^0.30.0", "fs-extra": "^8.1.0", - "globby": "^10.0.1" + "globby": "^10.0.1", + "json5": "^2.2.3" }, "devDependencies": { "typescript": "^4.1.0" diff --git a/packages/cli-plugin-build/src/index.ts b/packages/cli-plugin-build/src/index.ts index 65df9db1..358c702a 100644 --- a/packages/cli-plugin-build/src/index.ts +++ b/packages/cli-plugin-build/src/index.ts @@ -15,6 +15,7 @@ import { } from 'fs-extra'; import * as globby from 'globby'; import { tmpdir } from 'os'; +import * as JSON5 from 'json5'; export class BuildPlugin extends BasePlugin { isMidwayHooks = false; private midwayBinBuild: { include?: string[] } = {}; @@ -218,7 +219,7 @@ export class BuildPlugin extends BasePlugin { tsConfig = readFileSync(tsConfig).toString(); } try { - tsConfigResult = JSON.parse(tsConfig); + tsConfigResult = JSON5.parse(tsConfig); } catch (e) { this.core.cli.error( '[midway-bin] tsConfig should be JSON string or Object' @@ -233,7 +234,7 @@ export class BuildPlugin extends BasePlugin { throw new Error('tsconfig.json not found'); } try { - tsConfigResult = JSON.parse( + tsConfigResult = JSON5.parse( readFileSync(projectFile, 'utf-8').toString() ); } catch (e) {