michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove deepmerge-ts for simpler implementation (#8086)

Browse source
This commit is contained in:
Bjorn Lu 2023-08-15 21:11:00 +08:00 committed by GitHub
parent c19987df0b
commit fa29e4a36f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/astro/package.json
View file

@ -137,7 +137,6 @@
"common-ancestor-path": "^1.0.1",
"cookie": "^0.5.0",
"debug": "^4.3.4",
"deepmerge-ts": "^4.3.0",
"devalue": "^4.3.2",
"diff": "^5.1.0",
"es-module-lexer": "^1.3.0",

26
packages/astro/src/core/config/tsconfig.ts
View file

@ -1,4 +1,3 @@
import { deepmerge } from 'deepmerge-ts';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import * as tsr from 'tsconfig-resolver';
@ -96,5 +95,28 @@ export function updateTSConfigForFramework(
return target;
}
return deepmerge(target, presets.get(framework)!);
return deepMergeObjects(target, presets.get(framework)!);
}
// Simple deep merge implementation that merges objects and strings
function deepMergeObjects<T extends Record<string, any>>(a: T, b: T): T {
const merged: T = { ...a };
for (const key in b) {
const value = b[key];
if (a[key] == null) {
merged[key] = value;
continue;
}
if (typeof a[key] === 'object' && typeof value === 'object') {
merged[key] = deepMergeObjects(a[key], value);
continue;
}
merged[key] = value;
}
return merged;
}

8
pnpm-lock.yaml
View file

@ -548,9 +548,6 @@ importers:
debug:
specifier: ^4.3.4
version: 4.3.4
deepmerge-ts:
specifier: ^4.3.0
version: 4.3.0
devalue:
specifier: ^4.3.2
version: 4.3.2
@ -10809,11 +10806,6 @@ packages:
resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
dev: true
/deepmerge-ts@4.3.0:
resolution: {integrity: sha512-if3ZYdkD2dClhnXR5reKtG98cwyaRT1NeugQoAPTTfsOpV9kqyeiBF9Qa5RHjemb3KzD5ulqygv6ED3t5j9eJw==}
engines: {node: '>=12.4.0'}
dev: false
/deepmerge@4.3.1:
resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
engines: {node: '>=0.10.0'}