@atlaspack/core 2.25.1 → 2.25.2-dev-af891f2f6.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/Atlaspack.js +1 -1
- package/dist/BundleGraph.js +9 -2
- package/dist/CommittedAsset.js +1 -1
- package/dist/Transformation.js +3 -2
- package/dist/UncommittedAsset.js +3 -3
- package/dist/assetUtils.js +2 -1
- package/dist/atlaspack-v3/worker/compat/mutable-asset.js +1 -1
- package/dist/worker.js +1 -1
- package/lib/Atlaspack.js +1 -1
- package/lib/BundleGraph.js +7 -2
- package/lib/CommittedAsset.js +1 -1
- package/lib/Transformation.js +9 -4
- package/lib/UncommittedAsset.js +3 -3
- package/lib/assetUtils.js +8 -1
- package/lib/atlaspack-v3/worker/compat/mutable-asset.js +1 -1
- package/lib/types/CommittedAsset.d.ts +1 -1
- package/lib/types/PackagerRunner.d.ts +1 -1
- package/lib/types/UncommittedAsset.d.ts +1 -1
- package/lib/types/atlaspack-v3/worker/compat/mutable-asset.d.ts +1 -1
- package/lib/types/public/Asset.d.ts +1 -1
- package/lib/worker.js +1 -1
- package/package.json +22 -21
- package/src/Atlaspack.ts +1 -1
- package/src/BundleGraph.ts +18 -7
- package/src/CommittedAsset.ts +1 -1
- package/src/PackagerRunner.ts +1 -1
- package/src/Transformation.ts +3 -2
- package/src/UncommittedAsset.ts +3 -3
- package/src/assetUtils.ts +2 -1
- package/src/atlaspack-v3/worker/compat/mutable-asset.ts +1 -1
- package/src/public/Asset.ts +1 -1
- package/src/worker.ts +1 -1
- 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/Atlaspack.js
CHANGED
|
@@ -76,7 +76,7 @@ const PathRequest_1 = __importDefault(require("./requests/PathRequest"));
|
|
|
76
76
|
const Environment_1 = require("./Environment");
|
|
77
77
|
const Dependency_1 = require("./Dependency");
|
|
78
78
|
const events_2 = require("@atlaspack/events");
|
|
79
|
-
const source_map_1 = require("@
|
|
79
|
+
const source_map_1 = require("@atlaspack/source-map");
|
|
80
80
|
const cache_1 = require("@atlaspack/cache");
|
|
81
81
|
const rust_1 = require("@atlaspack/rust");
|
|
82
82
|
const projectPath_1 = require("./projectPath");
|
package/dist/BundleGraph.js
CHANGED
|
@@ -249,8 +249,15 @@ class BundleGraph {
|
|
|
249
249
|
loc: reexportAllLoc,
|
|
250
250
|
});
|
|
251
251
|
if (node.value.sourceAssetId != null) {
|
|
252
|
-
let sourceAssetId
|
|
253
|
-
|
|
252
|
+
let sourceAssetId;
|
|
253
|
+
if ((0, feature_flags_1.getFeatureFlag)('sourceAssetIdBundleGraphFix')) {
|
|
254
|
+
[sourceAssetId] =
|
|
255
|
+
assetGraph.getNodeIdsConnectedTo(nodeId);
|
|
256
|
+
}
|
|
257
|
+
else {
|
|
258
|
+
sourceAssetId = assetGraph.getNodeIdByContentKey(node.value.sourceAssetId);
|
|
259
|
+
}
|
|
260
|
+
let sourceAsset = (0, nullthrows_1.default)(graph.getNode((0, nullthrows_1.default)(assetGraphNodeIdToBundleGraphNodeId.get(sourceAssetId))));
|
|
254
261
|
(0, assert_2.default)(sourceAsset.type === 'asset');
|
|
255
262
|
let sourceAssetSymbols = sourceAsset.value.symbols;
|
|
256
263
|
if (sourceAssetSymbols) {
|
package/dist/CommittedAsset.js
CHANGED
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const stream_1 = require("stream");
|
|
7
7
|
const build_cache_1 = require("@atlaspack/build-cache");
|
|
8
8
|
const utils_1 = require("@atlaspack/utils");
|
|
9
|
-
const source_map_1 = __importDefault(require("@
|
|
9
|
+
const source_map_1 = __importDefault(require("@atlaspack/source-map"));
|
|
10
10
|
const assetUtils_1 = require("./assetUtils");
|
|
11
11
|
class CommittedAsset {
|
|
12
12
|
constructor(value, options) {
|
package/dist/Transformation.js
CHANGED
|
@@ -58,6 +58,7 @@ const projectPath_1 = require("./projectPath");
|
|
|
58
58
|
const utils_3 = require("./utils");
|
|
59
59
|
const assert_1 = __importDefault(require("assert"));
|
|
60
60
|
const profiler_1 = require("@atlaspack/profiler");
|
|
61
|
+
const source_map_1 = __importDefault(require("@atlaspack/source-map"));
|
|
61
62
|
const feature_flags_1 = require("@atlaspack/feature-flags");
|
|
62
63
|
class Transformation {
|
|
63
64
|
constructor({ request, options, config, workerApi }) {
|
|
@@ -316,7 +317,7 @@ class Transformation {
|
|
|
316
317
|
if (asset.isASTDirty && asset.generate) {
|
|
317
318
|
let output = await asset.generate();
|
|
318
319
|
asset.content = output.content;
|
|
319
|
-
asset.mapBuffer = output.map
|
|
320
|
+
asset.mapBuffer = source_map_1.default.safeToBuffer(output.map);
|
|
320
321
|
}
|
|
321
322
|
asset.clearAST();
|
|
322
323
|
}));
|
|
@@ -415,7 +416,7 @@ class Transformation {
|
|
|
415
416
|
asset.generate) {
|
|
416
417
|
let output = await asset.generate();
|
|
417
418
|
asset.content = output.content;
|
|
418
|
-
asset.mapBuffer = output.map
|
|
419
|
+
asset.mapBuffer = source_map_1.default.safeToBuffer(output.map);
|
|
419
420
|
}
|
|
420
421
|
// Load config for the transformer.
|
|
421
422
|
let config = preloadedConfig;
|
package/dist/UncommittedAsset.js
CHANGED
|
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const assert_1 = __importDefault(require("assert"));
|
|
7
7
|
const stream_1 = require("stream");
|
|
8
|
-
const source_map_1 = __importDefault(require("@
|
|
8
|
+
const source_map_1 = __importDefault(require("@atlaspack/source-map"));
|
|
9
9
|
const build_cache_1 = require("@atlaspack/build-cache");
|
|
10
10
|
const utils_1 = require("@atlaspack/utils");
|
|
11
11
|
const rust_1 = require("@atlaspack/rust");
|
|
@@ -163,7 +163,7 @@ class UncommittedAsset {
|
|
|
163
163
|
});
|
|
164
164
|
if (map) {
|
|
165
165
|
this.map = map;
|
|
166
|
-
this.mapBuffer =
|
|
166
|
+
this.mapBuffer = source_map_1.default.safeToBuffer(map);
|
|
167
167
|
this.setCode(code.replace(utils_1.SOURCEMAP_RE, ''));
|
|
168
168
|
}
|
|
169
169
|
return this.map;
|
|
@@ -295,7 +295,7 @@ class UncommittedAsset {
|
|
|
295
295
|
content,
|
|
296
296
|
ast: result.ast,
|
|
297
297
|
isASTDirty: result.ast === this.ast ? this.isASTDirty : true,
|
|
298
|
-
mapBuffer:
|
|
298
|
+
mapBuffer: source_map_1.default.safeToBuffer(result.map),
|
|
299
299
|
code: this.code,
|
|
300
300
|
invalidations: this.invalidations,
|
|
301
301
|
});
|
package/dist/assetUtils.js
CHANGED
|
@@ -23,6 +23,7 @@ const types_1 = require("./types");
|
|
|
23
23
|
const profiler_1 = require("@atlaspack/profiler");
|
|
24
24
|
const IdentifierRegistry_1 = require("./IdentifierRegistry");
|
|
25
25
|
const EnvironmentManager_1 = require("./EnvironmentManager");
|
|
26
|
+
const source_map_1 = __importDefault(require("@atlaspack/source-map"));
|
|
26
27
|
function createAssetIdFromOptions(options) {
|
|
27
28
|
const data = {
|
|
28
29
|
environmentId: (0, EnvironmentManager_1.toEnvironmentId)(options.env),
|
|
@@ -102,7 +103,7 @@ async function _generateFromAST(asset) {
|
|
|
102
103
|
logger: new logger_1.PluginLogger({ origin: pluginName }),
|
|
103
104
|
tracer: new profiler_1.PluginTracer({ origin: pluginName, category: 'asset-generate' }),
|
|
104
105
|
});
|
|
105
|
-
let mapBuffer = map
|
|
106
|
+
let mapBuffer = source_map_1.default.safeToBuffer(map);
|
|
106
107
|
// Store the results in the cache so we can avoid generating again next time
|
|
107
108
|
await Promise.all([
|
|
108
109
|
asset.options.cache.setStream((0, nullthrows_1.default)(asset.value.contentKey), (0, utils_1.blobToStream)(content)),
|
|
@@ -16,7 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
16
16
|
var _MutableAsset_astDirty, _MutableAsset_ast, _MutableAsset_contents, _MutableAsset_inner, _MutableAsset_map, _MutableAsset_projectRoot, _MutableAsset_sourceMap;
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.MutableAsset = void 0;
|
|
19
|
-
const source_map_1 = __importDefault(require("@
|
|
19
|
+
const source_map_1 = __importDefault(require("@atlaspack/source-map"));
|
|
20
20
|
const stream_1 = require("stream");
|
|
21
21
|
const bitflags_1 = require("./bitflags");
|
|
22
22
|
const asset_symbols_1 = require("./asset-symbols");
|
package/dist/worker.js
CHANGED
|
@@ -21,7 +21,7 @@ const Validation_1 = __importDefault(require("./Validation"));
|
|
|
21
21
|
const AtlaspackConfig_1 = require("./AtlaspackConfig");
|
|
22
22
|
const registerCoreWithSerializer_1 = require("./registerCoreWithSerializer");
|
|
23
23
|
const build_cache_1 = require("@atlaspack/build-cache");
|
|
24
|
-
const source_map_1 = require("@
|
|
24
|
+
const source_map_1 = require("@atlaspack/source-map");
|
|
25
25
|
// @ts-expect-error TS2305
|
|
26
26
|
const rust_1 = require("@atlaspack/rust");
|
|
27
27
|
const workers_1 = __importDefault(require("@atlaspack/workers"));
|
package/lib/Atlaspack.js
CHANGED
|
@@ -80,7 +80,7 @@ var _PathRequest = _interopRequireDefault(require("./requests/PathRequest"));
|
|
|
80
80
|
var _Environment = require("./Environment");
|
|
81
81
|
var _Dependency = require("./Dependency");
|
|
82
82
|
function _sourceMap() {
|
|
83
|
-
const data = require("@
|
|
83
|
+
const data = require("@atlaspack/source-map");
|
|
84
84
|
_sourceMap = function () {
|
|
85
85
|
return data;
|
|
86
86
|
};
|
package/lib/BundleGraph.js
CHANGED
|
@@ -298,8 +298,13 @@ class BundleGraph {
|
|
|
298
298
|
loc: reexportAllLoc
|
|
299
299
|
});
|
|
300
300
|
if (node.value.sourceAssetId != null) {
|
|
301
|
-
let sourceAssetId
|
|
302
|
-
|
|
301
|
+
let sourceAssetId;
|
|
302
|
+
if ((0, _featureFlags().getFeatureFlag)('sourceAssetIdBundleGraphFix')) {
|
|
303
|
+
[sourceAssetId] = assetGraph.getNodeIdsConnectedTo(nodeId);
|
|
304
|
+
} else {
|
|
305
|
+
sourceAssetId = assetGraph.getNodeIdByContentKey(node.value.sourceAssetId);
|
|
306
|
+
}
|
|
307
|
+
let sourceAsset = (0, _nullthrows().default)(graph.getNode((0, _nullthrows().default)(assetGraphNodeIdToBundleGraphNodeId.get(sourceAssetId))));
|
|
303
308
|
(0, _assert().default)(sourceAsset.type === 'asset');
|
|
304
309
|
let sourceAssetSymbols = sourceAsset.value.symbols;
|
|
305
310
|
if (sourceAssetSymbols) {
|
package/lib/CommittedAsset.js
CHANGED
|
@@ -26,7 +26,7 @@ function _utils() {
|
|
|
26
26
|
return data;
|
|
27
27
|
}
|
|
28
28
|
function _sourceMap() {
|
|
29
|
-
const data = _interopRequireDefault(require("@
|
|
29
|
+
const data = _interopRequireDefault(require("@atlaspack/source-map"));
|
|
30
30
|
_sourceMap = function () {
|
|
31
31
|
return data;
|
|
32
32
|
};
|
package/lib/Transformation.js
CHANGED
|
@@ -72,6 +72,13 @@ function _profiler() {
|
|
|
72
72
|
};
|
|
73
73
|
return data;
|
|
74
74
|
}
|
|
75
|
+
function _sourceMap() {
|
|
76
|
+
const data = _interopRequireDefault(require("@atlaspack/source-map"));
|
|
77
|
+
_sourceMap = function () {
|
|
78
|
+
return data;
|
|
79
|
+
};
|
|
80
|
+
return data;
|
|
81
|
+
}
|
|
75
82
|
function _featureFlags() {
|
|
76
83
|
const data = require("@atlaspack/feature-flags");
|
|
77
84
|
_featureFlags = function () {
|
|
@@ -343,10 +350,9 @@ class Transformation {
|
|
|
343
350
|
// generate all assets in a large bundle during packaging.
|
|
344
351
|
await Promise.all(resultingAssets.filter(asset => asset.ast != null && !(this.options.mode === 'production' && asset.value.type === 'css' && asset.value.symbols)).map(async asset => {
|
|
345
352
|
if (asset.isASTDirty && asset.generate) {
|
|
346
|
-
var _output$map;
|
|
347
353
|
let output = await asset.generate();
|
|
348
354
|
asset.content = output.content;
|
|
349
|
-
asset.mapBuffer = (
|
|
355
|
+
asset.mapBuffer = _sourceMap().default.safeToBuffer(output.map);
|
|
350
356
|
}
|
|
351
357
|
asset.clearAST();
|
|
352
358
|
}));
|
|
@@ -453,10 +459,9 @@ class Transformation {
|
|
|
453
459
|
logger,
|
|
454
460
|
tracer
|
|
455
461
|
})) && asset.generate) {
|
|
456
|
-
var _output$map2;
|
|
457
462
|
let output = await asset.generate();
|
|
458
463
|
asset.content = output.content;
|
|
459
|
-
asset.mapBuffer = (
|
|
464
|
+
asset.mapBuffer = _sourceMap().default.safeToBuffer(output.map);
|
|
460
465
|
}
|
|
461
466
|
|
|
462
467
|
// Load config for the transformer.
|
package/lib/UncommittedAsset.js
CHANGED
|
@@ -19,7 +19,7 @@ function _stream() {
|
|
|
19
19
|
return data;
|
|
20
20
|
}
|
|
21
21
|
function _sourceMap() {
|
|
22
|
-
const data = _interopRequireDefault(require("@
|
|
22
|
+
const data = _interopRequireDefault(require("@atlaspack/source-map"));
|
|
23
23
|
_sourceMap = function () {
|
|
24
24
|
return data;
|
|
25
25
|
};
|
|
@@ -218,7 +218,7 @@ class UncommittedAsset {
|
|
|
218
218
|
});
|
|
219
219
|
if (map) {
|
|
220
220
|
this.map = map;
|
|
221
|
-
this.mapBuffer =
|
|
221
|
+
this.mapBuffer = _sourceMap().default.safeToBuffer(map);
|
|
222
222
|
this.setCode(code.replace(_utils().SOURCEMAP_RE, ''));
|
|
223
223
|
}
|
|
224
224
|
return this.map;
|
|
@@ -349,7 +349,7 @@ class UncommittedAsset {
|
|
|
349
349
|
content,
|
|
350
350
|
ast: result.ast,
|
|
351
351
|
isASTDirty: result.ast === this.ast ? this.isASTDirty : true,
|
|
352
|
-
mapBuffer:
|
|
352
|
+
mapBuffer: _sourceMap().default.safeToBuffer(result.map),
|
|
353
353
|
code: this.code,
|
|
354
354
|
invalidations: this.invalidations
|
|
355
355
|
});
|
package/lib/assetUtils.js
CHANGED
|
@@ -65,6 +65,13 @@ function _profiler() {
|
|
|
65
65
|
}
|
|
66
66
|
var _IdentifierRegistry = require("./IdentifierRegistry");
|
|
67
67
|
var _EnvironmentManager = require("./EnvironmentManager");
|
|
68
|
+
function _sourceMap() {
|
|
69
|
+
const data = _interopRequireDefault(require("@atlaspack/source-map"));
|
|
70
|
+
_sourceMap = function () {
|
|
71
|
+
return data;
|
|
72
|
+
};
|
|
73
|
+
return data;
|
|
74
|
+
}
|
|
68
75
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
69
76
|
function createAssetIdFromOptions(options) {
|
|
70
77
|
const data = {
|
|
@@ -150,7 +157,7 @@ async function _generateFromAST(asset) {
|
|
|
150
157
|
category: 'asset-generate'
|
|
151
158
|
})
|
|
152
159
|
});
|
|
153
|
-
let mapBuffer =
|
|
160
|
+
let mapBuffer = _sourceMap().default.safeToBuffer(map);
|
|
154
161
|
// Store the results in the cache so we can avoid generating again next time
|
|
155
162
|
await Promise.all([asset.options.cache.setStream((0, _nullthrows().default)(asset.value.contentKey), (0, _utils().blobToStream)(content)), mapBuffer != null && asset.options.cache.setBlob((0, _nullthrows().default)(asset.value.mapKey), mapBuffer)]);
|
|
156
163
|
return {
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.MutableAsset = void 0;
|
|
7
7
|
function _sourceMap() {
|
|
8
|
-
const data = _interopRequireDefault(require("@
|
|
8
|
+
const data = _interopRequireDefault(require("@atlaspack/source-map"));
|
|
9
9
|
_sourceMap = function () {
|
|
10
10
|
return data;
|
|
11
11
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Readable } from 'stream';
|
|
2
2
|
import type { AST, Blob } from '@atlaspack/types';
|
|
3
|
-
import SourceMap from '@
|
|
3
|
+
import SourceMap from '@atlaspack/source-map';
|
|
4
4
|
import type { Asset, Dependency, AtlaspackOptions } from './types';
|
|
5
5
|
export default class CommittedAsset {
|
|
6
6
|
key: string | null | undefined;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Blob, FilePath, BundleResult, Async } from '@atlaspack/types';
|
|
2
|
-
import type SourceMap from '@
|
|
2
|
+
import type SourceMap from '@atlaspack/source-map';
|
|
3
3
|
import type { Bundle as InternalBundle, Config, DevDepRequest, AtlaspackOptions, ReportFn, RequestInvalidation, DevDepRequestRef } from './types';
|
|
4
4
|
import type { AtlaspackConfig, LoadedPlugin } from './AtlaspackConfig';
|
|
5
5
|
import type InternalBundleGraph from './BundleGraph';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AST, Blob, DependencyOptions, FileCreateInvalidation, GenerateOutput, PackageName, TransformerResult } from '@atlaspack/types';
|
|
2
2
|
import type { Asset, Dependency, AtlaspackOptions, Invalidations } from './types';
|
|
3
3
|
import { Readable } from 'stream';
|
|
4
|
-
import SourceMap from '@
|
|
4
|
+
import SourceMap from '@atlaspack/source-map';
|
|
5
5
|
import { ProjectPath } from './projectPath';
|
|
6
6
|
type UncommittedAssetOptions = {
|
|
7
7
|
value: Asset;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import SourceMap from '@
|
|
1
|
+
import SourceMap from '@atlaspack/source-map';
|
|
2
2
|
import * as napi from '@atlaspack/rust';
|
|
3
3
|
import { Readable } from 'stream';
|
|
4
4
|
import type { MutableAsset as IMutableAsset, Stats, FileSystem, FilePath, Environment, Meta, BundleBehavior, ASTGenerator, AST, Dependency, DependencyOptions, FileCreateInvalidation, EnvironmentOptions } from '@atlaspack/types';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type SourceMap from '@
|
|
1
|
+
import type SourceMap from '@atlaspack/source-map';
|
|
2
2
|
import type { Readable } from 'stream';
|
|
3
3
|
import type { FileSystem } from '@atlaspack/fs';
|
|
4
4
|
import type { Asset as IAsset, AST, ASTGenerator, Dependency as IDependency, DependencyOptions, Environment as IEnvironment, EnvironmentOptions, FileCreateInvalidation, FilePath, Meta, MutableAsset as IMutableAsset, Stats, MutableAssetSymbols as IMutableAssetSymbols, AssetSymbols as IAssetSymbols, BundleBehavior } from '@atlaspack/types';
|
package/lib/worker.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/core",
|
|
3
|
-
"version": "2.25.
|
|
3
|
+
"version": "2.25.2-dev-af891f2f6.0",
|
|
4
4
|
"license": "(MIT OR Apache-2.0)",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -22,23 +22,23 @@
|
|
|
22
22
|
"build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
+
"@atlaspack/build-cache": "2.13.7-dev-af891f2f6.0",
|
|
26
|
+
"@atlaspack/cache": "3.2.30-dev-af891f2f6.0",
|
|
27
|
+
"@atlaspack/diagnostic": "2.14.5-dev-af891f2f6.0",
|
|
28
|
+
"@atlaspack/events": "2.14.5-dev-af891f2f6.0",
|
|
29
|
+
"@atlaspack/feature-flags": "2.25.5-dev-af891f2f6.0",
|
|
30
|
+
"@atlaspack/fs": "2.15.30-dev-af891f2f6.0",
|
|
31
|
+
"@atlaspack/graph": "3.5.24-dev-af891f2f6.0",
|
|
32
|
+
"@atlaspack/logger": "2.14.27-dev-af891f2f6.0",
|
|
33
|
+
"@atlaspack/package-manager": "2.14.35-dev-af891f2f6.0",
|
|
34
|
+
"@atlaspack/plugin": "2.14.35-dev-af891f2f6.0",
|
|
35
|
+
"@atlaspack/profiler": "2.14.32-dev-af891f2f6.0",
|
|
36
|
+
"@atlaspack/rust": "3.8.3-dev-af891f2f6.0",
|
|
37
|
+
"@atlaspack/source-map": "3.0.1-dev-af891f2f6.0",
|
|
38
|
+
"@atlaspack/types": "2.15.25-dev-af891f2f6.0",
|
|
39
|
+
"@atlaspack/utils": "3.0.3-dev-af891f2f6.0",
|
|
40
|
+
"@atlaspack/workers": "2.14.35-dev-af891f2f6.0",
|
|
25
41
|
"@mischnic/json-sourcemap": "^0.1.0",
|
|
26
|
-
"@atlaspack/build-cache": "2.13.6",
|
|
27
|
-
"@atlaspack/cache": "3.2.29",
|
|
28
|
-
"@atlaspack/diagnostic": "2.14.4",
|
|
29
|
-
"@atlaspack/events": "2.14.4",
|
|
30
|
-
"@atlaspack/feature-flags": "2.25.4",
|
|
31
|
-
"@atlaspack/fs": "2.15.29",
|
|
32
|
-
"@atlaspack/graph": "3.5.23",
|
|
33
|
-
"@atlaspack/logger": "2.14.26",
|
|
34
|
-
"@atlaspack/package-manager": "2.14.34",
|
|
35
|
-
"@atlaspack/plugin": "2.14.34",
|
|
36
|
-
"@atlaspack/profiler": "2.14.31",
|
|
37
|
-
"@atlaspack/rust": "3.8.2",
|
|
38
|
-
"@atlaspack/types": "2.15.24",
|
|
39
|
-
"@atlaspack/utils": "3.0.2",
|
|
40
|
-
"@atlaspack/workers": "2.14.34",
|
|
41
|
-
"@parcel/source-map": "^2.1.1",
|
|
42
42
|
"base-x": "^3.0.8",
|
|
43
43
|
"browserslist": "^4.6.6",
|
|
44
44
|
"clone": "^2.1.1",
|
|
@@ -50,15 +50,16 @@
|
|
|
50
50
|
"semver": "^7.5.2"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@atlaspack/babel-register": "2.14.
|
|
53
|
+
"@atlaspack/babel-register": "2.14.5-dev-af891f2f6.0",
|
|
54
54
|
"@types/node": ">= 18",
|
|
55
|
-
"rfdc": "1",
|
|
56
|
-
"jest-diff": "*",
|
|
57
55
|
"graphviz": "^0.0.9",
|
|
56
|
+
"jest-diff": "*",
|
|
57
|
+
"rfdc": "1",
|
|
58
58
|
"tempy": "^0.2.1"
|
|
59
59
|
},
|
|
60
60
|
"browser": {
|
|
61
61
|
"./src/serializerCore.js": "./src/serializerCore.browser.js"
|
|
62
62
|
},
|
|
63
|
-
"type": "commonjs"
|
|
63
|
+
"type": "commonjs",
|
|
64
|
+
"gitHead": "af891f2f68edf62c81b19d349331cf4a07ac458d"
|
|
64
65
|
}
|
package/src/Atlaspack.ts
CHANGED
|
@@ -43,7 +43,7 @@ import createPathRequest from './requests/PathRequest';
|
|
|
43
43
|
import {createEnvironment} from './Environment';
|
|
44
44
|
import {createDependency} from './Dependency';
|
|
45
45
|
import {Disposable} from '@atlaspack/events';
|
|
46
|
-
import {init as initSourcemaps} from '@
|
|
46
|
+
import {init as initSourcemaps} from '@atlaspack/source-map';
|
|
47
47
|
import {LMDBLiteCache} from '@atlaspack/cache';
|
|
48
48
|
import {
|
|
49
49
|
// @ts-expect-error TS2305
|
package/src/BundleGraph.ts
CHANGED
|
@@ -391,17 +391,28 @@ export default class BundleGraph {
|
|
|
391
391
|
local,
|
|
392
392
|
loc: reexportAllLoc,
|
|
393
393
|
});
|
|
394
|
+
|
|
394
395
|
if (node.value.sourceAssetId != null) {
|
|
395
|
-
let sourceAssetId
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
396
|
+
let sourceAssetId: NodeId;
|
|
397
|
+
|
|
398
|
+
if (getFeatureFlag('sourceAssetIdBundleGraphFix')) {
|
|
399
|
+
[sourceAssetId] =
|
|
400
|
+
assetGraph.getNodeIdsConnectedTo(nodeId);
|
|
401
|
+
} else {
|
|
402
|
+
sourceAssetId = assetGraph.getNodeIdByContentKey(
|
|
403
|
+
node.value.sourceAssetId,
|
|
404
|
+
);
|
|
405
|
+
}
|
|
406
|
+
|
|
407
|
+
let sourceAsset = nullthrows(
|
|
408
|
+
graph.getNode(
|
|
409
|
+
nullthrows(
|
|
410
|
+
assetGraphNodeIdToBundleGraphNodeId.get(
|
|
411
|
+
sourceAssetId,
|
|
412
|
+
),
|
|
399
413
|
),
|
|
400
414
|
),
|
|
401
415
|
);
|
|
402
|
-
let sourceAsset = nullthrows(
|
|
403
|
-
graph.getNode(sourceAssetId),
|
|
404
|
-
);
|
|
405
416
|
invariant(sourceAsset.type === 'asset');
|
|
406
417
|
let sourceAssetSymbols = sourceAsset.value.symbols;
|
|
407
418
|
if (sourceAssetSymbols) {
|