From b0c3677aeb7928566df6708e061cd952f71b7419 Mon Sep 17 00:00:00 2001 From: EGOIST <0x142857@gmail.com> Date: Fri, 26 Nov 2021 19:21:45 +0800 Subject: [PATCH] chore: remove unnecessary dependencies --- package.json | 2 -- pnpm-lock.yaml | 13 ------------- src/load.ts | 9 ++------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index fdfdd12a..b436f359 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "consola": "^2.15.3", "flat": "^5.0.2", "fs-extra": "^9.1.0", - "jju": "^1.4.0", "postcss": "^8.2.10", "postcss-simple-vars": "^6.0.3", "prettier": "^2.2.1", @@ -71,7 +70,6 @@ "rollup-plugin-dts": "^3.0.2", "rollup-plugin-hashbang": "^2.2.2", "string-argv": "^0.3.1", - "strip-json-comments": "^3.1.1", "svelte": "3.37.0", "ts-essentials": "^7.0.1", "tsconfig-paths": "^3.12.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc0dc09c..2bf5881d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,7 +23,6 @@ specifiers: flat: ^5.0.2 fs-extra: ^9.1.0 globby: ^11.0.3 - jju: ^1.4.0 joycon: ^3.0.1 postcss: ^8.2.10 postcss-load-config: ^3.0.1 @@ -35,7 +34,6 @@ specifiers: rollup-plugin-dts: ^3.0.2 rollup-plugin-hashbang: ^2.2.2 string-argv: ^0.3.1 - strip-json-comments: ^3.1.1 sucrase: ^3.20.1 svelte: 3.37.0 tree-kill: ^1.2.2 @@ -76,7 +74,6 @@ devDependencies: consola: 2.15.3 flat: 5.0.2 fs-extra: 9.1.0 - jju: 1.4.0 postcss: 8.4.1 postcss-simple-vars: 6.0.3_postcss@8.4.1 prettier: 2.5.0 @@ -84,7 +81,6 @@ devDependencies: rollup-plugin-dts: 3.0.2_rollup@2.60.1+typescript@4.5.2 rollup-plugin-hashbang: 2.2.2 string-argv: 0.3.1 - strip-json-comments: 3.1.1 svelte: 3.37.0 ts-essentials: 7.0.3_typescript@4.5.2 tsconfig-paths: 3.12.0 @@ -1492,10 +1488,6 @@ packages: /isexe/2.0.0: resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=} - /jju/1.4.0: - resolution: {integrity: sha1-o6vicYryQaKykE+EpiWXDzia4yo=} - dev: true - /joycon/3.0.1: resolution: {integrity: sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==} engines: {node: '>=10'} @@ -2098,11 +2090,6 @@ packages: resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} engines: {node: '>=6'} - /strip-json-comments/3.1.1: - resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} - engines: {node: '>=8'} - dev: true - /sucrase/3.20.3: resolution: {integrity: sha512-azqwq0/Bs6RzLAdb4dXxsCgMtAaD2hzmUr4UhSfsxO46JFPAwMnnb441B/qsudZiS6Ylea3JXZe3Q497lsgXzQ==} engines: {node: '>=8'} diff --git a/src/load.ts b/src/load.ts index 105d5cda..991b42a1 100644 --- a/src/load.ts +++ b/src/load.ts @@ -1,19 +1,14 @@ import fs from 'fs' -import { parse as parseJson } from 'jju/lib/parse' import JoyCon from 'joycon' import path from 'path' -import { bundleRequire } from 'bundle-require' -import stripJsonComments from 'strip-json-comments' +import { bundleRequire, jsoncParse } from 'bundle-require' import { defineConfig } from './' const joycon = new JoyCon() const loadJson = async (filepath: string) => { try { - const content = stripJsonComments( - await fs.promises.readFile(filepath, 'utf8') - ) - return parseJson(content) + return jsoncParse(await fs.promises.readFile(filepath, 'utf8')) } catch (error: any) { throw new Error( `Failed to parse ${path.relative(process.cwd(), filepath)}: ${