Skip to content

Commit 79f1fea

Browse files
committed
chore: rebase
1 parent 1d4e2f5 commit 79f1fea

File tree

5 files changed

+60
-210
lines changed

5 files changed

+60
-210
lines changed

packages/vite/LICENSE.md

+44
Original file line numberDiff line numberDiff line change
@@ -887,6 +887,27 @@ License: MIT
887887
By: Mathias Bynens
888888
Repository: https://github.com/mathiasbynens/cssesc.git
889889

890+
> Copyright Mathias Bynens <https://mathiasbynens.be/>
891+
>
892+
> Permission is hereby granted, free of charge, to any person obtaining
893+
> a copy of this software and associated documentation files (the
894+
> "Software"), to deal in the Software without restriction, including
895+
> without limitation the rights to use, copy, modify, merge, publish,
896+
> distribute, sublicense, and/or sell copies of the Software, and to
897+
> permit persons to whom the Software is furnished to do so, subject to
898+
> the following conditions:
899+
>
900+
> The above copyright notice and this permission notice shall be
901+
> included in all copies or substantial portions of the Software.
902+
>
903+
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
904+
> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
905+
> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
906+
> NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
907+
> LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
908+
> OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
909+
> WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
910+
890911
---------------------------------------
891912

892913
## debug
@@ -2379,6 +2400,29 @@ License: MIT
23792400
By: Ben Briggs, Chris Eppstein
23802401
Repository: postcss/postcss-selector-parser
23812402

2403+
> Copyright (c) Ben Briggs <[email protected]> (http://beneb.info)
2404+
>
2405+
> Permission is hereby granted, free of charge, to any person
2406+
> obtaining a copy of this software and associated documentation
2407+
> files (the "Software"), to deal in the Software without
2408+
> restriction, including without limitation the rights to use,
2409+
> copy, modify, merge, publish, distribute, sublicense, and/or sell
2410+
> copies of the Software, and to permit persons to whom the
2411+
> Software is furnished to do so, subject to the following
2412+
> conditions:
2413+
>
2414+
> The above copyright notice and this permission notice shall be
2415+
> included in all copies or substantial portions of the Software.
2416+
>
2417+
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
2418+
> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
2419+
> OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
2420+
> NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
2421+
> HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
2422+
> WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
2423+
> FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
2424+
> OTHER DEALINGS IN THE SOFTWARE.
2425+
23822426
---------------------------------------
23832427

23842428
## postcss-value-parser

packages/vite/src/node/build.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -923,16 +923,16 @@ export function resolveBuildOutputs(
923923
)
924924
}
925925

926-
outputs.forEach((output) => {
927-
if (
928-
(output.format === 'umd' || output.format === 'iife') &&
929-
!output.name
930-
) {
931-
throw new Error(
932-
'Entries in "build.rollupOptions.output" must specify "name" when the format is "umd" or "iife".',
933-
)
934-
}
935-
})
926+
// outputs.forEach((output) => {
927+
// if (
928+
// (output.format === 'umd' || output.format === 'iife') &&
929+
// !output.name
930+
// ) {
931+
// throw new Error(
932+
// 'Entries in "build.rollupOptions.output" must specify "name" when the format is "umd" or "iife".',
933+
// )
934+
// }
935+
// })
936936
}
937937

938938
return outputs

packages/vite/src/node/optimizer/scan.ts

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import type { PluginContainer } from '../server/pluginContainer'
3636
import { createPluginContainer } from '../server/pluginContainer'
3737
import { transformGlobImport } from '../plugins/importMetaGlob'
3838
import { cleanUrl } from '../../shared/utils'
39+
import { loadTsconfigJsonForFile } from '../plugins/esbuild'
3940

4041
type ResolveIdOptions = Parameters<PluginContainer['resolveId']>[2]
4142

packages/vite/src/node/plugins/css.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,8 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
715715
.set(referenceId, { originalName: originalFilename })
716716

717717
const filename = this.getFileName(referenceId)
718-
chunk.viteMetadata!.importedAssets.add(cleanUrl(filename))
718+
getChunkMetadata(chunk.name)!.importedAssets.add(cleanUrl(filename))
719+
// chunk.viteMetadata!.importedAssets.add(cleanUrl(filename))
719720
const replacement = toOutputFilePathInJS(
720721
filename,
721722
'asset',

pnpm-lock.yaml

+3-199
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)