@atlaspack/optimizer-swc 2.16.9 → 2.16.10-dev-fix-sourcemaps-50acc1acf.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +201 -0
- package/dist/SwcOptimizer.js +13 -29
- package/dist/minifyWithSourceMap.js +71 -0
- package/lib/SwcOptimizer.js +13 -47
- package/lib/minifyWithSourceMap.js +108 -0
- package/lib/types/minifyWithSourceMap.d.ts +40 -0
- package/package.json +7 -6
- package/src/SwcOptimizer.ts +18 -29
- package/src/minifyWithSourceMap.ts +104 -0
- package/test/minifyWithSourceMap.test.ts +370 -0
- package/tsconfig.tsbuildinfo +1 -1
package/LICENSE
ADDED
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
Apache License
|
|
2
|
+
Version 2.0, January 2004
|
|
3
|
+
http://www.apache.org/licenses/
|
|
4
|
+
|
|
5
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
6
|
+
|
|
7
|
+
1. Definitions.
|
|
8
|
+
|
|
9
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
10
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
11
|
+
|
|
12
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
13
|
+
the copyright owner that is granting the License.
|
|
14
|
+
|
|
15
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
16
|
+
other entities that control, are controlled by, or are under common
|
|
17
|
+
control with that entity. For the purposes of this definition,
|
|
18
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
19
|
+
direction or management of such entity, whether by contract or
|
|
20
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
21
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
22
|
+
|
|
23
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
24
|
+
exercising permissions granted by this License.
|
|
25
|
+
|
|
26
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
27
|
+
including but not limited to software source code, documentation
|
|
28
|
+
source, and configuration files.
|
|
29
|
+
|
|
30
|
+
"Object" form shall mean any form resulting from mechanical
|
|
31
|
+
transformation or translation of a Source form, including but
|
|
32
|
+
not limited to compiled object code, generated documentation,
|
|
33
|
+
and conversions to other media types.
|
|
34
|
+
|
|
35
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
36
|
+
Object form, made available under the License, as indicated by a
|
|
37
|
+
copyright notice that is included in or attached to the work
|
|
38
|
+
(an example is provided in the Appendix below).
|
|
39
|
+
|
|
40
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
41
|
+
form, that is based on (or derived from) the Work and for which the
|
|
42
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
43
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
44
|
+
of this License, Derivative Works shall not include works that remain
|
|
45
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
46
|
+
the Work and Derivative Works thereof.
|
|
47
|
+
|
|
48
|
+
"Contribution" shall mean any work of authorship, including
|
|
49
|
+
the original version of the Work and any modifications or additions
|
|
50
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
51
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
52
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
53
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
54
|
+
means any form of electronic, verbal, or written communication sent
|
|
55
|
+
to the Licensor or its representatives, including but not limited to
|
|
56
|
+
communication on electronic mailing lists, source code control systems,
|
|
57
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
58
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
59
|
+
excluding communication that is conspicuously marked or otherwise
|
|
60
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
61
|
+
|
|
62
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
63
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
64
|
+
subsequently incorporated within the Work.
|
|
65
|
+
|
|
66
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
67
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
68
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
69
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
70
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
71
|
+
Work and such Derivative Works in Source or Object form.
|
|
72
|
+
|
|
73
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
74
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
75
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
76
|
+
(except as stated in this section) patent license to make, have made,
|
|
77
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
78
|
+
where such license applies only to those patent claims licensable
|
|
79
|
+
by such Contributor that are necessarily infringed by their
|
|
80
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
81
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
82
|
+
institute patent litigation against any entity (including a
|
|
83
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
84
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
85
|
+
or contributory patent infringement, then any patent licenses
|
|
86
|
+
granted to You under this License for that Work shall terminate
|
|
87
|
+
as of the date such litigation is filed.
|
|
88
|
+
|
|
89
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
90
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
91
|
+
modifications, and in Source or Object form, provided that You
|
|
92
|
+
meet the following conditions:
|
|
93
|
+
|
|
94
|
+
(a) You must give any other recipients of the Work or
|
|
95
|
+
Derivative Works a copy of this License; and
|
|
96
|
+
|
|
97
|
+
(b) You must cause any modified files to carry prominent notices
|
|
98
|
+
stating that You changed the files; and
|
|
99
|
+
|
|
100
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
101
|
+
that You distribute, all copyright, patent, trademark, and
|
|
102
|
+
attribution notices from the Source form of the Work,
|
|
103
|
+
excluding those notices that do not pertain to any part of
|
|
104
|
+
the Derivative Works; and
|
|
105
|
+
|
|
106
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
107
|
+
distribution, then any Derivative Works that You distribute must
|
|
108
|
+
include a readable copy of the attribution notices contained
|
|
109
|
+
within such NOTICE file, excluding those notices that do not
|
|
110
|
+
pertain to any part of the Derivative Works, in at least one
|
|
111
|
+
of the following places: within a NOTICE text file distributed
|
|
112
|
+
as part of the Derivative Works; within the Source form or
|
|
113
|
+
documentation, if provided along with the Derivative Works; or,
|
|
114
|
+
within a display generated by the Derivative Works, if and
|
|
115
|
+
wherever such third-party notices normally appear. The contents
|
|
116
|
+
of the NOTICE file are for informational purposes only and
|
|
117
|
+
do not modify the License. You may add Your own attribution
|
|
118
|
+
notices within Derivative Works that You distribute, alongside
|
|
119
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
120
|
+
that such additional attribution notices cannot be construed
|
|
121
|
+
as modifying the License.
|
|
122
|
+
|
|
123
|
+
You may add Your own copyright statement to Your modifications and
|
|
124
|
+
may provide additional or different license terms and conditions
|
|
125
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
126
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
127
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
128
|
+
the conditions stated in this License.
|
|
129
|
+
|
|
130
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
131
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
132
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
133
|
+
this License, without any additional terms or conditions.
|
|
134
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
135
|
+
the terms of any separate license agreement you may have executed
|
|
136
|
+
with Licensor regarding such Contributions.
|
|
137
|
+
|
|
138
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
139
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
140
|
+
except as required for reasonable and customary use in describing the
|
|
141
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
142
|
+
|
|
143
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
144
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
145
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
146
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
147
|
+
implied, including, without limitation, any warranties or conditions
|
|
148
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
149
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
150
|
+
appropriateness of using or redistributing the Work and assume any
|
|
151
|
+
risks associated with Your exercise of permissions under this License.
|
|
152
|
+
|
|
153
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
154
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
155
|
+
unless required by applicable law (such as deliberate and grossly
|
|
156
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
157
|
+
liable to You for damages, including any direct, indirect, special,
|
|
158
|
+
incidental, or consequential damages of any character arising as a
|
|
159
|
+
result of this License or out of the use or inability to use the
|
|
160
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
161
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
162
|
+
other commercial damages or losses), even if such Contributor
|
|
163
|
+
has been advised of the possibility of such damages.
|
|
164
|
+
|
|
165
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
166
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
167
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
168
|
+
or other liability obligations and/or rights consistent with this
|
|
169
|
+
License. However, in accepting such obligations, You may act only
|
|
170
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
171
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
172
|
+
defend, and hold each Contributor harmless for any liability
|
|
173
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
174
|
+
of your accepting any such warranty or additional liability.
|
|
175
|
+
|
|
176
|
+
END OF TERMS AND CONDITIONS
|
|
177
|
+
|
|
178
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
179
|
+
|
|
180
|
+
To apply the Apache License to your work, attach the following
|
|
181
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
182
|
+
replaced with your own identifying information. (Don't include
|
|
183
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
184
|
+
comment syntax for the file format. We also recommend that a
|
|
185
|
+
file or class name and description of purpose be included on the
|
|
186
|
+
same "printed page" as the copyright notice for easier
|
|
187
|
+
identification within third-party archives.
|
|
188
|
+
|
|
189
|
+
Copyright (c) 2024 Atlassian US., Inc.
|
|
190
|
+
|
|
191
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
|
+
you may not use this file except in compliance with the License.
|
|
193
|
+
You may obtain a copy of the License at
|
|
194
|
+
|
|
195
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
196
|
+
|
|
197
|
+
Unless required by applicable law or agreed to in writing, software
|
|
198
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
199
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
200
|
+
See the License for the specific language governing permissions and
|
|
201
|
+
limitations under the License.
|
package/dist/SwcOptimizer.js
CHANGED
|
@@ -36,13 +36,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
const nullthrows_1 = __importDefault(require("nullthrows"));
|
|
40
|
-
const core_1 = require("@swc/core");
|
|
41
39
|
const plugin_1 = require("@atlaspack/plugin");
|
|
42
40
|
const utils_1 = require("@atlaspack/utils");
|
|
43
|
-
const source_map_1 = __importDefault(require("@atlaspack/source-map"));
|
|
44
41
|
const diagnostic_1 = __importStar(require("@atlaspack/diagnostic"));
|
|
45
42
|
const path_1 = __importDefault(require("path"));
|
|
43
|
+
const minifyWithSourceMap_1 = require("./minifyWithSourceMap");
|
|
46
44
|
exports.default = new plugin_1.Optimizer({
|
|
47
45
|
async loadConfig({ config, options }) {
|
|
48
46
|
let userConfig = await config.getConfigFrom(path_1.default.join(options.projectRoot, 'index'), ['.terserrc', '.terserrc.js', '.terserrc.cjs', '.terserrc.mjs']);
|
|
@@ -55,23 +53,15 @@ exports.default = new plugin_1.Optimizer({
|
|
|
55
53
|
let code = await (0, utils_1.blobToString)(contents);
|
|
56
54
|
let result;
|
|
57
55
|
try {
|
|
58
|
-
result = await (0,
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
bundle.env.outputFormat === 'commonjs',
|
|
68
|
-
module: bundle.env.outputFormat === 'esmodule',
|
|
69
|
-
},
|
|
70
|
-
},
|
|
71
|
-
minify: true,
|
|
72
|
-
sourceMaps: !!bundle.env.sourceMap,
|
|
73
|
-
configFile: false,
|
|
74
|
-
swcrc: false,
|
|
56
|
+
result = await (0, minifyWithSourceMap_1.minifyWithSourceMap)(code, bundle.env.sourceMap ? (originalMap ?? null) : null, {
|
|
57
|
+
target: 'es2022',
|
|
58
|
+
mangle: true,
|
|
59
|
+
compress: true,
|
|
60
|
+
toplevel: bundle.env.outputFormat === 'esmodule' ||
|
|
61
|
+
bundle.env.outputFormat === 'commonjs',
|
|
62
|
+
module: bundle.env.outputFormat === 'esmodule',
|
|
63
|
+
userConfig: userConfig,
|
|
64
|
+
projectRoot: options.projectRoot,
|
|
75
65
|
});
|
|
76
66
|
}
|
|
77
67
|
catch (err) {
|
|
@@ -124,15 +114,9 @@ exports.default = new plugin_1.Optimizer({
|
|
|
124
114
|
}
|
|
125
115
|
throw err;
|
|
126
116
|
}
|
|
127
|
-
let
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
if (resultMap) {
|
|
131
|
-
sourceMap = new source_map_1.default(options.projectRoot);
|
|
132
|
-
sourceMap.addVLQMap(JSON.parse(resultMap));
|
|
133
|
-
if (originalMap) {
|
|
134
|
-
sourceMap.extends(originalMap);
|
|
135
|
-
}
|
|
117
|
+
let minifiedContents = result.code;
|
|
118
|
+
const sourceMap = result.map;
|
|
119
|
+
if (sourceMap) {
|
|
136
120
|
let sourcemapReference = await getSourceMapReference(sourceMap);
|
|
137
121
|
if (sourcemapReference) {
|
|
138
122
|
minifiedContents += `\n//# sourceMappingURL=${sourcemapReference}\n`;
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.minifyWithSourceMap = minifyWithSourceMap;
|
|
7
|
+
const nullthrows_1 = __importDefault(require("nullthrows"));
|
|
8
|
+
const core_1 = require("@swc/core");
|
|
9
|
+
const source_map_1 = __importDefault(require("@atlaspack/source-map"));
|
|
10
|
+
/**
|
|
11
|
+
* Minify `code` with SWC and produce a SourceMap whose `original*` positions
|
|
12
|
+
* point back to the sources described by `originalMap`.
|
|
13
|
+
*
|
|
14
|
+
* When `originalMap` is provided, we hand its VLQ-encoded form to SWC via the
|
|
15
|
+
* `inputSourceMap` option. SWC then composes its own (minified -> code) map
|
|
16
|
+
* with the input (code -> original sources) map per-token during
|
|
17
|
+
* minification, producing a final map that points straight back to the
|
|
18
|
+
* original sources.
|
|
19
|
+
*
|
|
20
|
+
* This is much more accurate than composing the maps *after* the fact with
|
|
21
|
+
* `SourceMap.extends(originalMap)`. The post-hoc `extends` approach calls
|
|
22
|
+
* `findClosestMapping`, which snaps each minified token to the previous
|
|
23
|
+
* mapping in the input map. When the input map has many mappings on a single
|
|
24
|
+
* generated line (which is the norm – every asset's tokens get packed onto
|
|
25
|
+
* the same generated line by the packager), "the previous mapping" is often
|
|
26
|
+
* the wrong source/line entirely, producing systematically misaligned maps.
|
|
27
|
+
*/
|
|
28
|
+
async function minifyWithSourceMap(code, originalMap, options = {}) {
|
|
29
|
+
const { target = 'es2022', mangle = true, compress = true, toplevel = false, module: isModule = false, userConfig = {}, projectRoot = '/', } = options;
|
|
30
|
+
let inputSourceMap;
|
|
31
|
+
if (originalMap) {
|
|
32
|
+
// Hand the input map to swc as `inputSourceMap` so swc composes the
|
|
33
|
+
// (minified -> code) and (code -> original sources) maps together
|
|
34
|
+
// per-token during minification. This is more accurate than calling
|
|
35
|
+
// `SourceMap.extends(originalMap)` after the fact, which uses
|
|
36
|
+
// `findClosestMapping` and snaps each minified token to the *nearest*
|
|
37
|
+
// mapping in the input map – losing column precision and sometimes
|
|
38
|
+
// mis-attributing tokens across asset boundaries when the input map
|
|
39
|
+
// has gaps. It also leaks swc's placeholder `<anon>` source into the
|
|
40
|
+
// resulting map's `sources` array.
|
|
41
|
+
// swc requires `version: 3` to parse the input map. The atlaspack
|
|
42
|
+
// SourceMap.toVLQ() helper doesn't include it, so we add it here.
|
|
43
|
+
inputSourceMap = JSON.stringify({ version: 3, ...originalMap.toVLQ() });
|
|
44
|
+
}
|
|
45
|
+
const result = await (0, core_1.transform)(code, {
|
|
46
|
+
jsc: {
|
|
47
|
+
target: target,
|
|
48
|
+
minify: {
|
|
49
|
+
mangle,
|
|
50
|
+
compress,
|
|
51
|
+
...userConfig,
|
|
52
|
+
toplevel,
|
|
53
|
+
module: isModule,
|
|
54
|
+
},
|
|
55
|
+
},
|
|
56
|
+
minify: true,
|
|
57
|
+
sourceMaps: true,
|
|
58
|
+
inputSourceMap,
|
|
59
|
+
configFile: false,
|
|
60
|
+
swcrc: false,
|
|
61
|
+
});
|
|
62
|
+
const minifiedCode = (0, nullthrows_1.default)(result.code);
|
|
63
|
+
if (!result.map) {
|
|
64
|
+
return { code: minifiedCode, map: null };
|
|
65
|
+
}
|
|
66
|
+
// With `inputSourceMap` provided, swc has already composed the maps;
|
|
67
|
+
// the result already references the original sources directly.
|
|
68
|
+
const sourceMap = new source_map_1.default(projectRoot);
|
|
69
|
+
sourceMap.addVLQMap(JSON.parse(result.map));
|
|
70
|
+
return { code: minifiedCode, map: sourceMap };
|
|
71
|
+
}
|
package/lib/SwcOptimizer.js
CHANGED
|
@@ -4,20 +4,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
function _nullthrows() {
|
|
8
|
-
const data = _interopRequireDefault(require("nullthrows"));
|
|
9
|
-
_nullthrows = function () {
|
|
10
|
-
return data;
|
|
11
|
-
};
|
|
12
|
-
return data;
|
|
13
|
-
}
|
|
14
|
-
function _core() {
|
|
15
|
-
const data = require("@swc/core");
|
|
16
|
-
_core = function () {
|
|
17
|
-
return data;
|
|
18
|
-
};
|
|
19
|
-
return data;
|
|
20
|
-
}
|
|
21
7
|
function _plugin() {
|
|
22
8
|
const data = require("@atlaspack/plugin");
|
|
23
9
|
_plugin = function () {
|
|
@@ -32,13 +18,6 @@ function _utils() {
|
|
|
32
18
|
};
|
|
33
19
|
return data;
|
|
34
20
|
}
|
|
35
|
-
function _sourceMap() {
|
|
36
|
-
const data = _interopRequireDefault(require("@atlaspack/source-map"));
|
|
37
|
-
_sourceMap = function () {
|
|
38
|
-
return data;
|
|
39
|
-
};
|
|
40
|
-
return data;
|
|
41
|
-
}
|
|
42
21
|
function _diagnostic() {
|
|
43
22
|
const data = _interopRequireWildcard(require("@atlaspack/diagnostic"));
|
|
44
23
|
_diagnostic = function () {
|
|
@@ -53,8 +32,9 @@ function _path() {
|
|
|
53
32
|
};
|
|
54
33
|
return data;
|
|
55
34
|
}
|
|
56
|
-
|
|
35
|
+
var _minifyWithSourceMap = require("./minifyWithSourceMap");
|
|
57
36
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
37
|
+
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
58
38
|
var _default = exports.default = new (_plugin().Optimizer)({
|
|
59
39
|
async loadConfig({
|
|
60
40
|
config,
|
|
@@ -80,22 +60,14 @@ var _default = exports.default = new (_plugin().Optimizer)({
|
|
|
80
60
|
let code = await (0, _utils().blobToString)(contents);
|
|
81
61
|
let result;
|
|
82
62
|
try {
|
|
83
|
-
result = await (0,
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
toplevel: bundle.env.outputFormat === 'esmodule' || bundle.env.outputFormat === 'commonjs',
|
|
92
|
-
module: bundle.env.outputFormat === 'esmodule'
|
|
93
|
-
}
|
|
94
|
-
},
|
|
95
|
-
minify: true,
|
|
96
|
-
sourceMaps: !!bundle.env.sourceMap,
|
|
97
|
-
configFile: false,
|
|
98
|
-
swcrc: false
|
|
63
|
+
result = await (0, _minifyWithSourceMap.minifyWithSourceMap)(code, bundle.env.sourceMap ? originalMap ?? null : null, {
|
|
64
|
+
target: 'es2022',
|
|
65
|
+
mangle: true,
|
|
66
|
+
compress: true,
|
|
67
|
+
toplevel: bundle.env.outputFormat === 'esmodule' || bundle.env.outputFormat === 'commonjs',
|
|
68
|
+
module: bundle.env.outputFormat === 'esmodule',
|
|
69
|
+
userConfig: userConfig,
|
|
70
|
+
projectRoot: options.projectRoot
|
|
99
71
|
});
|
|
100
72
|
} catch (err) {
|
|
101
73
|
// SWC doesn't give us nice error objects, so we need to parse the message.
|
|
@@ -148,15 +120,9 @@ var _default = exports.default = new (_plugin().Optimizer)({
|
|
|
148
120
|
}
|
|
149
121
|
throw err;
|
|
150
122
|
}
|
|
151
|
-
let
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
if (resultMap) {
|
|
155
|
-
sourceMap = new (_sourceMap().default)(options.projectRoot);
|
|
156
|
-
sourceMap.addVLQMap(JSON.parse(resultMap));
|
|
157
|
-
if (originalMap) {
|
|
158
|
-
sourceMap.extends(originalMap);
|
|
159
|
-
}
|
|
123
|
+
let minifiedContents = result.code;
|
|
124
|
+
const sourceMap = result.map;
|
|
125
|
+
if (sourceMap) {
|
|
160
126
|
let sourcemapReference = await getSourceMapReference(sourceMap);
|
|
161
127
|
if (sourcemapReference) {
|
|
162
128
|
minifiedContents += `\n//# sourceMappingURL=${sourcemapReference}\n`;
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.minifyWithSourceMap = minifyWithSourceMap;
|
|
7
|
+
function _nullthrows() {
|
|
8
|
+
const data = _interopRequireDefault(require("nullthrows"));
|
|
9
|
+
_nullthrows = function () {
|
|
10
|
+
return data;
|
|
11
|
+
};
|
|
12
|
+
return data;
|
|
13
|
+
}
|
|
14
|
+
function _core() {
|
|
15
|
+
const data = require("@swc/core");
|
|
16
|
+
_core = function () {
|
|
17
|
+
return data;
|
|
18
|
+
};
|
|
19
|
+
return data;
|
|
20
|
+
}
|
|
21
|
+
function _sourceMap() {
|
|
22
|
+
const data = _interopRequireDefault(require("@atlaspack/source-map"));
|
|
23
|
+
_sourceMap = function () {
|
|
24
|
+
return data;
|
|
25
|
+
};
|
|
26
|
+
return data;
|
|
27
|
+
}
|
|
28
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
29
|
+
/**
|
|
30
|
+
* Minify `code` with SWC and produce a SourceMap whose `original*` positions
|
|
31
|
+
* point back to the sources described by `originalMap`.
|
|
32
|
+
*
|
|
33
|
+
* When `originalMap` is provided, we hand its VLQ-encoded form to SWC via the
|
|
34
|
+
* `inputSourceMap` option. SWC then composes its own (minified -> code) map
|
|
35
|
+
* with the input (code -> original sources) map per-token during
|
|
36
|
+
* minification, producing a final map that points straight back to the
|
|
37
|
+
* original sources.
|
|
38
|
+
*
|
|
39
|
+
* This is much more accurate than composing the maps *after* the fact with
|
|
40
|
+
* `SourceMap.extends(originalMap)`. The post-hoc `extends` approach calls
|
|
41
|
+
* `findClosestMapping`, which snaps each minified token to the previous
|
|
42
|
+
* mapping in the input map. When the input map has many mappings on a single
|
|
43
|
+
* generated line (which is the norm – every asset's tokens get packed onto
|
|
44
|
+
* the same generated line by the packager), "the previous mapping" is often
|
|
45
|
+
* the wrong source/line entirely, producing systematically misaligned maps.
|
|
46
|
+
*/
|
|
47
|
+
async function minifyWithSourceMap(code, originalMap, options = {}) {
|
|
48
|
+
const {
|
|
49
|
+
target = 'es2022',
|
|
50
|
+
mangle = true,
|
|
51
|
+
compress = true,
|
|
52
|
+
toplevel = false,
|
|
53
|
+
module: isModule = false,
|
|
54
|
+
userConfig = {},
|
|
55
|
+
projectRoot = '/'
|
|
56
|
+
} = options;
|
|
57
|
+
let inputSourceMap;
|
|
58
|
+
if (originalMap) {
|
|
59
|
+
// Hand the input map to swc as `inputSourceMap` so swc composes the
|
|
60
|
+
// (minified -> code) and (code -> original sources) maps together
|
|
61
|
+
// per-token during minification. This is more accurate than calling
|
|
62
|
+
// `SourceMap.extends(originalMap)` after the fact, which uses
|
|
63
|
+
// `findClosestMapping` and snaps each minified token to the *nearest*
|
|
64
|
+
// mapping in the input map – losing column precision and sometimes
|
|
65
|
+
// mis-attributing tokens across asset boundaries when the input map
|
|
66
|
+
// has gaps. It also leaks swc's placeholder `<anon>` source into the
|
|
67
|
+
// resulting map's `sources` array.
|
|
68
|
+
// swc requires `version: 3` to parse the input map. The atlaspack
|
|
69
|
+
// SourceMap.toVLQ() helper doesn't include it, so we add it here.
|
|
70
|
+
inputSourceMap = JSON.stringify({
|
|
71
|
+
version: 3,
|
|
72
|
+
...originalMap.toVLQ()
|
|
73
|
+
});
|
|
74
|
+
}
|
|
75
|
+
const result = await (0, _core().transform)(code, {
|
|
76
|
+
jsc: {
|
|
77
|
+
target: target,
|
|
78
|
+
minify: {
|
|
79
|
+
mangle,
|
|
80
|
+
compress,
|
|
81
|
+
...userConfig,
|
|
82
|
+
toplevel,
|
|
83
|
+
module: isModule
|
|
84
|
+
}
|
|
85
|
+
},
|
|
86
|
+
minify: true,
|
|
87
|
+
sourceMaps: true,
|
|
88
|
+
inputSourceMap,
|
|
89
|
+
configFile: false,
|
|
90
|
+
swcrc: false
|
|
91
|
+
});
|
|
92
|
+
const minifiedCode = (0, _nullthrows().default)(result.code);
|
|
93
|
+
if (!result.map) {
|
|
94
|
+
return {
|
|
95
|
+
code: minifiedCode,
|
|
96
|
+
map: null
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
// With `inputSourceMap` provided, swc has already composed the maps;
|
|
101
|
+
// the result already references the original sources directly.
|
|
102
|
+
const sourceMap = new (_sourceMap().default)(projectRoot);
|
|
103
|
+
sourceMap.addVLQMap(JSON.parse(result.map));
|
|
104
|
+
return {
|
|
105
|
+
code: minifiedCode,
|
|
106
|
+
map: sourceMap
|
|
107
|
+
};
|
|
108
|
+
}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import SourceMap from '@atlaspack/source-map';
|
|
2
|
+
export type MinifyOptions = {
|
|
3
|
+
/** ES target for SWC. */
|
|
4
|
+
target?: string;
|
|
5
|
+
/** Whether to enable name mangling. */
|
|
6
|
+
mangle?: boolean;
|
|
7
|
+
/** Whether to enable compression. */
|
|
8
|
+
compress?: boolean;
|
|
9
|
+
/** Mark output as a top-level module (esmodule/commonjs). */
|
|
10
|
+
toplevel?: boolean;
|
|
11
|
+
/** Treat the input as an ES module. */
|
|
12
|
+
module?: boolean;
|
|
13
|
+
/** Extra terser-style overrides forwarded into `jsc.minify`. */
|
|
14
|
+
userConfig?: Record<string, unknown>;
|
|
15
|
+
/** Project root used when constructing the SourceMap instance. */
|
|
16
|
+
projectRoot?: string;
|
|
17
|
+
};
|
|
18
|
+
export type MinifyResult = {
|
|
19
|
+
code: string;
|
|
20
|
+
map: SourceMap | null;
|
|
21
|
+
};
|
|
22
|
+
/**
|
|
23
|
+
* Minify `code` with SWC and produce a SourceMap whose `original*` positions
|
|
24
|
+
* point back to the sources described by `originalMap`.
|
|
25
|
+
*
|
|
26
|
+
* When `originalMap` is provided, we hand its VLQ-encoded form to SWC via the
|
|
27
|
+
* `inputSourceMap` option. SWC then composes its own (minified -> code) map
|
|
28
|
+
* with the input (code -> original sources) map per-token during
|
|
29
|
+
* minification, producing a final map that points straight back to the
|
|
30
|
+
* original sources.
|
|
31
|
+
*
|
|
32
|
+
* This is much more accurate than composing the maps *after* the fact with
|
|
33
|
+
* `SourceMap.extends(originalMap)`. The post-hoc `extends` approach calls
|
|
34
|
+
* `findClosestMapping`, which snaps each minified token to the previous
|
|
35
|
+
* mapping in the input map. When the input map has many mappings on a single
|
|
36
|
+
* generated line (which is the norm – every asset's tokens get packed onto
|
|
37
|
+
* the same generated line by the packager), "the previous mapping" is often
|
|
38
|
+
* the wrong source/line entirely, producing systematically misaligned maps.
|
|
39
|
+
*/
|
|
40
|
+
export declare function minifyWithSourceMap(code: string, originalMap: SourceMap | null, options?: MinifyOptions): Promise<MinifyResult>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/optimizer-swc",
|
|
3
|
-
"version": "2.16.
|
|
3
|
+
"version": "2.16.10-dev-fix-sourcemaps-50acc1acf.0",
|
|
4
4
|
"license": "(MIT OR Apache-2.0)",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -16,15 +16,16 @@
|
|
|
16
16
|
"node": ">= 16.0.0"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@atlaspack/diagnostic": "2.14.
|
|
20
|
-
"@atlaspack/plugin": "2.14.
|
|
21
|
-
"@atlaspack/source-map": "3.3.
|
|
22
|
-
"@atlaspack/utils": "3.4.
|
|
19
|
+
"@atlaspack/diagnostic": "2.14.5-dev-fix-sourcemaps-50acc1acf.0",
|
|
20
|
+
"@atlaspack/plugin": "2.14.64-dev-fix-sourcemaps-50acc1acf.0",
|
|
21
|
+
"@atlaspack/source-map": "3.3.8-dev-fix-sourcemaps-50acc1acf.0",
|
|
22
|
+
"@atlaspack/utils": "3.4.6-dev-fix-sourcemaps-50acc1acf.0",
|
|
23
23
|
"@swc/core": "1.15.11",
|
|
24
24
|
"nullthrows": "^1.1.1"
|
|
25
25
|
},
|
|
26
26
|
"type": "commonjs",
|
|
27
27
|
"scripts": {
|
|
28
28
|
"build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
|
|
29
|
-
}
|
|
29
|
+
},
|
|
30
|
+
"gitHead": "50acc1acf31d5c8415a8154841a8ed09264e665a"
|
|
30
31
|
}
|