Skip to content

Commit 0a6048a

Browse files
authored
chore(deps): migrate to @jridgewell/remapping from @ampproject/remapping (vitejs#20577)
1 parent 9139607 commit 0a6048a

File tree

9 files changed

+26
-254
lines changed

9 files changed

+26
-254
lines changed

packages/vite/LICENSE.md

Lines changed: 4 additions & 240 deletions
Original file line numberDiff line numberDiff line change
@@ -25,224 +25,15 @@ SOFTWARE.
2525

2626
# Licenses of bundled dependencies
2727
The published Vite artifact additionally contains code with the following licenses:
28-
Apache-2.0, BSD-2-Clause, CC0-1.0, ISC, MIT
28+
BSD-2-Clause, CC0-1.0, ISC, MIT
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 [yyyy] [name of copyright owner]
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-
240-
## @jridgewell/gen-mapping, @jridgewell/set-array
31+
## @jridgewell/gen-mapping, @jridgewell/remapping, @jridgewell/trace-mapping
24132
License: MIT
24233
By: Justin Ridgewell
243-
Repositories: https://github.com/jridgewell/gen-mapping, https://github.com/jridgewell/set-array
34+
Repositories: git+https://github.com/jridgewell/sourcemaps.git, git+https://github.com/jridgewell/sourcemaps.git, git+https://github.com/jridgewell/sourcemaps.git
24435

245-
> Copyright 2022 Justin Ridgewell <[email protected]>
36+
> Copyright 2024 Justin Ridgewell <[email protected]>
24637
>
24738
> Permission is hereby granted, free of charge, to any person obtaining a copy
24839
> of this software and associated documentation files (the "Software"), to deal
@@ -320,33 +111,6 @@ Repository: git+https://github.com/jridgewell/sourcemap-codec.git
320111
321112
---------------------------------------
322113

323-
## @jridgewell/trace-mapping
324-
License: MIT
325-
By: Justin Ridgewell
326-
Repository: git+https://github.com/jridgewell/sourcemaps.git
327-
328-
> Copyright 2024 Justin Ridgewell <[email protected]>
329-
>
330-
> Permission is hereby granted, free of charge, to any person obtaining a copy
331-
> of this software and associated documentation files (the "Software"), to deal
332-
> in the Software without restriction, including without limitation the rights
333-
> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
334-
> copies of the Software, and to permit persons to whom the Software is
335-
> furnished to do so, subject to the following conditions:
336-
>
337-
> The above copyright notice and this permission notice shall be included in
338-
> all copies or substantial portions of the Software.
339-
>
340-
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
341-
> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
342-
> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
343-
> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
344-
> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
345-
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
346-
> SOFTWARE.
347-
348-
---------------------------------------
349-
350114
## @polka/compression
351115
License: MIT
352116
Repository: lukeed/polka

packages/vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@
9292
"fsevents": "~2.3.3"
9393
},
9494
"devDependencies": {
95-
"@ampproject/remapping": "^2.3.0",
9695
"@babel/parser": "^7.28.0",
96+
"@jridgewell/remapping": "^2.3.0",
9797
"@jridgewell/trace-mapping": "^0.3.29",
9898
"@oxc-project/types": "0.77.0",
9999
"@polka/compression": "^1.0.0-next.25",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import type Less from 'less'
2424
import type { LightningCSSOptions } from 'types/internal/lightningcssOptions'
2525
import type { TransformOptions } from 'esbuild'
2626
import { formatMessages, transform } from 'esbuild'
27-
import type { RawSourceMap } from '@ampproject/remapping'
27+
import type { RawSourceMap } from '@jridgewell/remapping'
2828
import { WorkerWithFallback } from 'artichokie'
2929
import { globSync } from 'tinyglobby'
3030
import type {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type {
77
TransformResult,
88
} from 'esbuild'
99
import { transform } from 'esbuild'
10-
import type { RawSourceMap } from '@ampproject/remapping'
10+
import type { RawSourceMap } from '@jridgewell/remapping'
1111
import type { InternalModuleFormat, SourceMap } from 'rollup'
1212
import type { TSConfckParseResult } from 'tsconfck'
1313
import { TSConfckCache, TSConfckParseError, parse } from 'tsconfck'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type {
66
} from 'es-module-lexer'
77
import { init, parse as parseImports } from 'es-module-lexer'
88
import type { SourceMap } from 'rollup'
9-
import type { RawSourceMap } from '@ampproject/remapping'
9+
import type { RawSourceMap } from '@jridgewell/remapping'
1010
import convertSourceMap from 'convert-source-map'
1111
import { exactRegex } from '@rolldown/pluginutils'
1212
import { combineSourcemaps, generateCodeFrame, numberToPos } from '../utils'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ import type {
6060
SourceMap,
6161
TransformResult,
6262
} from 'rollup'
63-
import type { RawSourceMap } from '@ampproject/remapping'
63+
import type { RawSourceMap } from '@jridgewell/remapping'
6464
import { TraceMap, originalPositionFor } from '@jridgewell/trace-mapping'
6565
import MagicString from 'magic-string'
6666
import type { FSWatcher } from 'dep-types/chokidar'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import type {
1616
} from 'estree'
1717
import { extract_names as extractNames } from 'periscopic'
1818
import { walk as eswalk } from 'estree-walker'
19-
import type { RawSourceMap } from '@ampproject/remapping'
19+
import type { RawSourceMap } from '@jridgewell/remapping'
2020
import { parseAstAsync as rollupParseAstAsync } from 'rollup/parseAst'
2121
import type { TransformResult } from '../server/transformRequest'
2222
import {

packages/vite/src/node/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import { performance } from 'node:perf_hooks'
1212
import type { AddressInfo, Server } from 'node:net'
1313
import fsp from 'node:fs/promises'
1414
import type { FSWatcher } from 'dep-types/chokidar'
15-
import remapping from '@ampproject/remapping'
16-
import type { DecodedSourceMap, RawSourceMap } from '@ampproject/remapping'
15+
import remapping from '@jridgewell/remapping'
16+
import type { DecodedSourceMap, RawSourceMap } from '@jridgewell/remapping'
1717
import colors from 'picocolors'
1818
import debug from 'debug'
1919
import type { Alias, AliasOptions } from 'dep-types/alias'

pnpm-lock.yaml

Lines changed: 14 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)