@lwrjs/core 0.21.7 → 0.22.1
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/build/cjs/middleware/asset-middleware.cjs +1 -1
- package/build/cjs/middleware/utils/identity.cjs +1 -1
- package/build/cjs/tools/static-generation.cjs +1 -1
- package/build/es/middleware/asset-middleware.js +2 -2
- package/build/es/middleware/utils/identity.js +1 -5
- package/build/es/tools/static-generation.js +4 -2
- package/package.json +32 -32
|
@@ -60,7 +60,7 @@ function createAssetMiddleware(context) {
|
|
|
60
60
|
const {runtimeEnvironment} = req.getRuntimeContext(context.runtimeEnvironment);
|
|
61
61
|
const {assetId, immutable, signature} = (0, import_identity.getAssetIdentity)(req);
|
|
62
62
|
if (basePath && !assetId.specifier.startsWith(basePath)) {
|
|
63
|
-
assetId.specifier =
|
|
63
|
+
assetId.specifier = (0, import_shared_utils.joinUrlPath)(basePath, assetId.specifier);
|
|
64
64
|
}
|
|
65
65
|
try {
|
|
66
66
|
let asset;
|
|
@@ -71,7 +71,7 @@ function getResourceIdentity(req) {
|
|
|
71
71
|
}
|
|
72
72
|
function getAssetIdentity(req) {
|
|
73
73
|
const {signature, immutable, assetType: type} = req.params;
|
|
74
|
-
const specifier = type ?
|
|
74
|
+
const specifier = type ? "/" + req.params[0] : req.originalUrl.split("?")[0];
|
|
75
75
|
if (validateSpecifier(specifier) === false) {
|
|
76
76
|
throw new import_diagnostics.LwrInvalidError(import_diagnostics.descriptions.INVALID.INVALID_SPECIFIER(specifier));
|
|
77
77
|
}
|
|
@@ -523,7 +523,7 @@ var SiteGenerator = class {
|
|
|
523
523
|
}
|
|
524
524
|
addAssetToMetadata(filePath, siteConfig) {
|
|
525
525
|
try {
|
|
526
|
-
const uri = encodeURI((0, import_path.normalize)(filePath).replace(siteConfig.outputDir, ""));
|
|
526
|
+
const uri = encodeURI((0, import_shared_utils.toForwardSlash)((0, import_path.normalize)(filePath).replace((0, import_path.normalize)(siteConfig.outputDir), "")));
|
|
527
527
|
this.addAssetToSiteMetadata({
|
|
528
528
|
uri,
|
|
529
529
|
type: "asset",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getFeatureFlags } from '@lwrjs/shared-utils';
|
|
1
|
+
import { getFeatureFlags, joinUrlPath } from '@lwrjs/shared-utils';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { LwrUnresolvableError, logger } from '@lwrjs/diagnostics';
|
|
4
4
|
import { RequestHandlerSpan, getTracer } from '@lwrjs/instrumentation';
|
|
@@ -34,7 +34,7 @@ function createAssetMiddleware(context) {
|
|
|
34
34
|
const { runtimeEnvironment } = req.getRuntimeContext(context.runtimeEnvironment);
|
|
35
35
|
const { assetId, immutable, signature } = getAssetIdentity(req);
|
|
36
36
|
if (basePath && !assetId.specifier.startsWith(basePath)) {
|
|
37
|
-
assetId.specifier =
|
|
37
|
+
assetId.specifier = joinUrlPath(basePath, assetId.specifier);
|
|
38
38
|
}
|
|
39
39
|
try {
|
|
40
40
|
let asset;
|
|
@@ -40,11 +40,7 @@ export function getResourceIdentity(req) {
|
|
|
40
40
|
}
|
|
41
41
|
export function getAssetIdentity(req) {
|
|
42
42
|
const { signature, immutable, assetType: type } = req.params;
|
|
43
|
-
const specifier = type
|
|
44
|
-
? process.platform === 'win32'
|
|
45
|
-
? req.params[0]
|
|
46
|
-
: '/' + req.params[0]
|
|
47
|
-
: req.originalUrl.split('?')[0];
|
|
43
|
+
const specifier = type ? '/' + req.params[0] : req.originalUrl.split('?')[0];
|
|
48
44
|
if (validateSpecifier(specifier) === false) {
|
|
49
45
|
throw new LwrInvalidError(descriptions.INVALID.INVALID_SPECIFIER(specifier));
|
|
50
46
|
}
|
|
@@ -2,7 +2,7 @@ import { performance } from 'perf_hooks';
|
|
|
2
2
|
import { logger } from '@lwrjs/diagnostics';
|
|
3
3
|
import {
|
|
4
4
|
// createIntegrityHash,
|
|
5
|
-
getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, isExternalUrl, mimeLookup, getViewUri, sortLocalesByFallback, VERSION_NOT_PROVIDED, PROTOCOL_FILE, normalizeFromFileURL, isExternalSpecifier, explodeSpecifier, prettyModuleUriSuffix, normalizeVersionToUri, signBundle, } from '@lwrjs/shared-utils';
|
|
5
|
+
getSpecifier, getFeatureFlags, hashContent, isSelfUrl, getModuleUriPrefix, getMappingUriPrefix, isExternalUrl, mimeLookup, getViewUri, sortLocalesByFallback, VERSION_NOT_PROVIDED, PROTOCOL_FILE, normalizeFromFileURL, isExternalSpecifier, explodeSpecifier, prettyModuleUriSuffix, normalizeVersionToUri, signBundle, toForwardSlash, } from '@lwrjs/shared-utils';
|
|
6
6
|
import { SiteMetadataImpl, getSiteBundleId, getSiteResourceId } from '@lwrjs/static/site-metadata';
|
|
7
7
|
import { join, dirname, extname, normalize } from 'path';
|
|
8
8
|
import fs from 'fs-extra';
|
|
@@ -707,7 +707,9 @@ export default class SiteGenerator {
|
|
|
707
707
|
}
|
|
708
708
|
addAssetToMetadata(filePath, siteConfig) {
|
|
709
709
|
try {
|
|
710
|
-
|
|
710
|
+
// Normalize both paths so the prefix-strip works on all platforms,
|
|
711
|
+
// then ensure forward slashes for the resulting URI
|
|
712
|
+
const uri = encodeURI(toForwardSlash(normalize(filePath).replace(normalize(siteConfig.outputDir), '')));
|
|
711
713
|
this.addAssetToSiteMetadata({
|
|
712
714
|
uri,
|
|
713
715
|
type: 'asset',
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
7
|
-
"version": "0.
|
|
7
|
+
"version": "0.22.1",
|
|
8
8
|
"homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|
|
@@ -43,34 +43,34 @@
|
|
|
43
43
|
"build": "tsc -b"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@lwrjs/app-service": "0.
|
|
47
|
-
"@lwrjs/asset-registry": "0.
|
|
48
|
-
"@lwrjs/asset-transformer": "0.
|
|
49
|
-
"@lwrjs/base-view-provider": "0.
|
|
50
|
-
"@lwrjs/base-view-transformer": "0.
|
|
51
|
-
"@lwrjs/client-modules": "0.
|
|
52
|
-
"@lwrjs/config": "0.
|
|
53
|
-
"@lwrjs/diagnostics": "0.
|
|
54
|
-
"@lwrjs/esbuild": "0.
|
|
55
|
-
"@lwrjs/fs-asset-provider": "0.
|
|
56
|
-
"@lwrjs/fs-watch": "0.
|
|
57
|
-
"@lwrjs/html-view-provider": "0.
|
|
58
|
-
"@lwrjs/instrumentation": "0.
|
|
59
|
-
"@lwrjs/loader": "0.
|
|
60
|
-
"@lwrjs/lwc-module-provider": "0.
|
|
61
|
-
"@lwrjs/lwc-ssr": "0.
|
|
62
|
-
"@lwrjs/markdown-view-provider": "0.
|
|
63
|
-
"@lwrjs/module-bundler": "0.
|
|
64
|
-
"@lwrjs/module-registry": "0.
|
|
65
|
-
"@lwrjs/npm-module-provider": "0.
|
|
66
|
-
"@lwrjs/nunjucks-view-provider": "0.
|
|
67
|
-
"@lwrjs/o11y": "0.
|
|
68
|
-
"@lwrjs/resource-registry": "0.
|
|
69
|
-
"@lwrjs/router": "0.
|
|
70
|
-
"@lwrjs/server": "0.
|
|
71
|
-
"@lwrjs/shared-utils": "0.
|
|
72
|
-
"@lwrjs/static": "0.
|
|
73
|
-
"@lwrjs/view-registry": "0.
|
|
46
|
+
"@lwrjs/app-service": "0.22.1",
|
|
47
|
+
"@lwrjs/asset-registry": "0.22.1",
|
|
48
|
+
"@lwrjs/asset-transformer": "0.22.1",
|
|
49
|
+
"@lwrjs/base-view-provider": "0.22.1",
|
|
50
|
+
"@lwrjs/base-view-transformer": "0.22.1",
|
|
51
|
+
"@lwrjs/client-modules": "0.22.1",
|
|
52
|
+
"@lwrjs/config": "0.22.1",
|
|
53
|
+
"@lwrjs/diagnostics": "0.22.1",
|
|
54
|
+
"@lwrjs/esbuild": "0.22.1",
|
|
55
|
+
"@lwrjs/fs-asset-provider": "0.22.1",
|
|
56
|
+
"@lwrjs/fs-watch": "0.22.1",
|
|
57
|
+
"@lwrjs/html-view-provider": "0.22.1",
|
|
58
|
+
"@lwrjs/instrumentation": "0.22.1",
|
|
59
|
+
"@lwrjs/loader": "0.22.1",
|
|
60
|
+
"@lwrjs/lwc-module-provider": "0.22.1",
|
|
61
|
+
"@lwrjs/lwc-ssr": "0.22.1",
|
|
62
|
+
"@lwrjs/markdown-view-provider": "0.22.1",
|
|
63
|
+
"@lwrjs/module-bundler": "0.22.1",
|
|
64
|
+
"@lwrjs/module-registry": "0.22.1",
|
|
65
|
+
"@lwrjs/npm-module-provider": "0.22.1",
|
|
66
|
+
"@lwrjs/nunjucks-view-provider": "0.22.1",
|
|
67
|
+
"@lwrjs/o11y": "0.22.1",
|
|
68
|
+
"@lwrjs/resource-registry": "0.22.1",
|
|
69
|
+
"@lwrjs/router": "0.22.1",
|
|
70
|
+
"@lwrjs/server": "0.22.1",
|
|
71
|
+
"@lwrjs/shared-utils": "0.22.1",
|
|
72
|
+
"@lwrjs/static": "0.22.1",
|
|
73
|
+
"@lwrjs/view-registry": "0.22.1",
|
|
74
74
|
"chokidar": "^3.6.0",
|
|
75
75
|
"esbuild": "^0.9.7",
|
|
76
76
|
"fs-extra": "^11.2.0",
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"ws": "^8.18.0"
|
|
81
81
|
},
|
|
82
82
|
"devDependencies": {
|
|
83
|
-
"@lwrjs/types": "0.
|
|
83
|
+
"@lwrjs/types": "0.22.1",
|
|
84
84
|
"@types/ws": "^8.5.12",
|
|
85
85
|
"memfs": "^4.13.0"
|
|
86
86
|
},
|
|
@@ -88,10 +88,10 @@
|
|
|
88
88
|
"lwc": ">= 2.x"
|
|
89
89
|
},
|
|
90
90
|
"engines": {
|
|
91
|
-
"node": ">=
|
|
91
|
+
"node": ">=22.0.0"
|
|
92
92
|
},
|
|
93
93
|
"volta": {
|
|
94
94
|
"extends": "../../../package.json"
|
|
95
95
|
},
|
|
96
|
-
"gitHead": "
|
|
96
|
+
"gitHead": "29d44fb69ae394a4191c6a81024a8a81f2125556"
|
|
97
97
|
}
|