@atlaspack/core 2.25.2-dev-swc-4fc8a99f4.0 → 2.25.2-dev-native-compiled-test-712d92d32.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/dist/CommittedAsset.js +3 -0
- package/dist/UncommittedAsset.js +9 -0
- package/dist/atlaspack-v3/worker/compat/mutable-asset.js +4 -0
- package/dist/public/Asset.js +6 -0
- package/dist/requests/BundleGraphRequest.js +1 -5
- package/dist/requests/TargetRequest.js +0 -1
- package/dist/requests/asset-graph-diff.js +5 -6
- package/lib/CommittedAsset.js +3 -0
- package/lib/UncommittedAsset.js +9 -0
- package/lib/atlaspack-v3/worker/compat/mutable-asset.js +4 -0
- package/lib/public/Asset.js +6 -0
- package/lib/requests/BundleGraphRequest.js +1 -5
- package/lib/requests/TargetRequest.js +1 -2
- package/lib/requests/asset-graph-diff.js +4 -4
- package/lib/types/CommittedAsset.d.ts +1 -0
- package/lib/types/UncommittedAsset.d.ts +2 -0
- package/lib/types/atlaspack-v3/worker/compat/mutable-asset.d.ts +2 -0
- package/lib/types/public/Asset.d.ts +2 -0
- package/lib/types/types.d.ts +1 -0
- package/package.json +18 -18
- package/src/CommittedAsset.ts +4 -0
- package/src/UncommittedAsset.ts +11 -0
- package/src/atlaspack-v3/worker/compat/mutable-asset.ts +6 -0
- package/src/atlaspack-v3/worker/worker.ts +1 -1
- package/src/public/Asset.ts +8 -0
- package/src/requests/BundleGraphRequest.ts +1 -5
- package/src/requests/TargetRequest.ts +0 -1
- package/src/requests/asset-graph-diff.ts +7 -10
- package/src/types.ts +1 -0
- package/test/TargetRequest.test.ts +0 -12
- package/test/fixtures/custom-targets/package.json +0 -6
- package/tsconfig.tsbuildinfo +1 -1
package/dist/CommittedAsset.js
CHANGED
package/dist/UncommittedAsset.js
CHANGED
|
@@ -311,5 +311,14 @@ class UncommittedAsset {
|
|
|
311
311
|
// @ts-expect-error TS2345
|
|
312
312
|
this.value.id = (0, assetUtils_1.createAssetIdFromOptions)(this.value);
|
|
313
313
|
}
|
|
314
|
+
setCompiledCssStyles(styles) {
|
|
315
|
+
if (styles.length > 0) {
|
|
316
|
+
console.log('setCompiledCssStyles', styles);
|
|
317
|
+
}
|
|
318
|
+
this.value.compiledCssStyles = styles;
|
|
319
|
+
}
|
|
320
|
+
getCompiledCssStyles() {
|
|
321
|
+
return this.value.compiledCssStyles;
|
|
322
|
+
}
|
|
314
323
|
}
|
|
315
324
|
exports.default = UncommittedAsset;
|
|
@@ -51,6 +51,7 @@ class MutableAsset {
|
|
|
51
51
|
this.symbols = new asset_symbols_1.MutableAssetSymbols(asset.symbols);
|
|
52
52
|
this.type = asset.type;
|
|
53
53
|
this.uniqueKey = asset.uniqueKey;
|
|
54
|
+
this.compiledCssStyles = asset.compiledCssStyles;
|
|
54
55
|
__classPrivateFieldSet(this, _MutableAsset_astDirty, false, "f");
|
|
55
56
|
__classPrivateFieldSet(this, _MutableAsset_contents, contents, "f");
|
|
56
57
|
__classPrivateFieldSet(this, _MutableAsset_inner, asset, "f");
|
|
@@ -147,6 +148,9 @@ class MutableAsset {
|
|
|
147
148
|
invalidateOnBuild() {
|
|
148
149
|
// TODO: Forward invalidations to Rust
|
|
149
150
|
}
|
|
151
|
+
setCompiledCssStyles(styles) {
|
|
152
|
+
this.compiledCssStyles = styles;
|
|
153
|
+
}
|
|
150
154
|
}
|
|
151
155
|
exports.MutableAsset = MutableAsset;
|
|
152
156
|
_MutableAsset_astDirty = new WeakMap(), _MutableAsset_ast = new WeakMap(), _MutableAsset_contents = new WeakMap(), _MutableAsset_inner = new WeakMap(), _MutableAsset_map = new WeakMap(), _MutableAsset_projectRoot = new WeakMap(), _MutableAsset_sourceMap = new WeakMap();
|
package/dist/public/Asset.js
CHANGED
|
@@ -133,6 +133,9 @@ class BaseAsset {
|
|
|
133
133
|
getMapBuffer() {
|
|
134
134
|
return __classPrivateFieldGet(this, _BaseAsset_asset, "f").getMapBuffer();
|
|
135
135
|
}
|
|
136
|
+
getCompiledCssStyles() {
|
|
137
|
+
return __classPrivateFieldGet(this, _BaseAsset_asset, "f").getCompiledCssStyles();
|
|
138
|
+
}
|
|
136
139
|
}
|
|
137
140
|
class Asset extends BaseAsset {
|
|
138
141
|
constructor(asset) {
|
|
@@ -274,6 +277,9 @@ class MutableAsset extends BaseAsset {
|
|
|
274
277
|
});
|
|
275
278
|
__classPrivateFieldGet(this, _MutableAsset_asset, "f").updateId();
|
|
276
279
|
}
|
|
280
|
+
setCompiledCssStyles(styles) {
|
|
281
|
+
__classPrivateFieldGet(this, _MutableAsset_asset, "f").setCompiledCssStyles(styles);
|
|
282
|
+
}
|
|
277
283
|
}
|
|
278
284
|
exports.MutableAsset = MutableAsset;
|
|
279
285
|
_MutableAsset_asset = new WeakMap();
|
|
@@ -142,11 +142,7 @@ function createBundleGraphRequest(input) {
|
|
|
142
142
|
// force: true,
|
|
143
143
|
// },
|
|
144
144
|
// );
|
|
145
|
-
// require('./asset-graph-diff.
|
|
146
|
-
// jsAssetGraph,
|
|
147
|
-
// assetGraph,
|
|
148
|
-
// options.projectRoot,
|
|
149
|
-
// );
|
|
145
|
+
// require('./asset-graph-diff.js')(jsAssetGraph, assetGraph);
|
|
150
146
|
// }
|
|
151
147
|
measurement && measurement.end();
|
|
152
148
|
(0, utils_2.assertSignalNotAborted)(signal);
|
|
@@ -887,7 +887,6 @@ class TargetResolver {
|
|
|
887
887
|
: descriptor.optimize !== false),
|
|
888
888
|
shouldScopeHoist: shouldScopeHoist && descriptor.scopeHoist !== false,
|
|
889
889
|
sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap),
|
|
890
|
-
customEnv: descriptor.env,
|
|
891
890
|
}),
|
|
892
891
|
loc: (0, utils_2.toInternalSourceLocation)(this.options.projectRoot, loc),
|
|
893
892
|
});
|
|
@@ -67,7 +67,7 @@ function compactDeep(obj, ignoredPatterns = [], currentPath = '$') {
|
|
|
67
67
|
return obj;
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
|
-
function assetGraphDiff(jsAssetGraph, rustAssetGraph
|
|
70
|
+
function assetGraphDiff(jsAssetGraph, rustAssetGraph) {
|
|
71
71
|
const getNodes = (graph) => {
|
|
72
72
|
let nodes = {};
|
|
73
73
|
// @ts-expect-error implicit any
|
|
@@ -76,13 +76,12 @@ function assetGraphDiff(jsAssetGraph, rustAssetGraph, projectRoot) {
|
|
|
76
76
|
if (!node)
|
|
77
77
|
return;
|
|
78
78
|
if (node.type === 'dependency') {
|
|
79
|
-
let sourcePath = node.value.sourcePath
|
|
80
|
-
|
|
81
|
-
: (0, projectPath_1.toProjectPath)(projectRoot, 'entry');
|
|
82
|
-
nodes[`dep:${sourcePath}:${node.value.specifier}`] = filterNode(node);
|
|
79
|
+
let sourcePath = node.value.sourcePath ?? (0, projectPath_1.toProjectPath)('', 'entry');
|
|
80
|
+
nodes[`dep:${(0, projectPath_1.fromProjectPathRelative)(sourcePath)}:${node.value.specifier}`] = filterNode(node);
|
|
83
81
|
}
|
|
84
82
|
else if (node.type === 'asset') {
|
|
85
|
-
nodes[`asset:${(0, projectPath_1.
|
|
83
|
+
nodes[`asset:${(0, projectPath_1.fromProjectPathRelative)(node.value.filePath)}`] =
|
|
84
|
+
filterNode(node);
|
|
86
85
|
}
|
|
87
86
|
});
|
|
88
87
|
return nodes;
|
package/lib/CommittedAsset.js
CHANGED
package/lib/UncommittedAsset.js
CHANGED
|
@@ -365,5 +365,14 @@ class UncommittedAsset {
|
|
|
365
365
|
// @ts-expect-error TS2345
|
|
366
366
|
this.value.id = (0, _assetUtils.createAssetIdFromOptions)(this.value);
|
|
367
367
|
}
|
|
368
|
+
setCompiledCssStyles(styles) {
|
|
369
|
+
if (styles.length > 0) {
|
|
370
|
+
console.log('setCompiledCssStyles', styles);
|
|
371
|
+
}
|
|
372
|
+
this.value.compiledCssStyles = styles;
|
|
373
|
+
}
|
|
374
|
+
getCompiledCssStyles() {
|
|
375
|
+
return this.value.compiledCssStyles;
|
|
376
|
+
}
|
|
368
377
|
}
|
|
369
378
|
exports.default = UncommittedAsset;
|
|
@@ -59,6 +59,7 @@ class MutableAsset {
|
|
|
59
59
|
this.symbols = new _assetSymbols.MutableAssetSymbols(asset.symbols);
|
|
60
60
|
this.type = asset.type;
|
|
61
61
|
this.uniqueKey = asset.uniqueKey;
|
|
62
|
+
this.compiledCssStyles = asset.compiledCssStyles;
|
|
62
63
|
this.#astDirty = false;
|
|
63
64
|
this.#contents = contents;
|
|
64
65
|
this.#inner = asset;
|
|
@@ -165,5 +166,8 @@ class MutableAsset {
|
|
|
165
166
|
invalidateOnBuild() {
|
|
166
167
|
// TODO: Forward invalidations to Rust
|
|
167
168
|
}
|
|
169
|
+
setCompiledCssStyles(styles) {
|
|
170
|
+
this.compiledCssStyles = styles;
|
|
171
|
+
}
|
|
168
172
|
}
|
|
169
173
|
exports.MutableAsset = MutableAsset;
|
package/lib/public/Asset.js
CHANGED
|
@@ -124,6 +124,9 @@ class BaseAsset {
|
|
|
124
124
|
getMapBuffer() {
|
|
125
125
|
return this.#asset.getMapBuffer();
|
|
126
126
|
}
|
|
127
|
+
getCompiledCssStyles() {
|
|
128
|
+
return this.#asset.getCompiledCssStyles();
|
|
129
|
+
}
|
|
127
130
|
}
|
|
128
131
|
class Asset extends BaseAsset {
|
|
129
132
|
// @ts-expect-error TS2564
|
|
@@ -265,5 +268,8 @@ class MutableAsset extends BaseAsset {
|
|
|
265
268
|
});
|
|
266
269
|
this.#asset.updateId();
|
|
267
270
|
}
|
|
271
|
+
setCompiledCssStyles(styles) {
|
|
272
|
+
this.#asset.setCompiledCssStyles(styles);
|
|
273
|
+
}
|
|
268
274
|
}
|
|
269
275
|
exports.MutableAsset = MutableAsset;
|
|
@@ -178,11 +178,7 @@ function createBundleGraphRequest(input) {
|
|
|
178
178
|
// force: true,
|
|
179
179
|
// },
|
|
180
180
|
// );
|
|
181
|
-
// require('./asset-graph-diff.
|
|
182
|
-
// jsAssetGraph,
|
|
183
|
-
// assetGraph,
|
|
184
|
-
// options.projectRoot,
|
|
185
|
-
// );
|
|
181
|
+
// require('./asset-graph-diff.js')(jsAssetGraph, assetGraph);
|
|
186
182
|
// }
|
|
187
183
|
|
|
188
184
|
measurement && measurement.end();
|
|
@@ -830,8 +830,7 @@ class TargetResolver {
|
|
|
830
830
|
// Libraries are not optimized by default, users must explicitly configure this.
|
|
831
831
|
isLibrary ? descriptor.optimize === true : descriptor.optimize !== false),
|
|
832
832
|
shouldScopeHoist: shouldScopeHoist && descriptor.scopeHoist !== false,
|
|
833
|
-
sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap)
|
|
834
|
-
customEnv: descriptor.env
|
|
833
|
+
sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap)
|
|
835
834
|
}),
|
|
836
835
|
loc: (0, _utils2.toInternalSourceLocation)(this.options.projectRoot, loc)
|
|
837
836
|
});
|
|
@@ -77,7 +77,7 @@ function compactDeep(obj, ignoredPatterns = [], currentPath = '$') {
|
|
|
77
77
|
return obj;
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
|
-
function assetGraphDiff(jsAssetGraph, rustAssetGraph
|
|
80
|
+
function assetGraphDiff(jsAssetGraph, rustAssetGraph) {
|
|
81
81
|
const getNodes = graph => {
|
|
82
82
|
let nodes = {};
|
|
83
83
|
|
|
@@ -86,10 +86,10 @@ function assetGraphDiff(jsAssetGraph, rustAssetGraph, projectRoot) {
|
|
|
86
86
|
let node = graph.getNode(nodeId) ?? null;
|
|
87
87
|
if (!node) return;
|
|
88
88
|
if (node.type === 'dependency') {
|
|
89
|
-
let sourcePath = node.value.sourcePath
|
|
90
|
-
nodes[`dep:${sourcePath}:${node.value.specifier}`] = filterNode(node);
|
|
89
|
+
let sourcePath = node.value.sourcePath ?? (0, _projectPath.toProjectPath)('', 'entry');
|
|
90
|
+
nodes[`dep:${(0, _projectPath.fromProjectPathRelative)(sourcePath)}:${node.value.specifier}`] = filterNode(node);
|
|
91
91
|
} else if (node.type === 'asset') {
|
|
92
|
-
nodes[`asset:${(0, _projectPath.
|
|
92
|
+
nodes[`asset:${(0, _projectPath.fromProjectPathRelative)(node.value.filePath)}`] = filterNode(node);
|
|
93
93
|
}
|
|
94
94
|
});
|
|
95
95
|
return nodes;
|
|
@@ -57,5 +57,7 @@ export default class UncommittedAsset {
|
|
|
57
57
|
getDependencies(): Array<Dependency>;
|
|
58
58
|
createChildAsset(result: TransformerResult, plugin: PackageName, configPath: ProjectPath, configKeyPath?: string): UncommittedAsset;
|
|
59
59
|
updateId(): void;
|
|
60
|
+
setCompiledCssStyles(styles: string[]): void;
|
|
61
|
+
getCompiledCssStyles(): ReadonlyArray<string> | undefined;
|
|
60
62
|
}
|
|
61
63
|
export {};
|
|
@@ -22,6 +22,7 @@ export declare class MutableAsset implements IMutableAsset {
|
|
|
22
22
|
symbols: MutableAssetSymbols;
|
|
23
23
|
type: string;
|
|
24
24
|
uniqueKey: string | null | undefined;
|
|
25
|
+
compiledCssStyles?: string[];
|
|
25
26
|
get astGenerator(): ASTGenerator | null | undefined;
|
|
26
27
|
set astGenerator(value?: ASTGenerator | null);
|
|
27
28
|
constructor(asset: InnerAsset, contents: Buffer, env: Environment, fs: FileSystem, map: string | null | undefined, projectRoot: string);
|
|
@@ -46,4 +47,5 @@ export declare class MutableAsset implements IMutableAsset {
|
|
|
46
47
|
invalidateOnEnvChange(invalidation: string): void;
|
|
47
48
|
invalidateOnStartup(): void;
|
|
48
49
|
invalidateOnBuild(): void;
|
|
50
|
+
setCompiledCssStyles(styles: string[]): void;
|
|
49
51
|
}
|
|
@@ -35,6 +35,7 @@ declare class BaseAsset {
|
|
|
35
35
|
getMap(): Promise<SourceMap | null | undefined>;
|
|
36
36
|
getAST(): Promise<AST | null | undefined>;
|
|
37
37
|
getMapBuffer(): Promise<Buffer | null | undefined>;
|
|
38
|
+
getCompiledCssStyles(): ReadonlyArray<string> | undefined;
|
|
38
39
|
}
|
|
39
40
|
export declare class Asset extends BaseAsset implements IAsset {
|
|
40
41
|
#private;
|
|
@@ -70,5 +71,6 @@ export declare class MutableAsset extends BaseAsset implements IMutableAsset {
|
|
|
70
71
|
setAST(ast: AST): void;
|
|
71
72
|
addURLDependency(url: string, opts: Partial<DependencyOptions>): string;
|
|
72
73
|
setEnvironment(env: EnvironmentOptions): void;
|
|
74
|
+
setCompiledCssStyles(styles: string[]): void;
|
|
73
75
|
}
|
|
74
76
|
export {};
|
package/lib/types/types.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/core",
|
|
3
|
-
"version": "2.25.2-dev-
|
|
3
|
+
"version": "2.25.2-dev-native-compiled-test-712d92d32.0",
|
|
4
4
|
"license": "(MIT OR Apache-2.0)",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -22,21 +22,21 @@
|
|
|
22
22
|
"build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@atlaspack/build-cache": "2.13.7-dev-
|
|
26
|
-
"@atlaspack/cache": "3.2.30-dev-
|
|
27
|
-
"@atlaspack/diagnostic": "2.14.5-dev-
|
|
28
|
-
"@atlaspack/events": "2.14.5-dev-
|
|
29
|
-
"@atlaspack/feature-flags": "2.25.5-dev-
|
|
30
|
-
"@atlaspack/fs": "2.15.30-dev-
|
|
31
|
-
"@atlaspack/graph": "3.5.24-dev-
|
|
32
|
-
"@atlaspack/logger": "2.14.27-dev-
|
|
33
|
-
"@atlaspack/package-manager": "2.14.35-dev-
|
|
34
|
-
"@atlaspack/plugin": "2.14.35-dev-
|
|
35
|
-
"@atlaspack/profiler": "2.14.32-dev-
|
|
36
|
-
"@atlaspack/rust": "3.8.3-dev-
|
|
37
|
-
"@atlaspack/types": "2.15.25-dev-
|
|
38
|
-
"@atlaspack/utils": "3.0.3-dev-
|
|
39
|
-
"@atlaspack/workers": "2.14.35-dev-
|
|
25
|
+
"@atlaspack/build-cache": "2.13.7-dev-native-compiled-test-712d92d32.0",
|
|
26
|
+
"@atlaspack/cache": "3.2.30-dev-native-compiled-test-712d92d32.0",
|
|
27
|
+
"@atlaspack/diagnostic": "2.14.5-dev-native-compiled-test-712d92d32.0",
|
|
28
|
+
"@atlaspack/events": "2.14.5-dev-native-compiled-test-712d92d32.0",
|
|
29
|
+
"@atlaspack/feature-flags": "2.25.5-dev-native-compiled-test-712d92d32.0",
|
|
30
|
+
"@atlaspack/fs": "2.15.30-dev-native-compiled-test-712d92d32.0",
|
|
31
|
+
"@atlaspack/graph": "3.5.24-dev-native-compiled-test-712d92d32.0",
|
|
32
|
+
"@atlaspack/logger": "2.14.27-dev-native-compiled-test-712d92d32.0",
|
|
33
|
+
"@atlaspack/package-manager": "2.14.35-dev-native-compiled-test-712d92d32.0",
|
|
34
|
+
"@atlaspack/plugin": "2.14.35-dev-native-compiled-test-712d92d32.0",
|
|
35
|
+
"@atlaspack/profiler": "2.14.32-dev-native-compiled-test-712d92d32.0",
|
|
36
|
+
"@atlaspack/rust": "3.8.3-dev-native-compiled-test-712d92d32.0",
|
|
37
|
+
"@atlaspack/types": "2.15.25-dev-native-compiled-test-712d92d32.0",
|
|
38
|
+
"@atlaspack/utils": "3.0.3-dev-native-compiled-test-712d92d32.0",
|
|
39
|
+
"@atlaspack/workers": "2.14.35-dev-native-compiled-test-712d92d32.0",
|
|
40
40
|
"@mischnic/json-sourcemap": "^0.1.0",
|
|
41
41
|
"@parcel/source-map": "^2.1.1",
|
|
42
42
|
"base-x": "^3.0.8",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"semver": "^7.5.2"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@atlaspack/babel-register": "2.14.5-dev-
|
|
53
|
+
"@atlaspack/babel-register": "2.14.5-dev-native-compiled-test-712d92d32.0",
|
|
54
54
|
"@types/node": ">= 18",
|
|
55
55
|
"graphviz": "^0.0.9",
|
|
56
56
|
"jest-diff": "*",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"./src/serializerCore.js": "./src/serializerCore.browser.js"
|
|
62
62
|
},
|
|
63
63
|
"type": "commonjs",
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "712d92d323f25ef36c76ecd254b8f227fe518b89"
|
|
65
65
|
}
|
package/src/CommittedAsset.ts
CHANGED
|
@@ -162,4 +162,8 @@ export default class CommittedAsset {
|
|
|
162
162
|
getDependencies(): Array<Dependency> {
|
|
163
163
|
return Array.from(this.value.dependencies.values());
|
|
164
164
|
}
|
|
165
|
+
|
|
166
|
+
getCompiledCssStyles(): ReadonlyArray<string> | undefined {
|
|
167
|
+
return this.value.compiledCssStyles;
|
|
168
|
+
}
|
|
165
169
|
}
|
package/src/UncommittedAsset.ts
CHANGED
|
@@ -444,4 +444,15 @@ export default class UncommittedAsset {
|
|
|
444
444
|
// @ts-expect-error TS2345
|
|
445
445
|
this.value.id = createAssetIdFromOptions(this.value);
|
|
446
446
|
}
|
|
447
|
+
|
|
448
|
+
setCompiledCssStyles(styles: string[]): void {
|
|
449
|
+
if (styles.length > 0) {
|
|
450
|
+
console.log('setCompiledCssStyles', styles);
|
|
451
|
+
}
|
|
452
|
+
this.value.compiledCssStyles = styles;
|
|
453
|
+
}
|
|
454
|
+
|
|
455
|
+
getCompiledCssStyles(): ReadonlyArray<string> | undefined {
|
|
456
|
+
return this.value.compiledCssStyles;
|
|
457
|
+
}
|
|
447
458
|
}
|
|
@@ -41,6 +41,7 @@ export class MutableAsset implements IMutableAsset {
|
|
|
41
41
|
symbols: MutableAssetSymbols;
|
|
42
42
|
type: string;
|
|
43
43
|
uniqueKey: string | null | undefined;
|
|
44
|
+
compiledCssStyles?: string[];
|
|
44
45
|
|
|
45
46
|
#astDirty: boolean;
|
|
46
47
|
#ast: AST | null | undefined;
|
|
@@ -82,6 +83,7 @@ export class MutableAsset implements IMutableAsset {
|
|
|
82
83
|
this.symbols = new MutableAssetSymbols(asset.symbols);
|
|
83
84
|
this.type = asset.type;
|
|
84
85
|
this.uniqueKey = asset.uniqueKey;
|
|
86
|
+
this.compiledCssStyles = asset.compiledCssStyles;
|
|
85
87
|
|
|
86
88
|
this.#astDirty = false;
|
|
87
89
|
this.#contents = contents;
|
|
@@ -206,4 +208,8 @@ export class MutableAsset implements IMutableAsset {
|
|
|
206
208
|
invalidateOnBuild(): void {
|
|
207
209
|
// TODO: Forward invalidations to Rust
|
|
208
210
|
}
|
|
211
|
+
|
|
212
|
+
setCompiledCssStyles(styles: string[]): void {
|
|
213
|
+
this.compiledCssStyles = styles;
|
|
214
|
+
}
|
|
209
215
|
}
|
package/src/public/Asset.ts
CHANGED
|
@@ -190,6 +190,10 @@ class BaseAsset {
|
|
|
190
190
|
getMapBuffer(): Promise<Buffer | null | undefined> {
|
|
191
191
|
return this.#asset.getMapBuffer();
|
|
192
192
|
}
|
|
193
|
+
|
|
194
|
+
getCompiledCssStyles(): ReadonlyArray<string> | undefined {
|
|
195
|
+
return this.#asset.getCompiledCssStyles();
|
|
196
|
+
}
|
|
193
197
|
}
|
|
194
198
|
|
|
195
199
|
export class Asset extends BaseAsset implements IAsset {
|
|
@@ -369,4 +373,8 @@ export class MutableAsset extends BaseAsset implements IMutableAsset {
|
|
|
369
373
|
});
|
|
370
374
|
this.#asset.updateId();
|
|
371
375
|
}
|
|
376
|
+
|
|
377
|
+
setCompiledCssStyles(styles: string[]): void {
|
|
378
|
+
this.#asset.setCompiledCssStyles(styles);
|
|
379
|
+
}
|
|
372
380
|
}
|
|
@@ -192,11 +192,7 @@ export default function createBundleGraphRequest(
|
|
|
192
192
|
// force: true,
|
|
193
193
|
// },
|
|
194
194
|
// );
|
|
195
|
-
// require('./asset-graph-diff.
|
|
196
|
-
// jsAssetGraph,
|
|
197
|
-
// assetGraph,
|
|
198
|
-
// options.projectRoot,
|
|
199
|
-
// );
|
|
195
|
+
// require('./asset-graph-diff.js')(jsAssetGraph, assetGraph);
|
|
200
196
|
// }
|
|
201
197
|
|
|
202
198
|
measurement && measurement.end();
|
|
@@ -1151,7 +1151,6 @@ export class TargetResolver {
|
|
|
1151
1151
|
shouldScopeHoist:
|
|
1152
1152
|
shouldScopeHoist && descriptor.scopeHoist !== false,
|
|
1153
1153
|
sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap),
|
|
1154
|
-
customEnv: descriptor.env,
|
|
1155
1154
|
}),
|
|
1156
1155
|
loc: toInternalSourceLocation(this.options.projectRoot, loc),
|
|
1157
1156
|
});
|
|
@@ -71,11 +71,7 @@ function compactDeep(
|
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
-
function assetGraphDiff(
|
|
75
|
-
jsAssetGraph: AssetGraph,
|
|
76
|
-
rustAssetGraph: AssetGraph,
|
|
77
|
-
projectRoot: string,
|
|
78
|
-
) {
|
|
74
|
+
function assetGraphDiff(jsAssetGraph: AssetGraph, rustAssetGraph: AssetGraph) {
|
|
79
75
|
const getNodes = (graph: any) => {
|
|
80
76
|
let nodes: Record<string, any> = {};
|
|
81
77
|
|
|
@@ -85,12 +81,13 @@ function assetGraphDiff(
|
|
|
85
81
|
if (!node) return;
|
|
86
82
|
|
|
87
83
|
if (node.type === 'dependency') {
|
|
88
|
-
let sourcePath = node.value.sourcePath
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
84
|
+
let sourcePath = node.value.sourcePath ?? toProjectPath('', 'entry');
|
|
85
|
+
nodes[
|
|
86
|
+
`dep:${fromProjectPathRelative(sourcePath)}:${node.value.specifier}`
|
|
87
|
+
] = filterNode(node);
|
|
92
88
|
} else if (node.type === 'asset') {
|
|
93
|
-
nodes[`asset:${
|
|
89
|
+
nodes[`asset:${fromProjectPathRelative(node.value.filePath)}`] =
|
|
90
|
+
filterNode(node);
|
|
94
91
|
}
|
|
95
92
|
});
|
|
96
93
|
|
package/src/types.ts
CHANGED
|
@@ -382,9 +382,6 @@ describe('TargetResolver', () => {
|
|
|
382
382
|
loc: undefined,
|
|
383
383
|
sourceType: 'module',
|
|
384
384
|
unstableSingleFileOutput: false,
|
|
385
|
-
customEnv: {
|
|
386
|
-
useFlag: 'false',
|
|
387
|
-
},
|
|
388
385
|
}),
|
|
389
386
|
loc: {
|
|
390
387
|
filePath: relative(
|
|
@@ -419,9 +416,6 @@ describe('TargetResolver', () => {
|
|
|
419
416
|
loc: undefined,
|
|
420
417
|
sourceType: 'module',
|
|
421
418
|
unstableSingleFileOutput: false,
|
|
422
|
-
customEnv: {
|
|
423
|
-
useFlag: 'true',
|
|
424
|
-
},
|
|
425
419
|
}),
|
|
426
420
|
loc: {
|
|
427
421
|
filePath: relative(
|
|
@@ -507,9 +501,6 @@ describe('TargetResolver', () => {
|
|
|
507
501
|
loc: undefined,
|
|
508
502
|
sourceType: 'module',
|
|
509
503
|
unstableSingleFileOutput: false,
|
|
510
|
-
customEnv: {
|
|
511
|
-
useFlag: 'false',
|
|
512
|
-
},
|
|
513
504
|
}),
|
|
514
505
|
loc: {
|
|
515
506
|
filePath: relative(
|
|
@@ -544,9 +535,6 @@ describe('TargetResolver', () => {
|
|
|
544
535
|
loc: undefined,
|
|
545
536
|
sourceType: 'module',
|
|
546
537
|
unstableSingleFileOutput: false,
|
|
547
|
-
customEnv: {
|
|
548
|
-
useFlag: 'true',
|
|
549
|
-
},
|
|
550
538
|
}),
|
|
551
539
|
loc: {
|
|
552
540
|
filePath: relative(
|