@salesforce/storefront-next-dev 1.0.0 → 1.1.0-alpha.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/README.md +0 -3
- package/dist/cartridge-services/index.d.ts.map +1 -1
- package/dist/cartridge-services/index.js +4 -0
- package/dist/cartridge-services/index.js.map +1 -1
- package/dist/commands/config/aggregate-extensions.js +279 -0
- package/dist/commands/locales/aggregate-extensions.js +3 -2
- package/dist/commands/push.js +2 -0
- package/dist/constants.js +29 -0
- package/dist/entry/server.js +8 -4
- package/dist/entry/server.js.map +1 -1
- package/dist/generate-cartridge.js +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +150 -20
- package/dist/index.js.map +1 -1
- package/dist/logger.js +1 -1
- package/dist/mrt/ssr.mjs +51 -51
- package/dist/mrt/ssr.mjs.map +1 -1
- package/dist/mrt/streamingHandler.mjs +57 -57
- package/dist/mrt/streamingHandler.mjs.map +1 -1
- package/dist/server.js +10 -5
- package/package.json +4 -4
package/dist/server.js
CHANGED
|
@@ -12,10 +12,10 @@ import compression from "compression";
|
|
|
12
12
|
import zlib from "node:zlib";
|
|
13
13
|
import morgan from "morgan";
|
|
14
14
|
import { minimatch } from "minimatch";
|
|
15
|
-
import { SpanStatusCode, context, trace } from "@opentelemetry/api";
|
|
15
|
+
import { ROOT_CONTEXT, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
|
|
16
16
|
import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
|
|
17
|
-
import { ConsoleSpanExporter, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
18
|
-
import { ExportResultCode, hrTimeToTimeStamp } from "@opentelemetry/core";
|
|
17
|
+
import { AlwaysOnSampler, ConsoleSpanExporter, ParentBasedSampler, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base";
|
|
18
|
+
import { ExportResultCode, W3CTraceContextPropagator, hrTimeToTimeStamp } from "@opentelemetry/core";
|
|
19
19
|
import { Resource } from "@opentelemetry/resources";
|
|
20
20
|
import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
|
|
21
21
|
import { registerInstrumentations } from "@opentelemetry/instrumentation";
|
|
@@ -425,9 +425,13 @@ const UNDICI_REGISTERED_KEY = Symbol.for("sfnext.otel.undici_registered");
|
|
|
425
425
|
function initTelemetry() {
|
|
426
426
|
if (cachedTracer) return cachedTracer;
|
|
427
427
|
try {
|
|
428
|
-
const provider = new NodeTracerProvider({
|
|
428
|
+
const provider = new NodeTracerProvider({
|
|
429
|
+
resource: new Resource({ [ATTR_SERVICE_NAME]: SERVICE_NAME }),
|
|
430
|
+
sampler: new ParentBasedSampler({ root: new AlwaysOnSampler() })
|
|
431
|
+
});
|
|
429
432
|
provider.addSpanProcessor(new SimpleSpanProcessor(new MrtConsoleSpanExporter()));
|
|
430
433
|
provider.register();
|
|
434
|
+
propagation.setGlobalPropagator(new W3CTraceContextPropagator());
|
|
431
435
|
if (!globalThis[UNDICI_REGISTERED_KEY]) {
|
|
432
436
|
globalThis[UNDICI_REGISTERED_KEY] = true;
|
|
433
437
|
registerInstrumentations({
|
|
@@ -459,10 +463,11 @@ function createOtelExpressMiddleware() {
|
|
|
459
463
|
try {
|
|
460
464
|
const url = new URL(req.originalUrl || req.url, "http://localhost").pathname;
|
|
461
465
|
const method = req.method;
|
|
466
|
+
const parentContext = propagation.extract(ROOT_CONTEXT, req.headers);
|
|
462
467
|
tracer.startActiveSpan(`[sfnext] server ${method} ${url}`, { attributes: {
|
|
463
468
|
"http.request.method": method,
|
|
464
469
|
"url.path": url
|
|
465
|
-
} }, (serverSpan) => {
|
|
470
|
+
} }, parentContext, (serverSpan) => {
|
|
466
471
|
try {
|
|
467
472
|
const spanContext = trace.getSpan(context.active())?.spanContext();
|
|
468
473
|
if (spanContext) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/storefront-next-dev",
|
|
3
|
-
"version": "1.0.0",
|
|
3
|
+
"version": "1.1.0-alpha.0",
|
|
4
4
|
"description": "Dev and build tools for SFCC Storefront Next",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -110,11 +110,11 @@
|
|
|
110
110
|
"license": "Apache-2.0",
|
|
111
111
|
"peerDependencies": {
|
|
112
112
|
"@react-router/dev": ">=7.0.0",
|
|
113
|
+
"@salesforce/storefront-next-runtime": "^1.1.0-alpha.0",
|
|
113
114
|
"react": ">=19.0.0",
|
|
114
115
|
"react-dom": ">=19.0.0",
|
|
115
116
|
"react-router": ">=7.0.0",
|
|
116
|
-
"vite": ">=7.0.0"
|
|
117
|
-
"@salesforce/storefront-next-runtime": "1.0.0"
|
|
117
|
+
"vite": ">=7.0.0"
|
|
118
118
|
},
|
|
119
119
|
"devDependencies": {
|
|
120
120
|
"@oclif/test": "^4.1.15",
|
|
@@ -173,7 +173,7 @@
|
|
|
173
173
|
"@opentelemetry/sdk-trace-node": "^1.30.0",
|
|
174
174
|
"@opentelemetry/semantic-conventions": "^1.28.0",
|
|
175
175
|
"@react-router/express": "7.12.0",
|
|
176
|
-
"@salesforce/b2c-tooling-sdk": "^1.
|
|
176
|
+
"@salesforce/b2c-tooling-sdk": "^1.15.0",
|
|
177
177
|
"archiver": "^7.0.1",
|
|
178
178
|
"babel-dead-code-elimination": "1.0.12",
|
|
179
179
|
"chalk": "^5.3.0",
|