next 13.4.2 → 13.4.3-canary.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/bin/next +1 -1
- package/dist/build/index.js +1 -1
- package/dist/build/swc/index.js +1 -1
- package/dist/build/webpack/plugins/profiling-plugin.d.ts +2 -2
- package/dist/build/webpack/plugins/profiling-plugin.js +117 -28
- package/dist/build/webpack/plugins/profiling-plugin.js.map +1 -1
- package/dist/build/webpack-config.js +2 -2
- package/dist/client/app-bootstrap.js +1 -1
- package/dist/client/index.js +1 -1
- package/dist/esm/build/index.js +1 -1
- package/dist/esm/build/swc/index.js +1 -1
- package/dist/esm/build/webpack/plugins/profiling-plugin.js +117 -28
- package/dist/esm/build/webpack/plugins/profiling-plugin.js.map +1 -1
- package/dist/esm/build/webpack-config.js +2 -2
- package/dist/esm/client/app-bootstrap.js +1 -1
- package/dist/esm/client/index.js +1 -1
- package/dist/esm/server/dev/hot-reloader.js +1 -1
- package/dist/server/dev/hot-reloader.js +1 -1
- package/dist/telemetry/anonymous-meta.js +1 -1
- package/dist/telemetry/events/session-stopped.js +2 -2
- package/dist/telemetry/events/version.js +2 -2
- package/package.json +16 -16
package/dist/bin/next
CHANGED
|
@@ -76,7 +76,7 @@ const args = (0, _index.default)({
|
|
|
76
76
|
});
|
|
77
77
|
// Version is inlined into the file using taskr build pipeline
|
|
78
78
|
if (args["--version"]) {
|
|
79
|
-
console.log(`Next.js v${"13.4.
|
|
79
|
+
console.log(`Next.js v${"13.4.3-canary.0"}`);
|
|
80
80
|
process.exit(0);
|
|
81
81
|
}
|
|
82
82
|
// Check if we are running `next <subcommand>` or `next`
|
package/dist/build/index.js
CHANGED
|
@@ -135,7 +135,7 @@ async function build(dir, reactProductionProfiling = false, debugOutput = false,
|
|
|
135
135
|
let hasAppDir = false;
|
|
136
136
|
try {
|
|
137
137
|
const nextBuildSpan = (0, _trace.trace)("next-build", undefined, {
|
|
138
|
-
version: "13.4.
|
|
138
|
+
version: "13.4.3-canary.0"
|
|
139
139
|
});
|
|
140
140
|
_buildcontext.NextBuildContext.nextBuildSpan = nextBuildSpan;
|
|
141
141
|
_buildcontext.NextBuildContext.dir = dir;
|
package/dist/build/swc/index.js
CHANGED
|
@@ -127,7 +127,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
127
127
|
return newObj;
|
|
128
128
|
}
|
|
129
129
|
var _platformArchTriples_PlatformName;
|
|
130
|
-
const nextVersion = "13.4.
|
|
130
|
+
const nextVersion = "13.4.3-canary.0";
|
|
131
131
|
const ArchName = (0, _os.arch)();
|
|
132
132
|
const PlatformName = (0, _os.platform)();
|
|
133
133
|
const triples = ((_platformArchTriples_PlatformName = _triples.platformArchTriples[PlatformName]) == null ? void 0 : _platformArchTriples_PlatformName[ArchName]) || [];
|
|
@@ -10,10 +10,10 @@ export declare class ProfilingPlugin {
|
|
|
10
10
|
});
|
|
11
11
|
apply(compiler: any): void;
|
|
12
12
|
traceHookPair(spanName: string | (() => string), startHook: any, stopHook: any, { parentSpan, attrs, onStart, onStop, }?: {
|
|
13
|
-
parentSpan?: () => Span;
|
|
13
|
+
parentSpan?: (...params: any[]) => Span;
|
|
14
14
|
attrs?: any;
|
|
15
15
|
onStart?: (span: Span, ...params: any[]) => void;
|
|
16
|
-
onStop?: () => void;
|
|
16
|
+
onStop?: (span: Span, ...params: any[]) => void;
|
|
17
17
|
}): void;
|
|
18
18
|
traceTopLevelHooks(compiler: any): void;
|
|
19
19
|
traceCompilationHooks(compiler: any): void;
|
|
@@ -28,7 +28,19 @@ const _webpack = require("next/dist/compiled/webpack/webpack");
|
|
|
28
28
|
const pluginName = "ProfilingPlugin";
|
|
29
29
|
const spans = new WeakMap();
|
|
30
30
|
const moduleSpansByCompilation = new WeakMap();
|
|
31
|
+
const makeSpanByCompilation = new WeakMap();
|
|
32
|
+
const sealSpanByCompilation = new WeakMap();
|
|
31
33
|
const webpackInvalidSpans = new WeakMap();
|
|
34
|
+
const TRACE_LABELS_SEAL = [
|
|
35
|
+
"module assets",
|
|
36
|
+
"create chunk assets",
|
|
37
|
+
"asset render",
|
|
38
|
+
"asset emit",
|
|
39
|
+
"store asset"
|
|
40
|
+
];
|
|
41
|
+
function inTraceLabelsSeal(label) {
|
|
42
|
+
return TRACE_LABELS_SEAL.some((l)=>label.startsWith(l));
|
|
43
|
+
}
|
|
32
44
|
class ProfilingPlugin {
|
|
33
45
|
constructor({ runWebpackSpan }){
|
|
34
46
|
this.runWebpackSpan = runWebpackSpan;
|
|
@@ -46,20 +58,20 @@ class ProfilingPlugin {
|
|
|
46
58
|
}, (...params)=>{
|
|
47
59
|
const name = typeof spanName === "function" ? spanName() : spanName;
|
|
48
60
|
const attributes = attrs ? attrs(...params) : attrs;
|
|
49
|
-
span = parentSpan ? parentSpan().traceChild(name, attributes) : this.runWebpackSpan.traceChild(name, attributes);
|
|
61
|
+
span = parentSpan ? parentSpan(...params).traceChild(name, attributes) : this.runWebpackSpan.traceChild(name, attributes);
|
|
50
62
|
if (onStart) onStart(span, ...params);
|
|
51
63
|
});
|
|
52
64
|
stopHook.tap({
|
|
53
65
|
name: pluginName,
|
|
54
66
|
stage: Infinity
|
|
55
|
-
}, ()=>{
|
|
67
|
+
}, (...params)=>{
|
|
56
68
|
// `stopHook` may be triggered when `startHook` has not in cases
|
|
57
69
|
// where `stopHook` is used as the terminating event for more
|
|
58
70
|
// than one pair of hooks.
|
|
59
71
|
if (!span) {
|
|
60
72
|
return;
|
|
61
73
|
}
|
|
62
|
-
if (onStop) onStop();
|
|
74
|
+
if (onStop) onStop(span, ...params);
|
|
63
75
|
span.stop();
|
|
64
76
|
});
|
|
65
77
|
}
|
|
@@ -90,15 +102,26 @@ class ProfilingPlugin {
|
|
|
90
102
|
parentSpan: ()=>webpackInvalidSpans.get(compiler) || this.runWebpackSpan
|
|
91
103
|
});
|
|
92
104
|
this.traceHookPair("make", compiler.hooks.make, compiler.hooks.finishMake, {
|
|
93
|
-
parentSpan: ()=>
|
|
94
|
-
});
|
|
95
|
-
compiler.hooks.compilation.tap(pluginName, (compilation)=>{
|
|
96
|
-
compilation.hooks.buildModule.tap(pluginName, (module1)=>{
|
|
97
|
-
var _compilation_moduleGraph;
|
|
105
|
+
parentSpan: (compilation)=>{
|
|
98
106
|
const compilationSpan = spans.get(compilation);
|
|
99
107
|
if (!compilationSpan) {
|
|
100
|
-
return;
|
|
108
|
+
return webpackInvalidSpans.get(compiler) || this.runWebpackSpan;
|
|
101
109
|
}
|
|
110
|
+
return compilationSpan;
|
|
111
|
+
},
|
|
112
|
+
onStart: (span, compilation)=>{
|
|
113
|
+
makeSpanByCompilation.set(compilation, span);
|
|
114
|
+
},
|
|
115
|
+
onStop: (_span, compilation)=>{
|
|
116
|
+
makeSpanByCompilation.delete(compilation);
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
compiler.hooks.compilation.tap({
|
|
120
|
+
name: pluginName,
|
|
121
|
+
stage: -Infinity
|
|
122
|
+
}, (compilation)=>{
|
|
123
|
+
compilation.hooks.buildModule.tap(pluginName, (module1)=>{
|
|
124
|
+
var _compilation_moduleGraph;
|
|
102
125
|
const moduleType = (()=>{
|
|
103
126
|
if (!module1.userRequest) {
|
|
104
127
|
return "";
|
|
@@ -113,13 +136,27 @@ class ProfilingPlugin {
|
|
|
113
136
|
if (issuerSpan) {
|
|
114
137
|
span = issuerSpan.traceChild(spanName);
|
|
115
138
|
} else {
|
|
116
|
-
|
|
139
|
+
let parentSpan;
|
|
140
|
+
for (const incomingConnection of compilation.moduleGraph.getIncomingConnections(module1)){
|
|
141
|
+
const entrySpan = spans.get(incomingConnection.dependency);
|
|
142
|
+
if (entrySpan) {
|
|
143
|
+
parentSpan = entrySpan;
|
|
144
|
+
break;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
if (!parentSpan) {
|
|
148
|
+
const compilationSpan = spans.get(compilation);
|
|
149
|
+
if (!compilationSpan) {
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
parentSpan = compilationSpan;
|
|
153
|
+
}
|
|
154
|
+
span = parentSpan.traceChild(spanName);
|
|
117
155
|
}
|
|
118
156
|
span.setAttribute("name", module1.userRequest);
|
|
119
157
|
moduleSpans.set(module1, span);
|
|
120
158
|
});
|
|
121
159
|
const moduleHooks = _webpack.NormalModule.getCompilationHooks(compilation);
|
|
122
|
-
// @ts-ignore TODO: remove ignore when using webpack 5 types
|
|
123
160
|
moduleHooks.readResource.for(undefined).intercept({
|
|
124
161
|
register (tapInfo) {
|
|
125
162
|
const fn = tapInfo.fn;
|
|
@@ -142,40 +179,92 @@ class ProfilingPlugin {
|
|
|
142
179
|
var _moduleSpansByCompilation_get_get, _moduleSpansByCompilation_get;
|
|
143
180
|
(_moduleSpansByCompilation_get_get = (_moduleSpansByCompilation_get = moduleSpansByCompilation == null ? void 0 : moduleSpansByCompilation.get(compilation)) == null ? void 0 : _moduleSpansByCompilation_get.get(module1)) == null ? void 0 : _moduleSpansByCompilation_get_get.stop();
|
|
144
181
|
});
|
|
145
|
-
|
|
146
|
-
|
|
182
|
+
compilation.hooks.failedModule.tap(pluginName, (module1)=>{
|
|
183
|
+
var _moduleSpansByCompilation_get_get, _moduleSpansByCompilation_get;
|
|
184
|
+
(_moduleSpansByCompilation_get_get = (_moduleSpansByCompilation_get = moduleSpansByCompilation == null ? void 0 : moduleSpansByCompilation.get(compilation)) == null ? void 0 : _moduleSpansByCompilation_get.get(module1)) == null ? void 0 : _moduleSpansByCompilation_get_get.stop();
|
|
185
|
+
});
|
|
186
|
+
this.traceHookPair("seal", compilation.hooks.seal, compilation.hooks.afterSeal, {
|
|
187
|
+
parentSpan: ()=>spans.get(compilation),
|
|
188
|
+
onStart (span) {
|
|
189
|
+
sealSpanByCompilation.set(compilation, span);
|
|
190
|
+
},
|
|
191
|
+
onStop () {
|
|
192
|
+
sealSpanByCompilation.delete(compilation);
|
|
193
|
+
}
|
|
147
194
|
});
|
|
148
195
|
compilation.hooks.addEntry.tap(pluginName, (entry)=>{
|
|
149
|
-
const
|
|
150
|
-
if (!
|
|
196
|
+
const parentSpan = makeSpanByCompilation.get(compilation) || spans.get(compilation);
|
|
197
|
+
if (!parentSpan) {
|
|
151
198
|
return;
|
|
152
199
|
}
|
|
153
|
-
const addEntrySpan =
|
|
200
|
+
const addEntrySpan = parentSpan.traceChild("add-entry");
|
|
154
201
|
addEntrySpan.setAttribute("request", entry.request);
|
|
155
202
|
spans.set(entry, addEntrySpan);
|
|
156
203
|
});
|
|
157
204
|
compilation.hooks.succeedEntry.tap(pluginName, (entry)=>{
|
|
158
205
|
var _spans_get;
|
|
159
206
|
(_spans_get = spans.get(entry)) == null ? void 0 : _spans_get.stop();
|
|
207
|
+
spans.delete(entry);
|
|
208
|
+
});
|
|
209
|
+
compilation.hooks.failedEntry.tap(pluginName, (entry)=>{
|
|
210
|
+
var _spans_get;
|
|
211
|
+
(_spans_get = spans.get(entry)) == null ? void 0 : _spans_get.stop();
|
|
212
|
+
spans.delete(entry);
|
|
160
213
|
});
|
|
161
|
-
this.traceHookPair("
|
|
162
|
-
parentSpan: ()=>
|
|
214
|
+
this.traceHookPair("chunk-graph", compilation.hooks.beforeChunks, compilation.hooks.afterChunks, {
|
|
215
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
163
216
|
});
|
|
164
|
-
this.traceHookPair("
|
|
165
|
-
parentSpan: ()=>
|
|
217
|
+
this.traceHookPair("optimize", compilation.hooks.optimize, compilation.hooks.reviveModules, {
|
|
218
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
166
219
|
});
|
|
167
|
-
this.traceHookPair("
|
|
168
|
-
parentSpan: ()=>
|
|
220
|
+
this.traceHookPair("optimize-modules", compilation.hooks.optimizeModules, compilation.hooks.afterOptimizeModules, {
|
|
221
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
169
222
|
});
|
|
170
|
-
this.traceHookPair("
|
|
171
|
-
parentSpan: ()=>
|
|
223
|
+
this.traceHookPair("optimize-chunks", compilation.hooks.optimizeChunks, compilation.hooks.afterOptimizeChunks, {
|
|
224
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
172
225
|
});
|
|
173
|
-
this.traceHookPair("
|
|
174
|
-
parentSpan: ()=>
|
|
226
|
+
this.traceHookPair("optimize-tree", compilation.hooks.optimizeTree, compilation.hooks.afterOptimizeTree, {
|
|
227
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
175
228
|
});
|
|
176
|
-
this.traceHookPair("
|
|
177
|
-
parentSpan: ()=>
|
|
229
|
+
this.traceHookPair("optimize-chunk-modules", compilation.hooks.optimizeChunkModules, compilation.hooks.afterOptimizeChunkModules, {
|
|
230
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
178
231
|
});
|
|
232
|
+
this.traceHookPair("module-hash", compilation.hooks.beforeModuleHash, compilation.hooks.afterModuleHash, {
|
|
233
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
234
|
+
});
|
|
235
|
+
this.traceHookPair("code-generation", compilation.hooks.beforeCodeGeneration, compilation.hooks.afterCodeGeneration, {
|
|
236
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
237
|
+
});
|
|
238
|
+
this.traceHookPair("hash", compilation.hooks.beforeHash, compilation.hooks.afterHash, {
|
|
239
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
240
|
+
});
|
|
241
|
+
this.traceHookPair("code-generation-jobs", compilation.hooks.afterHash, compilation.hooks.beforeModuleAssets, {
|
|
242
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
243
|
+
});
|
|
244
|
+
const logs = new Map();
|
|
245
|
+
const originalTime = compilation.logger.time;
|
|
246
|
+
const originalTimeEnd = compilation.logger.timeEnd;
|
|
247
|
+
compilation.logger.time = (label)=>{
|
|
248
|
+
if (!inTraceLabelsSeal(label)) {
|
|
249
|
+
return originalTime.call(compilation.logger, label);
|
|
250
|
+
}
|
|
251
|
+
const span = sealSpanByCompilation.get(compilation);
|
|
252
|
+
if (span) {
|
|
253
|
+
logs.set(label, span.traceChild(label.replace(/ /g, "-")));
|
|
254
|
+
}
|
|
255
|
+
return originalTime.call(compilation.logger, label);
|
|
256
|
+
};
|
|
257
|
+
compilation.logger.timeEnd = (label)=>{
|
|
258
|
+
if (!inTraceLabelsSeal(label)) {
|
|
259
|
+
return originalTimeEnd.call(compilation.logger, label);
|
|
260
|
+
}
|
|
261
|
+
const span = logs.get(label);
|
|
262
|
+
if (span) {
|
|
263
|
+
span.stop();
|
|
264
|
+
logs.delete(label);
|
|
265
|
+
}
|
|
266
|
+
return originalTimeEnd.call(compilation.logger, label);
|
|
267
|
+
};
|
|
179
268
|
});
|
|
180
269
|
}
|
|
181
270
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/build/webpack/plugins/profiling-plugin.ts"],"names":["spans","webpackInvalidSpans","ProfilingPlugin","pluginName","WeakMap","moduleSpansByCompilation","constructor","runWebpackSpan","apply","compiler","traceTopLevelHooks","traceCompilationHooks","traceHookPair","spanName","startHook","stopHook","parentSpan","attrs","onStart","onStop","span","tap","name","stage","Infinity","params","attributes","traceChild","stop","hooks","compilation","afterCompile","get","set","options","mode","invalid","done","delete","fileName","trigger","emit","afterEmit","make","finishMake","
|
|
1
|
+
{"version":3,"sources":["../../../../src/build/webpack/plugins/profiling-plugin.ts"],"names":["spans","webpackInvalidSpans","ProfilingPlugin","pluginName","WeakMap","moduleSpansByCompilation","makeSpanByCompilation","sealSpanByCompilation","TRACE_LABELS_SEAL","inTraceLabelsSeal","label","some","l","startsWith","constructor","runWebpackSpan","apply","compiler","traceTopLevelHooks","traceCompilationHooks","traceHookPair","spanName","startHook","stopHook","parentSpan","attrs","onStart","onStop","span","tap","name","stage","Infinity","params","attributes","traceChild","stop","hooks","compilation","afterCompile","get","set","options","mode","invalid","done","delete","fileName","trigger","emit","afterEmit","make","finishMake","compilationSpan","_span","buildModule","module","moduleType","userRequest","split","pop","issuerModule","moduleGraph","getIssuer","moduleSpans","issuerSpan","incomingConnection","getIncomingConnections","entrySpan","dependency","setAttribute","moduleHooks","NormalModule","getCompilationHooks","readResource","for","undefined","intercept","register","tapInfo","fn","loaderContext","callback","moduleSpan","currentTraceSpan","err","result","loader","succeedModule","failedModule","seal","afterSeal","addEntry","entry","addEntrySpan","request","succeedEntry","failedEntry","beforeChunks","afterChunks","optimize","reviveModules","optimizeModules","afterOptimizeModules","optimizeChunks","afterOptimizeChunks","optimizeTree","afterOptimizeTree","optimizeChunkModules","afterOptimizeChunkModules","beforeModuleHash","afterModuleHash","beforeCodeGeneration","afterCodeGeneration","beforeHash","afterHash","beforeModuleAssets","logs","Map","originalTime","logger","time","originalTimeEnd","timeEnd","call","replace"],"mappings":"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"}
|
|
@@ -1723,7 +1723,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1723
1723
|
new _wellknownerrorsplugin.WellKnownErrorsPlugin(),
|
|
1724
1724
|
isClient && new _copyfileplugin.CopyFilePlugin({
|
|
1725
1725
|
filePath: require.resolve("./polyfills/polyfill-nomodule"),
|
|
1726
|
-
cacheKey: "13.4.
|
|
1726
|
+
cacheKey: "13.4.3-canary.0",
|
|
1727
1727
|
name: `static/chunks/polyfills${dev ? "" : "-[hash]"}.js`,
|
|
1728
1728
|
minimize: false,
|
|
1729
1729
|
info: {
|
|
@@ -1953,7 +1953,7 @@ async function getBaseWebpackConfig(dir, { buildId , config , compilerType , dev
|
|
|
1953
1953
|
// Includes:
|
|
1954
1954
|
// - Next.js version
|
|
1955
1955
|
// - next.config.js keys that affect compilation
|
|
1956
|
-
version: `${"13.4.
|
|
1956
|
+
version: `${"13.4.3-canary.0"}|${configVars}`,
|
|
1957
1957
|
cacheDirectory: _path.default.join(distDir, "cache", "webpack")
|
|
1958
1958
|
};
|
|
1959
1959
|
// Adds `next.config.js` as a buildDependency when custom webpack config is provided
|
package/dist/client/index.js
CHANGED
|
@@ -58,7 +58,7 @@ const _approutercontext = require("../shared/lib/app-router-context");
|
|
|
58
58
|
const _adapters = require("../shared/lib/router/adapters");
|
|
59
59
|
const _hooksclientcontext = require("../shared/lib/hooks-client-context");
|
|
60
60
|
const _onrecoverableerror = /*#__PURE__*/ _interop_require_default._(require("./on-recoverable-error"));
|
|
61
|
-
const version = "13.4.
|
|
61
|
+
const version = "13.4.3-canary.0";
|
|
62
62
|
let router;
|
|
63
63
|
const emitter = (0, _mitt.default)();
|
|
64
64
|
const looseToArray = (input)=>[].slice.call(input);
|
package/dist/esm/build/index.js
CHANGED
|
@@ -81,7 +81,7 @@ export default async function build(dir, reactProductionProfiling = false, debug
|
|
|
81
81
|
let hasAppDir = false;
|
|
82
82
|
try {
|
|
83
83
|
const nextBuildSpan = trace("next-build", undefined, {
|
|
84
|
-
version: "13.4.
|
|
84
|
+
version: "13.4.3-canary.0"
|
|
85
85
|
});
|
|
86
86
|
NextBuildContext.nextBuildSpan = nextBuildSpan;
|
|
87
87
|
NextBuildContext.dir = dir;
|
|
@@ -9,7 +9,7 @@ import { eventSwcLoadFailure } from "../../telemetry/events/swc-load-failure";
|
|
|
9
9
|
import { patchIncorrectLockfile } from "../../lib/patch-incorrect-lockfile";
|
|
10
10
|
import { downloadWasmSwc } from "../../lib/download-wasm-swc";
|
|
11
11
|
import { spawn } from "child_process";
|
|
12
|
-
const nextVersion = "13.4.
|
|
12
|
+
const nextVersion = "13.4.3-canary.0";
|
|
13
13
|
const ArchName = arch();
|
|
14
14
|
const PlatformName = platform();
|
|
15
15
|
const triples = ((_platformArchTriples_PlatformName = platformArchTriples[PlatformName]) == null ? void 0 : _platformArchTriples_PlatformName[ArchName]) || [];
|
|
@@ -2,7 +2,19 @@ import { NormalModule } from "next/dist/compiled/webpack/webpack";
|
|
|
2
2
|
const pluginName = "ProfilingPlugin";
|
|
3
3
|
export const spans = new WeakMap();
|
|
4
4
|
const moduleSpansByCompilation = new WeakMap();
|
|
5
|
+
const makeSpanByCompilation = new WeakMap();
|
|
6
|
+
const sealSpanByCompilation = new WeakMap();
|
|
5
7
|
export const webpackInvalidSpans = new WeakMap();
|
|
8
|
+
const TRACE_LABELS_SEAL = [
|
|
9
|
+
"module assets",
|
|
10
|
+
"create chunk assets",
|
|
11
|
+
"asset render",
|
|
12
|
+
"asset emit",
|
|
13
|
+
"store asset"
|
|
14
|
+
];
|
|
15
|
+
function inTraceLabelsSeal(label) {
|
|
16
|
+
return TRACE_LABELS_SEAL.some((l)=>label.startsWith(l));
|
|
17
|
+
}
|
|
6
18
|
export class ProfilingPlugin {
|
|
7
19
|
constructor({ runWebpackSpan }){
|
|
8
20
|
this.runWebpackSpan = runWebpackSpan;
|
|
@@ -20,20 +32,20 @@ export class ProfilingPlugin {
|
|
|
20
32
|
}, (...params)=>{
|
|
21
33
|
const name = typeof spanName === "function" ? spanName() : spanName;
|
|
22
34
|
const attributes = attrs ? attrs(...params) : attrs;
|
|
23
|
-
span = parentSpan ? parentSpan().traceChild(name, attributes) : this.runWebpackSpan.traceChild(name, attributes);
|
|
35
|
+
span = parentSpan ? parentSpan(...params).traceChild(name, attributes) : this.runWebpackSpan.traceChild(name, attributes);
|
|
24
36
|
if (onStart) onStart(span, ...params);
|
|
25
37
|
});
|
|
26
38
|
stopHook.tap({
|
|
27
39
|
name: pluginName,
|
|
28
40
|
stage: Infinity
|
|
29
|
-
}, ()=>{
|
|
41
|
+
}, (...params)=>{
|
|
30
42
|
// `stopHook` may be triggered when `startHook` has not in cases
|
|
31
43
|
// where `stopHook` is used as the terminating event for more
|
|
32
44
|
// than one pair of hooks.
|
|
33
45
|
if (!span) {
|
|
34
46
|
return;
|
|
35
47
|
}
|
|
36
|
-
if (onStop) onStop();
|
|
48
|
+
if (onStop) onStop(span, ...params);
|
|
37
49
|
span.stop();
|
|
38
50
|
});
|
|
39
51
|
}
|
|
@@ -64,15 +76,26 @@ export class ProfilingPlugin {
|
|
|
64
76
|
parentSpan: ()=>webpackInvalidSpans.get(compiler) || this.runWebpackSpan
|
|
65
77
|
});
|
|
66
78
|
this.traceHookPair("make", compiler.hooks.make, compiler.hooks.finishMake, {
|
|
67
|
-
parentSpan: ()=>
|
|
68
|
-
});
|
|
69
|
-
compiler.hooks.compilation.tap(pluginName, (compilation)=>{
|
|
70
|
-
compilation.hooks.buildModule.tap(pluginName, (module)=>{
|
|
71
|
-
var _compilation_moduleGraph;
|
|
79
|
+
parentSpan: (compilation)=>{
|
|
72
80
|
const compilationSpan = spans.get(compilation);
|
|
73
81
|
if (!compilationSpan) {
|
|
74
|
-
return;
|
|
82
|
+
return webpackInvalidSpans.get(compiler) || this.runWebpackSpan;
|
|
75
83
|
}
|
|
84
|
+
return compilationSpan;
|
|
85
|
+
},
|
|
86
|
+
onStart: (span, compilation)=>{
|
|
87
|
+
makeSpanByCompilation.set(compilation, span);
|
|
88
|
+
},
|
|
89
|
+
onStop: (_span, compilation)=>{
|
|
90
|
+
makeSpanByCompilation.delete(compilation);
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
compiler.hooks.compilation.tap({
|
|
94
|
+
name: pluginName,
|
|
95
|
+
stage: -Infinity
|
|
96
|
+
}, (compilation)=>{
|
|
97
|
+
compilation.hooks.buildModule.tap(pluginName, (module)=>{
|
|
98
|
+
var _compilation_moduleGraph;
|
|
76
99
|
const moduleType = (()=>{
|
|
77
100
|
if (!module.userRequest) {
|
|
78
101
|
return "";
|
|
@@ -87,13 +110,27 @@ export class ProfilingPlugin {
|
|
|
87
110
|
if (issuerSpan) {
|
|
88
111
|
span = issuerSpan.traceChild(spanName);
|
|
89
112
|
} else {
|
|
90
|
-
|
|
113
|
+
let parentSpan;
|
|
114
|
+
for (const incomingConnection of compilation.moduleGraph.getIncomingConnections(module)){
|
|
115
|
+
const entrySpan = spans.get(incomingConnection.dependency);
|
|
116
|
+
if (entrySpan) {
|
|
117
|
+
parentSpan = entrySpan;
|
|
118
|
+
break;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
if (!parentSpan) {
|
|
122
|
+
const compilationSpan = spans.get(compilation);
|
|
123
|
+
if (!compilationSpan) {
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
parentSpan = compilationSpan;
|
|
127
|
+
}
|
|
128
|
+
span = parentSpan.traceChild(spanName);
|
|
91
129
|
}
|
|
92
130
|
span.setAttribute("name", module.userRequest);
|
|
93
131
|
moduleSpans.set(module, span);
|
|
94
132
|
});
|
|
95
133
|
const moduleHooks = NormalModule.getCompilationHooks(compilation);
|
|
96
|
-
// @ts-ignore TODO: remove ignore when using webpack 5 types
|
|
97
134
|
moduleHooks.readResource.for(undefined).intercept({
|
|
98
135
|
register (tapInfo) {
|
|
99
136
|
const fn = tapInfo.fn;
|
|
@@ -116,40 +153,92 @@ export class ProfilingPlugin {
|
|
|
116
153
|
var _moduleSpansByCompilation_get_get, _moduleSpansByCompilation_get;
|
|
117
154
|
(_moduleSpansByCompilation_get_get = (_moduleSpansByCompilation_get = moduleSpansByCompilation == null ? void 0 : moduleSpansByCompilation.get(compilation)) == null ? void 0 : _moduleSpansByCompilation_get.get(module)) == null ? void 0 : _moduleSpansByCompilation_get_get.stop();
|
|
118
155
|
});
|
|
119
|
-
|
|
120
|
-
|
|
156
|
+
compilation.hooks.failedModule.tap(pluginName, (module)=>{
|
|
157
|
+
var _moduleSpansByCompilation_get_get, _moduleSpansByCompilation_get;
|
|
158
|
+
(_moduleSpansByCompilation_get_get = (_moduleSpansByCompilation_get = moduleSpansByCompilation == null ? void 0 : moduleSpansByCompilation.get(compilation)) == null ? void 0 : _moduleSpansByCompilation_get.get(module)) == null ? void 0 : _moduleSpansByCompilation_get_get.stop();
|
|
159
|
+
});
|
|
160
|
+
this.traceHookPair("seal", compilation.hooks.seal, compilation.hooks.afterSeal, {
|
|
161
|
+
parentSpan: ()=>spans.get(compilation),
|
|
162
|
+
onStart (span) {
|
|
163
|
+
sealSpanByCompilation.set(compilation, span);
|
|
164
|
+
},
|
|
165
|
+
onStop () {
|
|
166
|
+
sealSpanByCompilation.delete(compilation);
|
|
167
|
+
}
|
|
121
168
|
});
|
|
122
169
|
compilation.hooks.addEntry.tap(pluginName, (entry)=>{
|
|
123
|
-
const
|
|
124
|
-
if (!
|
|
170
|
+
const parentSpan = makeSpanByCompilation.get(compilation) || spans.get(compilation);
|
|
171
|
+
if (!parentSpan) {
|
|
125
172
|
return;
|
|
126
173
|
}
|
|
127
|
-
const addEntrySpan =
|
|
174
|
+
const addEntrySpan = parentSpan.traceChild("add-entry");
|
|
128
175
|
addEntrySpan.setAttribute("request", entry.request);
|
|
129
176
|
spans.set(entry, addEntrySpan);
|
|
130
177
|
});
|
|
131
178
|
compilation.hooks.succeedEntry.tap(pluginName, (entry)=>{
|
|
132
179
|
var _spans_get;
|
|
133
180
|
(_spans_get = spans.get(entry)) == null ? void 0 : _spans_get.stop();
|
|
181
|
+
spans.delete(entry);
|
|
182
|
+
});
|
|
183
|
+
compilation.hooks.failedEntry.tap(pluginName, (entry)=>{
|
|
184
|
+
var _spans_get;
|
|
185
|
+
(_spans_get = spans.get(entry)) == null ? void 0 : _spans_get.stop();
|
|
186
|
+
spans.delete(entry);
|
|
134
187
|
});
|
|
135
|
-
this.traceHookPair("
|
|
136
|
-
parentSpan: ()=>
|
|
188
|
+
this.traceHookPair("chunk-graph", compilation.hooks.beforeChunks, compilation.hooks.afterChunks, {
|
|
189
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
137
190
|
});
|
|
138
|
-
this.traceHookPair("
|
|
139
|
-
parentSpan: ()=>
|
|
191
|
+
this.traceHookPair("optimize", compilation.hooks.optimize, compilation.hooks.reviveModules, {
|
|
192
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
140
193
|
});
|
|
141
|
-
this.traceHookPair("
|
|
142
|
-
parentSpan: ()=>
|
|
194
|
+
this.traceHookPair("optimize-modules", compilation.hooks.optimizeModules, compilation.hooks.afterOptimizeModules, {
|
|
195
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
143
196
|
});
|
|
144
|
-
this.traceHookPair("
|
|
145
|
-
parentSpan: ()=>
|
|
197
|
+
this.traceHookPair("optimize-chunks", compilation.hooks.optimizeChunks, compilation.hooks.afterOptimizeChunks, {
|
|
198
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
146
199
|
});
|
|
147
|
-
this.traceHookPair("
|
|
148
|
-
parentSpan: ()=>
|
|
200
|
+
this.traceHookPair("optimize-tree", compilation.hooks.optimizeTree, compilation.hooks.afterOptimizeTree, {
|
|
201
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
149
202
|
});
|
|
150
|
-
this.traceHookPair("
|
|
151
|
-
parentSpan: ()=>
|
|
203
|
+
this.traceHookPair("optimize-chunk-modules", compilation.hooks.optimizeChunkModules, compilation.hooks.afterOptimizeChunkModules, {
|
|
204
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
152
205
|
});
|
|
206
|
+
this.traceHookPair("module-hash", compilation.hooks.beforeModuleHash, compilation.hooks.afterModuleHash, {
|
|
207
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
208
|
+
});
|
|
209
|
+
this.traceHookPair("code-generation", compilation.hooks.beforeCodeGeneration, compilation.hooks.afterCodeGeneration, {
|
|
210
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
211
|
+
});
|
|
212
|
+
this.traceHookPair("hash", compilation.hooks.beforeHash, compilation.hooks.afterHash, {
|
|
213
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
214
|
+
});
|
|
215
|
+
this.traceHookPair("code-generation-jobs", compilation.hooks.afterHash, compilation.hooks.beforeModuleAssets, {
|
|
216
|
+
parentSpan: ()=>sealSpanByCompilation.get(compilation) || spans.get(compilation)
|
|
217
|
+
});
|
|
218
|
+
const logs = new Map();
|
|
219
|
+
const originalTime = compilation.logger.time;
|
|
220
|
+
const originalTimeEnd = compilation.logger.timeEnd;
|
|
221
|
+
compilation.logger.time = (label)=>{
|
|
222
|
+
if (!inTraceLabelsSeal(label)) {
|
|
223
|
+
return originalTime.call(compilation.logger, label);
|
|
224
|
+
}
|
|
225
|
+
const span = sealSpanByCompilation.get(compilation);
|
|
226
|
+
if (span) {
|
|
227
|
+
logs.set(label, span.traceChild(label.replace(/ /g, "-")));
|
|
228
|
+
}
|
|
229
|
+
return originalTime.call(compilation.logger, label);
|
|
230
|
+
};
|
|
231
|
+
compilation.logger.timeEnd = (label)=>{
|
|
232
|
+
if (!inTraceLabelsSeal(label)) {
|
|
233
|
+
return originalTimeEnd.call(compilation.logger, label);
|
|
234
|
+
}
|
|
235
|
+
const span = logs.get(label);
|
|
236
|
+
if (span) {
|
|
237
|
+
span.stop();
|
|
238
|
+
logs.delete(label);
|
|
239
|
+
}
|
|
240
|
+
return originalTimeEnd.call(compilation.logger, label);
|
|
241
|
+
};
|
|
153
242
|
});
|
|
154
243
|
}
|
|
155
244
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/build/webpack/plugins/profiling-plugin.ts"],"names":["NormalModule","pluginName","spans","WeakMap","moduleSpansByCompilation","webpackInvalidSpans","ProfilingPlugin","constructor","runWebpackSpan","apply","compiler","traceTopLevelHooks","traceCompilationHooks","traceHookPair","spanName","startHook","stopHook","parentSpan","attrs","onStart","onStop","span","tap","name","stage","Infinity","params","attributes","traceChild","stop","hooks","compilation","afterCompile","get","set","options","mode","invalid","done","delete","fileName","trigger","emit","afterEmit","make","finishMake","
|
|
1
|
+
{"version":3,"sources":["../../../../src/build/webpack/plugins/profiling-plugin.ts"],"names":["NormalModule","pluginName","spans","WeakMap","moduleSpansByCompilation","makeSpanByCompilation","sealSpanByCompilation","webpackInvalidSpans","TRACE_LABELS_SEAL","inTraceLabelsSeal","label","some","l","startsWith","ProfilingPlugin","constructor","runWebpackSpan","apply","compiler","traceTopLevelHooks","traceCompilationHooks","traceHookPair","spanName","startHook","stopHook","parentSpan","attrs","onStart","onStop","span","tap","name","stage","Infinity","params","attributes","traceChild","stop","hooks","compilation","afterCompile","get","set","options","mode","invalid","done","delete","fileName","trigger","emit","afterEmit","make","finishMake","compilationSpan","_span","buildModule","module","moduleType","userRequest","split","pop","issuerModule","moduleGraph","getIssuer","moduleSpans","issuerSpan","incomingConnection","getIncomingConnections","entrySpan","dependency","setAttribute","moduleHooks","getCompilationHooks","readResource","for","undefined","intercept","register","tapInfo","fn","loaderContext","callback","moduleSpan","currentTraceSpan","err","result","loader","succeedModule","failedModule","seal","afterSeal","addEntry","entry","addEntrySpan","request","succeedEntry","failedEntry","beforeChunks","afterChunks","optimize","reviveModules","optimizeModules","afterOptimizeModules","optimizeChunks","afterOptimizeChunks","optimizeTree","afterOptimizeTree","optimizeChunkModules","afterOptimizeChunkModules","beforeModuleHash","afterModuleHash","beforeCodeGeneration","afterCodeGeneration","beforeHash","afterHash","beforeModuleAssets","logs","Map","originalTime","logger","time","originalTimeEnd","timeEnd","call","replace"],"mappings":"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"}
|
|
@@ -1621,7 +1621,7 @@ export default async function getBaseWebpackConfig(dir, { buildId , config , com
|
|
|
1621
1621
|
new WellKnownErrorsPlugin(),
|
|
1622
1622
|
isClient && new CopyFilePlugin({
|
|
1623
1623
|
filePath: require.resolve("./polyfills/polyfill-nomodule"),
|
|
1624
|
-
cacheKey: "13.4.
|
|
1624
|
+
cacheKey: "13.4.3-canary.0",
|
|
1625
1625
|
name: `static/chunks/polyfills${dev ? "" : "-[hash]"}.js`,
|
|
1626
1626
|
minimize: false,
|
|
1627
1627
|
info: {
|
|
@@ -1851,7 +1851,7 @@ export default async function getBaseWebpackConfig(dir, { buildId , config , com
|
|
|
1851
1851
|
// Includes:
|
|
1852
1852
|
// - Next.js version
|
|
1853
1853
|
// - next.config.js keys that affect compilation
|
|
1854
|
-
version: `${"13.4.
|
|
1854
|
+
version: `${"13.4.3-canary.0"}|${configVars}`,
|
|
1855
1855
|
cacheDirectory: path.join(distDir, "cache", "webpack")
|
|
1856
1856
|
};
|
|
1857
1857
|
// Adds `next.config.js` as a buildDependency when custom webpack config is provided
|
package/dist/esm/client/index.js
CHANGED
|
@@ -23,7 +23,7 @@ import { AppRouterContext } from "../shared/lib/app-router-context";
|
|
|
23
23
|
import { adaptForAppRouterInstance, adaptForSearchParams, PathnameContextProviderAdapter } from "../shared/lib/router/adapters";
|
|
24
24
|
import { SearchParamsContext } from "../shared/lib/hooks-client-context";
|
|
25
25
|
import onRecoverableError from "./on-recoverable-error";
|
|
26
|
-
export const version = "13.4.
|
|
26
|
+
export const version = "13.4.3-canary.0";
|
|
27
27
|
export let router;
|
|
28
28
|
export const emitter = mitt();
|
|
29
29
|
const looseToArray = (input)=>[].slice.call(input);
|
|
@@ -135,7 +135,7 @@ export default class HotReloader {
|
|
|
135
135
|
this.previewProps = previewProps;
|
|
136
136
|
this.rewrites = rewrites;
|
|
137
137
|
this.hotReloaderSpan = trace("hot-reloader", undefined, {
|
|
138
|
-
version: "13.4.
|
|
138
|
+
version: "13.4.3-canary.0"
|
|
139
139
|
});
|
|
140
140
|
// Ensure the hotReloaderSpan is flushed immediately as it's the parentSpan for all processing
|
|
141
141
|
// of the current `next dev` invocation.
|
|
@@ -201,7 +201,7 @@ class HotReloader {
|
|
|
201
201
|
this.previewProps = previewProps;
|
|
202
202
|
this.rewrites = rewrites;
|
|
203
203
|
this.hotReloaderSpan = (0, _trace.trace)("hot-reloader", undefined, {
|
|
204
|
-
version: "13.4.
|
|
204
|
+
version: "13.4.3-canary.0"
|
|
205
205
|
});
|
|
206
206
|
// Ensure the hotReloaderSpan is flushed immediately as it's the parentSpan for all processing
|
|
207
207
|
// of the current `next dev` invocation.
|
|
@@ -11,11 +11,11 @@ Object.defineProperty(exports, "eventCliSession", {
|
|
|
11
11
|
const EVENT_VERSION = "NEXT_CLI_SESSION_STOPPED";
|
|
12
12
|
function eventCliSession(event) {
|
|
13
13
|
// This should be an invariant, if it fails our build tooling is broken.
|
|
14
|
-
if (typeof "13.4.
|
|
14
|
+
if (typeof "13.4.3-canary.0" !== "string") {
|
|
15
15
|
return [];
|
|
16
16
|
}
|
|
17
17
|
const payload = {
|
|
18
|
-
nextVersion: "13.4.
|
|
18
|
+
nextVersion: "13.4.3-canary.0",
|
|
19
19
|
nodeVersion: process.version,
|
|
20
20
|
cliCommand: event.cliCommand,
|
|
21
21
|
durationMilliseconds: event.durationMilliseconds,
|
|
@@ -35,12 +35,12 @@ function hasBabelConfig(dir) {
|
|
|
35
35
|
}
|
|
36
36
|
function eventCliSession(dir, nextConfig, event) {
|
|
37
37
|
// This should be an invariant, if it fails our build tooling is broken.
|
|
38
|
-
if (typeof "13.4.
|
|
38
|
+
if (typeof "13.4.3-canary.0" !== "string") {
|
|
39
39
|
return [];
|
|
40
40
|
}
|
|
41
41
|
const { images , i18n } = nextConfig || {};
|
|
42
42
|
const payload = {
|
|
43
|
-
nextVersion: "13.4.
|
|
43
|
+
nextVersion: "13.4.3-canary.0",
|
|
44
44
|
nodeVersion: process.version,
|
|
45
45
|
cliCommand: event.cliCommand,
|
|
46
46
|
isSrcDir: event.isSrcDir,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "next",
|
|
3
|
-
"version": "13.4.
|
|
3
|
+
"version": "13.4.3-canary.0",
|
|
4
4
|
"description": "The React Framework",
|
|
5
5
|
"main": "./dist/server/next.js",
|
|
6
6
|
"license": "MIT",
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
]
|
|
84
84
|
},
|
|
85
85
|
"dependencies": {
|
|
86
|
-
"@next/env": "13.4.
|
|
86
|
+
"@next/env": "13.4.3-canary.0",
|
|
87
87
|
"@swc/helpers": "0.5.1",
|
|
88
88
|
"busboy": "1.6.0",
|
|
89
89
|
"caniuse-lite": "^1.0.30001406",
|
|
@@ -143,11 +143,11 @@
|
|
|
143
143
|
"@jest/types": "29.5.0",
|
|
144
144
|
"@napi-rs/cli": "2.14.7",
|
|
145
145
|
"@napi-rs/triples": "1.1.0",
|
|
146
|
-
"@next/polyfill-module": "13.4.
|
|
147
|
-
"@next/polyfill-nomodule": "13.4.
|
|
148
|
-
"@next/react-dev-overlay": "13.4.
|
|
149
|
-
"@next/react-refresh-utils": "13.4.
|
|
150
|
-
"@next/swc": "13.4.
|
|
146
|
+
"@next/polyfill-module": "13.4.3-canary.0",
|
|
147
|
+
"@next/polyfill-nomodule": "13.4.3-canary.0",
|
|
148
|
+
"@next/react-dev-overlay": "13.4.3-canary.0",
|
|
149
|
+
"@next/react-refresh-utils": "13.4.3-canary.0",
|
|
150
|
+
"@next/swc": "13.4.3-canary.0",
|
|
151
151
|
"@opentelemetry/api": "1.4.1",
|
|
152
152
|
"@segment/ajv-human-errors": "2.1.2",
|
|
153
153
|
"@taskr/clear": "1.1.0",
|
|
@@ -320,14 +320,14 @@
|
|
|
320
320
|
"node": ">=16.8.0"
|
|
321
321
|
},
|
|
322
322
|
"optionalDependencies": {
|
|
323
|
-
"@next/swc-darwin-arm64": "13.4.
|
|
324
|
-
"@next/swc-darwin-x64": "13.4.
|
|
325
|
-
"@next/swc-linux-arm64-gnu": "13.4.
|
|
326
|
-
"@next/swc-linux-arm64-musl": "13.4.
|
|
327
|
-
"@next/swc-linux-x64-gnu": "13.4.
|
|
328
|
-
"@next/swc-linux-x64-musl": "13.4.
|
|
329
|
-
"@next/swc-win32-arm64-msvc": "13.4.
|
|
330
|
-
"@next/swc-win32-ia32-msvc": "13.4.
|
|
331
|
-
"@next/swc-win32-x64-msvc": "13.4.
|
|
323
|
+
"@next/swc-darwin-arm64": "13.4.3-canary.0",
|
|
324
|
+
"@next/swc-darwin-x64": "13.4.3-canary.0",
|
|
325
|
+
"@next/swc-linux-arm64-gnu": "13.4.3-canary.0",
|
|
326
|
+
"@next/swc-linux-arm64-musl": "13.4.3-canary.0",
|
|
327
|
+
"@next/swc-linux-x64-gnu": "13.4.3-canary.0",
|
|
328
|
+
"@next/swc-linux-x64-musl": "13.4.3-canary.0",
|
|
329
|
+
"@next/swc-win32-arm64-msvc": "13.4.3-canary.0",
|
|
330
|
+
"@next/swc-win32-ia32-msvc": "13.4.3-canary.0",
|
|
331
|
+
"@next/swc-win32-x64-msvc": "13.4.3-canary.0"
|
|
332
332
|
}
|
|
333
333
|
}
|