diff --git a/packages/vite/LICENSE.md b/packages/vite/LICENSE.md index bd80a72c138380..293bbb5d1be0cc 100644 --- a/packages/vite/LICENSE.md +++ b/packages/vite/LICENSE.md @@ -466,36 +466,6 @@ Repository: https://github.com/mathiasbynens/cssesc --------------------------------------- -## dotenv -License: BSD-2-Clause -Repository: https://github.com/motdotla/dotenv - -> Copyright (c) 2015, Scott Motte -> All rights reserved. -> -> Redistribution and use in source and binary forms, with or without -> modification, are permitted provided that the following conditions are met: -> -> * Redistributions of source code must retain the above copyright notice, this -> list of conditions and the following disclaimer. -> -> * Redistributions in binary form must reproduce the above copyright notice, -> this list of conditions and the following disclaimer in the documentation -> and/or other materials provided with the distribution. -> -> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -> IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -> DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -> FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -> DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -> SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -> OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -> OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ---------------------------------------- - ## dotenv-expand License: BSD-2-Clause By: motdotla diff --git a/packages/vite/package.json b/packages/vite/package.json index e886125299858c..de4fc0b1c7f8c5 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -106,7 +106,6 @@ "cors": "^2.8.6", "cross-spawn": "^7.0.6", "obug": "^1.0.2", - "dotenv": "^17.2.3", "dotenv-expand": "^12.0.3", "es-module-lexer": "^1.7.0", "esbuild": "^0.27.2", diff --git a/packages/vite/src/node/env.ts b/packages/vite/src/node/env.ts index 8bfb71a00871fc..91dd911168a350 100644 --- a/packages/vite/src/node/env.ts +++ b/packages/vite/src/node/env.ts @@ -1,6 +1,6 @@ import fs from 'node:fs' import path from 'node:path' -import { parse } from 'dotenv' +import { parseEnv } from 'node:util' import { type DotenvPopulateInput, expand } from 'dotenv-expand' import colors from 'picocolors' import { arraify, createDebugger, normalizePath, tryStatSync } from './utils' @@ -50,7 +50,8 @@ export function loadEnv( // Support FIFOs (named pipes) for apps like 1Password if (!stat || (!stat.isFile() && !stat.isFIFO())) return [] - return Object.entries(parse(fs.readFileSync(filePath))) + const parsedEnv = parseEnv(fs.readFileSync(filePath, 'utf-8')) + return Object.entries(parsedEnv as Record) }), ) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c0f99a1f0e4367..12beedd66a836a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -319,9 +319,6 @@ importers: cross-spawn: specifier: ^7.0.6 version: 7.0.6 - dotenv: - specifier: ^17.2.3 - version: 17.2.3 dotenv-expand: specifier: ^12.0.3 version: 12.0.3(patch_hash=49330a663821151418e003e822a82a6a61d2f0f8a6e3cab00c1c94815a112889) @@ -4980,10 +4977,6 @@ packages: resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==} engines: {node: '>=12'} - dotenv@17.2.3: - resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==} - engines: {node: '>=12'} - dts-resolver@2.1.3: resolution: {integrity: sha512-bihc7jPC90VrosXNzK0LTE2cuLP6jr0Ro8jk+kMugHReJVLIpHz/xadeq3MhuwyO4TD4OA3L1Q8pBBFRc08Tsw==} engines: {node: '>=20.19.0'} @@ -11024,8 +11017,6 @@ snapshots: dotenv@16.6.1: {} - dotenv@17.2.3: {} - dts-resolver@2.1.3: {} dunder-proto@1.0.1: