Skip to content

Commit 103dec9

Browse files
GrygrFlzrGrygrFlzr
authored
fix(ssr): handle empty sourcemaps (fix #2391) (#2441)
close #2391
1 parent a5412f8 commit 103dec9

File tree

8 files changed

+303
-54
lines changed

8 files changed

+303
-54
lines changed

‎.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ module.exports = {
1212
'error',
1313
{
1414
allowModules: ['types', 'estree', 'testUtils'],
15-
tryExtensions: ['.ts', '.js', '.jsx', '.tsx']
15+
tryExtensions: ['.ts', '.js', '.jsx', '.tsx', '.d.ts']
1616
}
1717
],
1818
'node/no-missing-require': [
1919
'error',
2020
{
2121
// for try-catching yarn pnp
2222
allowModules: ['pnpapi'],
23-
tryExtensions: ['.ts', '.js', '.jsx', '.tsx']
23+
tryExtensions: ['.ts', '.js', '.jsx', '.tsx', '.d.ts']
2424
}
2525
],
2626
'node/no-restricted-require': [

‎packages/vite/LICENSE.md

Lines changed: 210 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,218 @@ SOFTWARE.
2525

2626
# Licenses of bundled dependencies
2727
The published Vite artifact additionally contains code with the following licenses:
28-
MIT, ISC, BSD-2-Clause, Apache-2.0, (BSD-3-Clause OR GPL-2.0), BSD-3-Clause, CC0-1.0
28+
Apache-2.0, MIT, ISC, BSD-2-Clause, (BSD-3-Clause OR GPL-2.0), BSD-3-Clause, CC0-1.0
2929

3030
# Bundled dependencies:
31+
## @ampproject/remapping
32+
License: Apache-2.0
33+
By: Justin Ridgewell
34+
Repository: git+https://github.com/ampproject/remapping.git
35+
36+
> Apache License
37+
> Version 2.0, January 2004
38+
> http://www.apache.org/licenses/
39+
>
40+
> TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
41+
>
42+
> 1. Definitions.
43+
>
44+
> "License" shall mean the terms and conditions for use, reproduction,
45+
> and distribution as defined by Sections 1 through 9 of this document.
46+
>
47+
> "Licensor" shall mean the copyright owner or entity authorized by
48+
> the copyright owner that is granting the License.
49+
>
50+
> "Legal Entity" shall mean the union of the acting entity and all
51+
> other entities that control, are controlled by, or are under common
52+
> control with that entity. For the purposes of this definition,
53+
> "control" means (i) the power, direct or indirect, to cause the
54+
> direction or management of such entity, whether by contract or
55+
> otherwise, or (ii) ownership of fifty percent (50%) or more of the
56+
> outstanding shares, or (iii) beneficial ownership of such entity.
57+
>
58+
> "You" (or "Your") shall mean an individual or Legal Entity
59+
> exercising permissions granted by this License.
60+
>
61+
> "Source" form shall mean the preferred form for making modifications,
62+
> including but not limited to software source code, documentation
63+
> source, and configuration files.
64+
>
65+
> "Object" form shall mean any form resulting from mechanical
66+
> transformation or translation of a Source form, including but
67+
> not limited to compiled object code, generated documentation,
68+
> and conversions to other media types.
69+
>
70+
> "Work" shall mean the work of authorship, whether in Source or
71+
> Object form, made available under the License, as indicated by a
72+
> copyright notice that is included in or attached to the work
73+
> (an example is provided in the Appendix below).
74+
>
75+
> "Derivative Works" shall mean any work, whether in Source or Object
76+
> form, that is based on (or derived from) the Work and for which the
77+
> editorial revisions, annotations, elaborations, or other modifications
78+
> represent, as a whole, an original work of authorship. For the purposes
79+
> of this License, Derivative Works shall not include works that remain
80+
> separable from, or merely link (or bind by name) to the interfaces of,
81+
> the Work and Derivative Works thereof.
82+
>
83+
> "Contribution" shall mean any work of authorship, including
84+
> the original version of the Work and any modifications or additions
85+
> to that Work or Derivative Works thereof, that is intentionally
86+
> submitted to Licensor for inclusion in the Work by the copyright owner
87+
> or by an individual or Legal Entity authorized to submit on behalf of
88+
> the copyright owner. For the purposes of this definition, "submitted"
89+
> means any form of electronic, verbal, or written communication sent
90+
> to the Licensor or its representatives, including but not limited to
91+
> communication on electronic mailing lists, source code control systems,
92+
> and issue tracking systems that are managed by, or on behalf of, the
93+
> Licensor for the purpose of discussing and improving the Work, but
94+
> excluding communication that is conspicuously marked or otherwise
95+
> designated in writing by the copyright owner as "Not a Contribution."
96+
>
97+
> "Contributor" shall mean Licensor and any individual or Legal Entity
98+
> on behalf of whom a Contribution has been received by Licensor and
99+
> subsequently incorporated within the Work.
100+
>
101+
> 2. Grant of Copyright License. Subject to the terms and conditions of
102+
> this License, each Contributor hereby grants to You a perpetual,
103+
> worldwide, non-exclusive, no-charge, royalty-free, irrevocable
104+
> copyright license to reproduce, prepare Derivative Works of,
105+
> publicly display, publicly perform, sublicense, and distribute the
106+
> Work and such Derivative Works in Source or Object form.
107+
>
108+
> 3. Grant of Patent License. Subject to the terms and conditions of
109+
> this License, each Contributor hereby grants to You a perpetual,
110+
> worldwide, non-exclusive, no-charge, royalty-free, irrevocable
111+
> (except as stated in this section) patent license to make, have made,
112+
> use, offer to sell, sell, import, and otherwise transfer the Work,
113+
> where such license applies only to those patent claims licensable
114+
> by such Contributor that are necessarily infringed by their
115+
> Contribution(s) alone or by combination of their Contribution(s)
116+
> with the Work to which such Contribution(s) was submitted. If You
117+
> institute patent litigation against any entity (including a
118+
> cross-claim or counterclaim in a lawsuit) alleging that the Work
119+
> or a Contribution incorporated within the Work constitutes direct
120+
> or contributory patent infringement, then any patent licenses
121+
> granted to You under this License for that Work shall terminate
122+
> as of the date such litigation is filed.
123+
>
124+
> 4. Redistribution. You may reproduce and distribute copies of the
125+
> Work or Derivative Works thereof in any medium, with or without
126+
> modifications, and in Source or Object form, provided that You
127+
> meet the following conditions:
128+
>
129+
> (a) You must give any other recipients of the Work or
130+
> Derivative Works a copy of this License; and
131+
>
132+
> (b) You must cause any modified files to carry prominent notices
133+
> stating that You changed the files; and
134+
>
135+
> (c) You must retain, in the Source form of any Derivative Works
136+
> that You distribute, all copyright, patent, trademark, and
137+
> attribution notices from the Source form of the Work,
138+
> excluding those notices that do not pertain to any part of
139+
> the Derivative Works; and
140+
>
141+
> (d) If the Work includes a "NOTICE" text file as part of its
142+
> distribution, then any Derivative Works that You distribute must
143+
> include a readable copy of the attribution notices contained
144+
> within such NOTICE file, excluding those notices that do not
145+
> pertain to any part of the Derivative Works, in at least one
146+
> of the following places: within a NOTICE text file distributed
147+
> as part of the Derivative Works; within the Source form or
148+
> documentation, if provided along with the Derivative Works; or,
149+
> within a display generated by the Derivative Works, if and
150+
> wherever such third-party notices normally appear. The contents
151+
> of the NOTICE file are for informational purposes only and
152+
> do not modify the License. You may add Your own attribution
153+
> notices within Derivative Works that You distribute, alongside
154+
> or as an addendum to the NOTICE text from the Work, provided
155+
> that such additional attribution notices cannot be construed
156+
> as modifying the License.
157+
>
158+
> You may add Your own copyright statement to Your modifications and
159+
> may provide additional or different license terms and conditions
160+
> for use, reproduction, or distribution of Your modifications, or
161+
> for any such Derivative Works as a whole, provided Your use,
162+
> reproduction, and distribution of the Work otherwise complies with
163+
> the conditions stated in this License.
164+
>
165+
> 5. Submission of Contributions. Unless You explicitly state otherwise,
166+
> any Contribution intentionally submitted for inclusion in the Work
167+
> by You to the Licensor shall be under the terms and conditions of
168+
> this License, without any additional terms or conditions.
169+
> Notwithstanding the above, nothing herein shall supersede or modify
170+
> the terms of any separate license agreement you may have executed
171+
> with Licensor regarding such Contributions.
172+
>
173+
> 6. Trademarks. This License does not grant permission to use the trade
174+
> names, trademarks, service marks, or product names of the Licensor,
175+
> except as required for reasonable and customary use in describing the
176+
> origin of the Work and reproducing the content of the NOTICE file.
177+
>
178+
> 7. Disclaimer of Warranty. Unless required by applicable law or
179+
> agreed to in writing, Licensor provides the Work (and each
180+
> Contributor provides its Contributions) on an "AS IS" BASIS,
181+
> WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
182+
> implied, including, without limitation, any warranties or conditions
183+
> of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
184+
> PARTICULAR PURPOSE. You are solely responsible for determining the
185+
> appropriateness of using or redistributing the Work and assume any
186+
> risks associated with Your exercise of permissions under this License.
187+
>
188+
> 8. Limitation of Liability. In no event and under no legal theory,
189+
> whether in tort (including negligence), contract, or otherwise,
190+
> unless required by applicable law (such as deliberate and grossly
191+
> negligent acts) or agreed to in writing, shall any Contributor be
192+
> liable to You for damages, including any direct, indirect, special,
193+
> incidental, or consequential damages of any character arising as a
194+
> result of this License or out of the use or inability to use the
195+
> Work (including but not limited to damages for loss of goodwill,
196+
> work stoppage, computer failure or malfunction, or any and all
197+
> other commercial damages or losses), even if such Contributor
198+
> has been advised of the possibility of such damages.
199+
>
200+
> 9. Accepting Warranty or Additional Liability. While redistributing
201+
> the Work or Derivative Works thereof, You may choose to offer,
202+
> and charge a fee for, acceptance of support, warranty, indemnity,
203+
> or other liability obligations and/or rights consistent with this
204+
> License. However, in accepting such obligations, You may act only
205+
> on Your own behalf and on Your sole responsibility, not on behalf
206+
> of any other Contributor, and only if You agree to indemnify,
207+
> defend, and hold each Contributor harmless for any liability
208+
> incurred by, or claims asserted against, such Contributor by reason
209+
> of your accepting any such warranty or additional liability.
210+
>
211+
> END OF TERMS AND CONDITIONS
212+
>
213+
> APPENDIX: How to apply the Apache License to your work.
214+
>
215+
> To apply the Apache License to your work, attach the following
216+
> boilerplate notice, with the fields enclosed by brackets "[]"
217+
> replaced with your own identifying information. (Don't include
218+
> the brackets!) The text should be enclosed in the appropriate
219+
> comment syntax for the file format. We also recommend that a
220+
> file or class name and description of purpose be included on the
221+
> same "printed page" as the copyright notice for easier
222+
> identification within third-party archives.
223+
>
224+
> Copyright 2019 Google LLC
225+
>
226+
> Licensed under the Apache License, Version 2.0 (the "License");
227+
> you may not use this file except in compliance with the License.
228+
> You may obtain a copy of the License at
229+
>
230+
> http://www.apache.org/licenses/LICENSE-2.0
231+
>
232+
> Unless required by applicable law or agreed to in writing, software
233+
> distributed under the License is distributed on an "AS IS" BASIS,
234+
> WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
235+
> See the License for the specific language governing permissions and
236+
> limitations under the License.
237+
238+
---------------------------------------
239+
31240
## @babel/code-frame
32241
License: MIT
33242
By: Sebastian McKenzie
@@ -2678,35 +2887,6 @@ Repository: https://github.com/rich-harris/magic-string
26782887
26792888
---------------------------------------
26802889

2681-
## merge-source-map
2682-
License: MIT
2683-
By: keik
2684-
Repository: git+https://github.com/keik/merge-source-map.git
2685-
2686-
> The MIT License (MIT)
2687-
>
2688-
> Copyright (c) keik <[email protected]>
2689-
>
2690-
> Permission is hereby granted, free of charge, to any person obtaining a copy
2691-
> of this software and associated documentation files (the "Software"), to deal
2692-
> in the Software without restriction, including without limitation the rights
2693-
> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
2694-
> copies of the Software, and to permit persons to whom the Software is
2695-
> furnished to do so, subject to the following conditions:
2696-
>
2697-
> The above copyright notice and this permission notice shall be included in
2698-
> all copies or substantial portions of the Software.
2699-
>
2700-
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2701-
> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2702-
> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2703-
> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2704-
> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2705-
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2706-
> THE SOFTWARE.
2707-
2708-
---------------------------------------
2709-
27102890
## merge-stream
27112891
License: MIT
27122892
By: Stephen Sugden

‎packages/vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"fsevents": "~2.3.1"
5454
},
5555
"devDependencies": {
56+
"@ampproject/remapping": "^1.0.1",
5657
"@rollup/plugin-alias": "^3.1.1",
5758
"@rollup/plugin-commonjs": "^17.0.0",
5859
"@rollup/plugin-dynamic-import-vars": "^1.1.1",
@@ -100,7 +101,6 @@
100101
"http-proxy": "^1.18.1",
101102
"launch-editor-middleware": "^2.2.1",
102103
"magic-string": "^0.25.7",
103-
"merge-source-map": "^1.1.0",
104104
"mime": "^2.4.7",
105105
"minimatch": "^3.0.4",
106106
"okie": "^1.0.1",

‎packages/vite/src/node/plugins/esbuild.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import {
99
TransformResult
1010
} from 'esbuild'
1111
import { cleanUrl, createDebugger, generateCodeFrame } from '../utils'
12-
import merge from 'merge-source-map'
12+
import { RawSourceMap } from '@ampproject/remapping/dist/types/types'
1313
import { SourceMap } from 'rollup'
1414
import { ResolvedConfig } from '..'
1515
import { createFilter } from '@rollup/pluginutils'
16+
import { combineSourcemaps } from '../utils'
1617

1718
const debug = createDebugger('vite:esbuild')
1819

@@ -59,12 +60,13 @@ export async function transformWithEsbuild(
5960
const result = await transform(code, resolvedOptions)
6061
if (inMap) {
6162
const nextMap = JSON.parse(result.map)
62-
// merge-source-map will overwrite original sources if newMap also has
63-
// sourcesContent
6463
nextMap.sourcesContent = []
6564
return {
6665
...result,
67-
map: merge(inMap, nextMap) as SourceMap
66+
map: combineSourcemaps(filename, [
67+
nextMap as RawSourceMap,
68+
inMap as RawSourceMap
69+
]) as SourceMap
6870
}
6971
} else {
7072
return {

‎packages/vite/src/node/server/pluginContainer.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ import * as acorn from 'acorn'
5252
import acornClassFields from 'acorn-class-fields'
5353
import acornNumericSeparator from 'acorn-numeric-separator'
5454
import acornStaticClassFeatures from 'acorn-static-class-features'
55-
import merge from 'merge-source-map'
55+
import { RawSourceMap } from '@ampproject/remapping/dist/types/types'
56+
import { combineSourcemaps } from '../utils'
5657
import MagicString from 'magic-string'
5758
import { FSWatcher } from 'chokidar'
5859
import {
@@ -336,13 +337,13 @@ export async function createPluginContainer(
336337
if (!combinedMap) {
337338
combinedMap = m as SourceMap
338339
} else {
339-
// merge-source-map will overwrite original sources if newMap also has
340-
// sourcesContent
341-
// @ts-ignore
342-
combinedMap = merge(combinedMap, {
343-
...(m as SourceMap),
344-
sourcesContent: combinedMap.sourcesContent
345-
})
340+
combinedMap = combineSourcemaps(this.filename, [
341+
{
342+
...(m as RawSourceMap),
343+
sourcesContent: combinedMap.sourcesContent
344+
},
345+
combinedMap as RawSourceMap
346+
]) as SourceMap
346347
}
347348
}
348349
if (!combinedMap) {

‎packages/vite/src/node/ssr/ssrTransform.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import {
1010
} from 'estree'
1111
import { extract_names as extractNames } from 'periscopic'
1212
import { walk as eswalk } from 'estree-walker'
13-
import merge from 'merge-source-map'
13+
import { combineSourcemaps } from '../utils'
14+
import { RawSourceMap } from '@ampproject/remapping/dist/types/types'
1415

1516
type Node = _Node & {
1617
start: number
@@ -138,7 +139,7 @@ export async function ssrTransform(
138139
}
139140
}
140141

141-
// 2. convert references to import bindings & import.meta references
142+
// 3. convert references to import bindings & import.meta references
142143
walk(ast, {
143144
onIdentifier(id, parent, parentStack) {
144145
const binding = idToImportMap.get(id.name)
@@ -178,12 +179,15 @@ export async function ssrTransform(
178179
})
179180

180181
let map = s.generateMap({ hires: true })
181-
if (inMap && inMap.mappings) {
182-
map = merge(inMap, {
183-
...map,
184-
sources: inMap.sources,
185-
sourcesContent: inMap.sourcesContent
186-
}) as SourceMap
182+
if (inMap && inMap.mappings && inMap.sources.length > 0) {
183+
map = combineSourcemaps(url, [
184+
{
185+
...map,
186+
sources: inMap.sources,
187+
sourcesContent: inMap.sourcesContent
188+
} as RawSourceMap,
189+
inMap as RawSourceMap
190+
]) as SourceMap
187191
} else {
188192
map.sources = [url]
189193
map.sourcesContent = [code]

0 commit comments

Comments
 (0)