one 1.2.31 → 1.2.32
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/cjs/vite/customNodeExternals.cjs +2 -4
- package/dist/cjs/vite/customNodeExternals.js +2 -2
- package/dist/cjs/vite/customNodeExternals.js.map +1 -1
- package/dist/cjs/vite/customNodeExternals.native.js +2 -5
- package/dist/cjs/vite/customNodeExternals.native.js.map +1 -1
- package/dist/cjs/vite/plugins/resolveIdScan.test.cjs +47 -0
- package/dist/cjs/vite/plugins/resolveIdScan.test.js +42 -0
- package/dist/cjs/vite/plugins/resolveIdScan.test.js.map +6 -0
- package/dist/cjs/vite/plugins/resolveIdScan.test.native.js +58 -0
- package/dist/cjs/vite/plugins/resolveIdScan.test.native.js.map +1 -0
- package/dist/esm/vite/customNodeExternals.js +2 -2
- package/dist/esm/vite/customNodeExternals.js.map +1 -1
- package/dist/esm/vite/customNodeExternals.mjs +2 -4
- package/dist/esm/vite/customNodeExternals.mjs.map +1 -1
- package/dist/esm/vite/customNodeExternals.native.js +2 -5
- package/dist/esm/vite/customNodeExternals.native.js.map +1 -1
- package/dist/esm/vite/plugins/resolveIdScan.test.js +23 -0
- package/dist/esm/vite/plugins/resolveIdScan.test.js.map +6 -0
- package/dist/esm/vite/plugins/resolveIdScan.test.mjs +26 -0
- package/dist/esm/vite/plugins/resolveIdScan.test.mjs.map +1 -0
- package/dist/esm/vite/plugins/resolveIdScan.test.native.js +34 -0
- package/dist/esm/vite/plugins/resolveIdScan.test.native.js.map +1 -0
- package/package.json +9 -9
- package/src/vite/customNodeExternals.ts +7 -2
- package/types/vite/customNodeExternals.d.ts.map +1 -1
|
@@ -42,10 +42,8 @@ function nodeExternals() {
|
|
|
42
42
|
enforce: "pre",
|
|
43
43
|
resolveId: {
|
|
44
44
|
order: "pre",
|
|
45
|
-
async handler(specifier, importer, {
|
|
46
|
-
isEntry
|
|
47
|
-
}) {
|
|
48
|
-
if (isEntry ||
|
|
45
|
+
async handler(specifier, importer, options) {
|
|
46
|
+
if (options?.scan || options?.isEntry ||
|
|
49
47
|
// Ignore entry points (they should always be resolved)
|
|
50
48
|
/^(?:\0|\.{1,2}\/)/.test(specifier) ||
|
|
51
49
|
// Ignore virtual modules and relative imports
|
|
@@ -32,8 +32,8 @@ function nodeExternals() {
|
|
|
32
32
|
enforce: "pre",
|
|
33
33
|
resolveId: {
|
|
34
34
|
order: "pre",
|
|
35
|
-
async handler(specifier, importer,
|
|
36
|
-
if (isEntry || // Ignore entry points (they should always be resolved)
|
|
35
|
+
async handler(specifier, importer, options) {
|
|
36
|
+
if (options?.scan || options?.isEntry || // Ignore entry points (they should always be resolved)
|
|
37
37
|
/^(?:\0|\.{1,2}\/)/.test(specifier) || // Ignore virtual modules and relative imports
|
|
38
38
|
import_node_path.default.isAbsolute(specifier))
|
|
39
39
|
return null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/vite/customNodeExternals.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAA0B,wBAC1B,mBAAiB;AAGV,SAAS,gBAAwB;AACtC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IAET,WAAW;AAAA,MACT,OAAO;AAAA,MACP,MAAM,QAAQ,WAAW,UAAU,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,yBAA0B,wBAC1B,mBAAiB;AAGV,SAAS,gBAAwB;AACtC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IAET,WAAW;AAAA,MACT,OAAO;AAAA,MACP,MAAM,QAAQ,WAAW,UAAU,SAAS;AAM1C,YAFI,SAAS,QAGX,SAAS;AAAA,QACT,oBAAoB,KAAK,SAAS;AAAA,QAClC,iBAAAA,QAAK,WAAW,SAAS;AAEzB,iBAAO;AAET,gBAAI,8BAAU,SAAS,GAAG;AACxB,gBAAM,WAAW,UAAU,QAAQ,UAAU,EAAE;AAC/C,iBAAO;AAAA,YACL,QAAK,8BAAU,QAAQ,IAAyB,WAArB,UAAU;AAAA,YACrC,UAAU;AAAA,YACV,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;",
|
|
5
5
|
"names": ["path"]
|
|
6
6
|
}
|
|
@@ -44,11 +44,8 @@ function nodeExternals() {
|
|
|
44
44
|
enforce: "pre",
|
|
45
45
|
resolveId: {
|
|
46
46
|
order: "pre",
|
|
47
|
-
async handler(specifier, importer,
|
|
48
|
-
|
|
49
|
-
isEntry
|
|
50
|
-
} = param;
|
|
51
|
-
if (isEntry ||
|
|
47
|
+
async handler(specifier, importer, options) {
|
|
48
|
+
if (options?.scan || options?.isEntry ||
|
|
52
49
|
// Ignore entry points (they should always be resolved)
|
|
53
50
|
/^(?:\0|\.{1,2}\/)/.test(specifier) ||
|
|
54
51
|
// Ignore virtual modules and relative imports
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","customNodeExternals_exports","__export","nodeExternals","module","exports","import_module","require","import_path","__toESM","name","enforce","resolveId","order","handler","specifier","importer","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","customNodeExternals_exports","__export","nodeExternals","module","exports","import_module","require","import_path","__toESM","name","enforce","resolveId","order","handler","specifier","importer","options","scan","isEntry","test","default","isAbsolute","isBuiltin","stripped","replace","id","external","moduleSideEffects"],"sources":["../../../src/vite/customNodeExternals.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAAA;EAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;IAAAC,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAI,2BAAA;AAAAC,QAAA,CAAAD,2BAAA;EAAAE,aAAA,EAAAA,CAAA,KAAAA;AAAA;AAEAC,MAAA,CAAAC,OAAA,GAAAT,YAA0B,CAAAK,2BAC1B;AAGO,IAAAK,aAAS,GAAAC,OAAwB;EAAAC,WAAA,GAAAC,OAAA,CAAAF,OAAA;AACtC,SAAOJ,cAAA;EAAA,OACL;IACAO,IAAA,kBAAS;IAETC,OAAA,OAAW;IAAAC,SACF;MACPC,KAAA,EAAM;MAMJ,MAFIC,QAAAC,SAGF,EAAAC,QAAS,EAAAC,OAAA;QACT,IAAAA,OAAA,EAAAC,IAAA,IAAoBD,OAAK,EAAAE,OAAS;QAAA;QAClC,oBAAAC,IAAA,CAAKL,SAAA;QAAW;QAEhBP,WAAO,CAAAa,OAAA,CAAAC,UAAA,CAAAP,SAAA,GAET,OAAI;QACF,QAAMT,aAAW,CAAAiB,SAAU,EAAAR,SAAQ;UACnC,IAAAS,QAAO,GAAAT,SAAA,CAAAU,OAAA;UAAA,OACL;YACAC,EAAA,MAAApB,aAAU,CAAAiB,SAAA,EAAAC,QAAA,IAAAA,QAAA,aAAAA,QAAA;YACVG,QAAA;YACFC,iBAAA;UACF;QACF;MACF;IACF;EACF","ignoreList":[]}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getProtoOf = Object.getPrototypeOf,
|
|
6
|
+
__hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
+
var __copyProps = (to, from, except, desc) => {
|
|
8
|
+
if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
|
|
9
|
+
get: () => from[key],
|
|
10
|
+
enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
|
|
11
|
+
});
|
|
12
|
+
return to;
|
|
13
|
+
};
|
|
14
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
15
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
16
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
17
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
18
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
19
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
|
|
20
|
+
value: mod,
|
|
21
|
+
enumerable: !0
|
|
22
|
+
}) : target, mod));
|
|
23
|
+
var import_vitest = require("vitest");
|
|
24
|
+
(0, import_vitest.describe)("resolveId hooks should skip during dep optimization scan", () => {
|
|
25
|
+
(0, import_vitest.describe)("platform-specific-resolve", () => {
|
|
26
|
+
(0, import_vitest.it)("should return undefined when options.scan is true", async () => {
|
|
27
|
+
const {
|
|
28
|
+
getBaseVitePlugins
|
|
29
|
+
} = await import("../config/getBaseVitePlugins"),
|
|
30
|
+
plugin = getBaseVitePlugins().find(p => typeof p == "object" && p !== null && "name" in p && p.name === "platform-specific-resolve");
|
|
31
|
+
if ((0, import_vitest.expect)(plugin).toBeDefined(), !plugin || typeof plugin != "object" || !("resolveId" in plugin)) throw new Error("Plugin not found or missing resolveId");
|
|
32
|
+
const resolveId = plugin.resolveId,
|
|
33
|
+
mockContext = {
|
|
34
|
+
resolve: import_vitest.vi.fn().mockResolvedValue({
|
|
35
|
+
id: "/some/path/file.ts"
|
|
36
|
+
}),
|
|
37
|
+
environment: {
|
|
38
|
+
name: "client"
|
|
39
|
+
}
|
|
40
|
+
},
|
|
41
|
+
result = await resolveId.call(mockContext, "some-module", "/importer.ts", {
|
|
42
|
+
scan: !0
|
|
43
|
+
});
|
|
44
|
+
(0, import_vitest.expect)(result).toBeUndefined(), (0, import_vitest.expect)(mockContext.resolve).not.toHaveBeenCalled();
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
});
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
var __create = Object.create;
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __getProtoOf = Object.getPrototypeOf, __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __copyProps = (to, from, except, desc) => {
|
|
7
|
+
if (from && typeof from == "object" || typeof from == "function")
|
|
8
|
+
for (let key of __getOwnPropNames(from))
|
|
9
|
+
!__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
10
|
+
return to;
|
|
11
|
+
};
|
|
12
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
13
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
14
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
15
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
16
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
17
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
|
|
18
|
+
mod
|
|
19
|
+
));
|
|
20
|
+
var import_vitest = require("vitest");
|
|
21
|
+
(0, import_vitest.describe)("resolveId hooks should skip during dep optimization scan", () => {
|
|
22
|
+
(0, import_vitest.describe)("platform-specific-resolve", () => {
|
|
23
|
+
(0, import_vitest.it)("should return undefined when options.scan is true", async () => {
|
|
24
|
+
const { getBaseVitePlugins } = await import("../config/getBaseVitePlugins"), plugin = getBaseVitePlugins().find(
|
|
25
|
+
(p) => typeof p == "object" && p !== null && "name" in p && p.name === "platform-specific-resolve"
|
|
26
|
+
);
|
|
27
|
+
if ((0, import_vitest.expect)(plugin).toBeDefined(), !plugin || typeof plugin != "object" || !("resolveId" in plugin))
|
|
28
|
+
throw new Error("Plugin not found or missing resolveId");
|
|
29
|
+
const resolveId = plugin.resolveId, mockContext = {
|
|
30
|
+
resolve: import_vitest.vi.fn().mockResolvedValue({ id: "/some/path/file.ts" }),
|
|
31
|
+
environment: { name: "client" }
|
|
32
|
+
}, result = await resolveId.call(
|
|
33
|
+
mockContext,
|
|
34
|
+
"some-module",
|
|
35
|
+
"/importer.ts",
|
|
36
|
+
{ scan: !0 }
|
|
37
|
+
);
|
|
38
|
+
(0, import_vitest.expect)(result).toBeUndefined(), (0, import_vitest.expect)(mockContext.resolve).not.toHaveBeenCalled();
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
//# sourceMappingURL=resolveIdScan.test.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../../src/vite/plugins/resolveIdScan.test.ts"],
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;AAAA,oBAAyC;AAAA,IAazC,wBAAS,4DAA4D,MAAM;AACzE,8BAAS,6BAA6B,MAAM;AAC1C,0BAAG,qDAAqD,YAAY;AAElE,YAAM,EAAE,mBAAmB,IAAI,MAAM,OAAO,8BAA8B,GAIpE,SAHU,mBAAmB,EAGZ;AAAA,QACrB,CAAC,MAAM,OAAO,KAAM,YAAY,MAAM,QAAQ,UAAU,KAAK,EAAE,SAAS;AAAA,MAC1E;AAGA,cADA,sBAAO,MAAM,EAAE,YAAY,GACvB,CAAC,UAAU,OAAO,UAAW,YAAY,EAAE,eAAe;AAC5D,cAAM,IAAI,MAAM,uCAAuC;AAGzD,YAAM,YAAY,OAAO,WAGnB,cAAc;AAAA,QAClB,SAAS,iBAAG,GAAG,EAAE,kBAAkB,EAAE,IAAI,qBAAqB,CAAC;AAAA,QAC/D,aAAa,EAAE,MAAM,SAAS;AAAA,MAChC,GAGM,SAAS,MAAM,UAAU;AAAA,QAC7B;AAAA,QACA;AAAA,QACA;AAAA,QACA,EAAE,MAAM,GAAK;AAAA,MACf;AAEA,gCAAO,MAAM,EAAE,cAAc,OAE7B,sBAAO,YAAY,OAAO,EAAE,IAAI,iBAAiB;AAAA,IACnD,CAAC;AAAA,EACH,CAAC;AACH,CAAC;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var __create = Object.create;
|
|
4
|
+
var __defProp = Object.defineProperty;
|
|
5
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
6
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
7
|
+
var __getProtoOf = Object.getPrototypeOf,
|
|
8
|
+
__hasOwnProp = Object.prototype.hasOwnProperty;
|
|
9
|
+
var __copyProps = (to, from, except, desc) => {
|
|
10
|
+
if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
|
|
11
|
+
get: () => from[key],
|
|
12
|
+
enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
|
|
13
|
+
});
|
|
14
|
+
return to;
|
|
15
|
+
};
|
|
16
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
17
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
18
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
19
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
20
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
21
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
|
|
22
|
+
value: mod,
|
|
23
|
+
enumerable: !0
|
|
24
|
+
}) : target, mod));
|
|
25
|
+
var import_vitest = require("vitest");
|
|
26
|
+
function _type_of(obj) {
|
|
27
|
+
"@swc/helpers - typeof";
|
|
28
|
+
|
|
29
|
+
return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
30
|
+
}
|
|
31
|
+
(0, import_vitest.describe)("resolveId hooks should skip during dep optimization scan", function () {
|
|
32
|
+
(0, import_vitest.describe)("platform-specific-resolve", function () {
|
|
33
|
+
(0, import_vitest.it)("should return undefined when options.scan is true", async function () {
|
|
34
|
+
var {
|
|
35
|
+
getBaseVitePlugins
|
|
36
|
+
} = await import("../config/getBaseVitePlugins"),
|
|
37
|
+
plugins = getBaseVitePlugins(),
|
|
38
|
+
plugin = plugins.find(function (p) {
|
|
39
|
+
return (typeof p > "u" ? "undefined" : _type_of(p)) === "object" && p !== null && "name" in p && p.name === "platform-specific-resolve";
|
|
40
|
+
});
|
|
41
|
+
if ((0, import_vitest.expect)(plugin).toBeDefined(), !plugin || (typeof plugin > "u" ? "undefined" : _type_of(plugin)) !== "object" || !("resolveId" in plugin)) throw new Error("Plugin not found or missing resolveId");
|
|
42
|
+
var resolveId = plugin.resolveId,
|
|
43
|
+
mockContext = {
|
|
44
|
+
resolve: import_vitest.vi.fn().mockResolvedValue({
|
|
45
|
+
id: "/some/path/file.ts"
|
|
46
|
+
}),
|
|
47
|
+
environment: {
|
|
48
|
+
name: "client"
|
|
49
|
+
}
|
|
50
|
+
},
|
|
51
|
+
result = await resolveId.call(mockContext, "some-module", "/importer.ts", {
|
|
52
|
+
scan: !0
|
|
53
|
+
});
|
|
54
|
+
(0, import_vitest.expect)(result).toBeUndefined(), (0, import_vitest.expect)(mockContext.resolve).not.toHaveBeenCalled();
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
//# sourceMappingURL=resolveIdScan.test.native.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["import_vitest","require","_type_of","obj","Symbol","constructor","describe","it","getBaseVitePlugins","plugins","plugin","find","p","name","expect","toBeDefined","Error","resolveId","mockContext","resolve","vi","fn","mockResolvedValue","id","environment","result","call"],"sources":["../../../../src/vite/plugins/resolveIdScan.test.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;gBAAA;AAAyC,IAazCA,aAAA,GAAAC,OAAA,CAAS;AACP,SAAAC,SAAAC,GAAA;EACE;;EAEE,OAAAA,GAAM,IAAE,OAAAC,MAAA,MAAmB,IAAID,GAAA,CAAME,WAAO,KAAAD,MAAA,qBAItCD,GAAA;AAAiB;AACmD,IAAAH,aAC1E,CAAAM,QAAA;EAGA,IAAAN,aADA,CAAAM,QAAA,6BAA2B,EACvB,YAAW;IACb,IAAAN,aAAU,CAAAO,EAAM,qDAAuC;MAGzD;UAAMC;QAAmB,gBAGnB,+BAAc;QAAAC,OAAA,GAAAD,kBAAA;QAAAE,MAAA,GAAAD,OAAA,CAAAE,IAAA,WAAAC,CAAA;UAClB,eAASA,CAAA,oBAAQ,GAAAV,QAAA,CAAAU,CAAkB,OAAM,YAAAA,CAAA,SAAsB,cAAAA,CAAA,IAAAA,CAAA,CAAAC,IAAA;QAAA,EAC/D;MACF,IAGM,IAAAb,aAAe,CAAAc,MAAU,EAAAJ,MAAA,EAAAK,WAAA,KAAAL,MAAA,YAAAA,MAAA,uBAAAR,QAAA,CAAAQ,MAAA,oCAAAA,MAAA,GAC7B,UAAAM,KAAA;MAAA,IACAC,SAAA,GAAAP,MAAA,CAAAO,SAAA;QAAAC,WAAA;UACAC,OAAA,EAAAnB,aAAA,CAAAoB,EAAA,CAAAC,EAAA,GAAAC,iBAAA;YACEC,EAAA;UACJ;UAEAC,WAAA;YAGDX,IAAA;UACF;QACF;QAAAY,MAAA,SAAAR,SAAA,CAAAS,IAAA,CAAAR,WAAA","ignoreList":[]}
|
|
@@ -6,8 +6,8 @@ function nodeExternals() {
|
|
|
6
6
|
enforce: "pre",
|
|
7
7
|
resolveId: {
|
|
8
8
|
order: "pre",
|
|
9
|
-
async handler(specifier, importer,
|
|
10
|
-
if (isEntry || // Ignore entry points (they should always be resolved)
|
|
9
|
+
async handler(specifier, importer, options) {
|
|
10
|
+
if (options?.scan || options?.isEntry || // Ignore entry points (they should always be resolved)
|
|
11
11
|
/^(?:\0|\.{1,2}\/)/.test(specifier) || // Ignore virtual modules and relative imports
|
|
12
12
|
path.isAbsolute(specifier))
|
|
13
13
|
return null;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/vite/customNodeExternals.ts"],
|
|
4
|
-
"mappings": "AAEA,SAAS,iBAAiB;AAC1B,OAAO,UAAU;AAGV,SAAS,gBAAwB;AACtC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IAET,WAAW;AAAA,MACT,OAAO;AAAA,MACP,MAAM,QAAQ,WAAW,UAAU,
|
|
4
|
+
"mappings": "AAEA,SAAS,iBAAiB;AAC1B,OAAO,UAAU;AAGV,SAAS,gBAAwB;AACtC,SAAO;AAAA,IACL,MAAM;AAAA,IACN,SAAS;AAAA,IAET,WAAW;AAAA,MACT,OAAO;AAAA,MACP,MAAM,QAAQ,WAAW,UAAU,SAAS;AAM1C,YAFI,SAAS,QAGX,SAAS;AAAA,QACT,oBAAoB,KAAK,SAAS;AAAA,QAClC,KAAK,WAAW,SAAS;AAEzB,iBAAO;AAET,YAAI,UAAU,SAAS,GAAG;AACxB,gBAAM,WAAW,UAAU,QAAQ,UAAU,EAAE;AAC/C,iBAAO;AAAA,YACL,IAAK,UAAU,QAAQ,IAAyB,WAArB,UAAU;AAAA,YACrC,UAAU;AAAA,YACV,mBAAmB;AAAA,UACrB;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -6,10 +6,8 @@ function nodeExternals() {
|
|
|
6
6
|
enforce: "pre",
|
|
7
7
|
resolveId: {
|
|
8
8
|
order: "pre",
|
|
9
|
-
async handler(specifier, importer, {
|
|
10
|
-
isEntry
|
|
11
|
-
}) {
|
|
12
|
-
if (isEntry ||
|
|
9
|
+
async handler(specifier, importer, options) {
|
|
10
|
+
if (options?.scan || options?.isEntry ||
|
|
13
11
|
// Ignore entry points (they should always be resolved)
|
|
14
12
|
/^(?:\0|\.{1,2}\/)/.test(specifier) ||
|
|
15
13
|
// Ignore virtual modules and relative imports
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isBuiltin","path","nodeExternals","name","enforce","resolveId","order","handler","specifier","importer","isEntry","test","isAbsolute","stripped","replace","id","external","moduleSideEffects"],"sources":["../../../src/vite/customNodeExternals.ts"],"sourcesContent":[null],"mappings":"AAEA,SAASA,SAAA,QAAiB;AAC1B,OAAOC,IAAA,MAAU;AAGV,SAASC,cAAA,EAAwB;EACtC,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IAETC,SAAA,EAAW;MACTC,KAAA,EAAO;MACP,MAAMC,QAAQC,SAAA,EAAWC,QAAA,
|
|
1
|
+
{"version":3,"names":["isBuiltin","path","nodeExternals","name","enforce","resolveId","order","handler","specifier","importer","options","scan","isEntry","test","isAbsolute","stripped","replace","id","external","moduleSideEffects"],"sources":["../../../src/vite/customNodeExternals.ts"],"sourcesContent":[null],"mappings":"AAEA,SAASA,SAAA,QAAiB;AAC1B,OAAOC,IAAA,MAAU;AAGV,SAASC,cAAA,EAAwB;EACtC,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IAETC,SAAA,EAAW;MACTC,KAAA,EAAO;MACP,MAAMC,QAAQC,SAAA,EAAWC,QAAA,EAAUC,OAAA,EAAS;QAM1C,IAFIA,OAAA,EAASC,IAAA,IAGXD,OAAA,EAASE,OAAA;QAAA;QACT,oBAAoBC,IAAA,CAAKL,SAAS;QAAA;QAClCP,IAAA,CAAKa,UAAA,CAAWN,SAAS,GAEzB,OAAO;QAET,IAAIR,SAAA,CAAUQ,SAAS,GAAG;UACxB,MAAMO,QAAA,GAAWP,SAAA,CAAUQ,OAAA,CAAQ,UAAU,EAAE;UAC/C,OAAO;YACLC,EAAA,EAAKjB,SAAA,CAAUe,QAAQ,IAAyBA,QAAA,GAArB,UAAUA,QAAA;YACrCG,QAAA,EAAU;YACVC,iBAAA,EAAmB;UACrB;QACF;MACF;IACF;EACF;AACF","ignoreList":[]}
|
|
@@ -6,11 +6,8 @@ function nodeExternals() {
|
|
|
6
6
|
enforce: "pre",
|
|
7
7
|
resolveId: {
|
|
8
8
|
order: "pre",
|
|
9
|
-
async handler(specifier, importer,
|
|
10
|
-
|
|
11
|
-
isEntry
|
|
12
|
-
} = param;
|
|
13
|
-
if (isEntry ||
|
|
9
|
+
async handler(specifier, importer, options) {
|
|
10
|
+
if (options?.scan || options?.isEntry ||
|
|
14
11
|
// Ignore entry points (they should always be resolved)
|
|
15
12
|
/^(?:\0|\.{1,2}\/)/.test(specifier) ||
|
|
16
13
|
// Ignore virtual modules and relative imports
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isBuiltin","path","nodeExternals","name","enforce","resolveId","order","handler","specifier","importer","
|
|
1
|
+
{"version":3,"names":["isBuiltin","path","nodeExternals","name","enforce","resolveId","order","handler","specifier","importer","options","scan","isEntry","test","isAbsolute","stripped","replace","id","external","moduleSideEffects"],"sources":["../../../src/vite/customNodeExternals.ts"],"sourcesContent":[null],"mappings":"AAEA,SAASA,SAAA,QAAiB;AAC1B,OAAOC,IAAA,MAAU;AAGV,SAASC,cAAA,EAAwB;EACtC,OAAO;IACLC,IAAA,EAAM;IACNC,OAAA,EAAS;IAETC,SAAA,EAAW;MACTC,KAAA,EAAO;MACP,MAAMC,QAAQC,SAAA,EAAWC,QAAA,EAAUC,OAAA,EAAS;QAM1C,IAFIA,OAAA,EAASC,IAAA,IAGXD,OAAA,EAASE,OAAA;QAAA;QACT,oBAAoBC,IAAA,CAAKL,SAAS;QAAA;QAClCP,IAAA,CAAKa,UAAA,CAAWN,SAAS,GAEzB,OAAO;QAET,IAAIR,SAAA,CAAUQ,SAAS,GAAG;UACxB,IAAAO,QAAM,GAAAP,SAAW,CAAAQ,OAAU,SAAQ,IAAU;UAC7C,OAAO;YACLC,EAAA,EAAKjB,SAAA,CAAUe,QAAQ,IAAyBA,QAAA,GAArB,UAAUA,QAAA;YACrCG,QAAA,EAAU;YACVC,iBAAA,EAAmB;UACrB;QACF;MACF;IACF;EACF;AACF","ignoreList":[]}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
describe("resolveId hooks should skip during dep optimization scan", () => {
|
|
3
|
+
describe("platform-specific-resolve", () => {
|
|
4
|
+
it("should return undefined when options.scan is true", async () => {
|
|
5
|
+
const { getBaseVitePlugins } = await import("../config/getBaseVitePlugins"), plugin = getBaseVitePlugins().find(
|
|
6
|
+
(p) => typeof p == "object" && p !== null && "name" in p && p.name === "platform-specific-resolve"
|
|
7
|
+
);
|
|
8
|
+
if (expect(plugin).toBeDefined(), !plugin || typeof plugin != "object" || !("resolveId" in plugin))
|
|
9
|
+
throw new Error("Plugin not found or missing resolveId");
|
|
10
|
+
const resolveId = plugin.resolveId, mockContext = {
|
|
11
|
+
resolve: vi.fn().mockResolvedValue({ id: "/some/path/file.ts" }),
|
|
12
|
+
environment: { name: "client" }
|
|
13
|
+
}, result = await resolveId.call(
|
|
14
|
+
mockContext,
|
|
15
|
+
"some-module",
|
|
16
|
+
"/importer.ts",
|
|
17
|
+
{ scan: !0 }
|
|
18
|
+
);
|
|
19
|
+
expect(result).toBeUndefined(), expect(mockContext.resolve).not.toHaveBeenCalled();
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
//# sourceMappingURL=resolveIdScan.test.js.map
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../../src/vite/plugins/resolveIdScan.test.ts"],
|
|
4
|
+
"mappings": "AAAA,SAAS,UAAU,QAAQ,IAAI,UAAU;AAazC,SAAS,4DAA4D,MAAM;AACzE,WAAS,6BAA6B,MAAM;AAC1C,OAAG,qDAAqD,YAAY;AAElE,YAAM,EAAE,mBAAmB,IAAI,MAAM,OAAO,8BAA8B,GAIpE,SAHU,mBAAmB,EAGZ;AAAA,QACrB,CAAC,MAAM,OAAO,KAAM,YAAY,MAAM,QAAQ,UAAU,KAAK,EAAE,SAAS;AAAA,MAC1E;AAGA,UADA,OAAO,MAAM,EAAE,YAAY,GACvB,CAAC,UAAU,OAAO,UAAW,YAAY,EAAE,eAAe;AAC5D,cAAM,IAAI,MAAM,uCAAuC;AAGzD,YAAM,YAAY,OAAO,WAGnB,cAAc;AAAA,QAClB,SAAS,GAAG,GAAG,EAAE,kBAAkB,EAAE,IAAI,qBAAqB,CAAC;AAAA,QAC/D,aAAa,EAAE,MAAM,SAAS;AAAA,MAChC,GAGM,SAAS,MAAM,UAAU;AAAA,QAC7B;AAAA,QACA;AAAA,QACA;AAAA,QACA,EAAE,MAAM,GAAK;AAAA,MACf;AAEA,aAAO,MAAM,EAAE,cAAc,GAE7B,OAAO,YAAY,OAAO,EAAE,IAAI,iBAAiB;AAAA,IACnD,CAAC;AAAA,EACH,CAAC;AACH,CAAC;",
|
|
5
|
+
"names": []
|
|
6
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
describe("resolveId hooks should skip during dep optimization scan", () => {
|
|
3
|
+
describe("platform-specific-resolve", () => {
|
|
4
|
+
it("should return undefined when options.scan is true", async () => {
|
|
5
|
+
const {
|
|
6
|
+
getBaseVitePlugins
|
|
7
|
+
} = await import("../config/getBaseVitePlugins"),
|
|
8
|
+
plugin = getBaseVitePlugins().find(p => typeof p == "object" && p !== null && "name" in p && p.name === "platform-specific-resolve");
|
|
9
|
+
if (expect(plugin).toBeDefined(), !plugin || typeof plugin != "object" || !("resolveId" in plugin)) throw new Error("Plugin not found or missing resolveId");
|
|
10
|
+
const resolveId = plugin.resolveId,
|
|
11
|
+
mockContext = {
|
|
12
|
+
resolve: vi.fn().mockResolvedValue({
|
|
13
|
+
id: "/some/path/file.ts"
|
|
14
|
+
}),
|
|
15
|
+
environment: {
|
|
16
|
+
name: "client"
|
|
17
|
+
}
|
|
18
|
+
},
|
|
19
|
+
result = await resolveId.call(mockContext, "some-module", "/importer.ts", {
|
|
20
|
+
scan: !0
|
|
21
|
+
});
|
|
22
|
+
expect(result).toBeUndefined(), expect(mockContext.resolve).not.toHaveBeenCalled();
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
//# sourceMappingURL=resolveIdScan.test.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["describe","expect","it","vi","getBaseVitePlugins","plugin","find","p","name","toBeDefined","Error","resolveId","mockContext","resolve","fn","mockResolvedValue","id","environment","result","call","scan","toBeUndefined","not","toHaveBeenCalled"],"sources":["../../../../src/vite/plugins/resolveIdScan.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,EAAIC,EAAA,QAAU;AAazCH,QAAA,CAAS,4DAA4D,MAAM;EACzEA,QAAA,CAAS,6BAA6B,MAAM;IAC1CE,EAAA,CAAG,qDAAqD,YAAY;MAElE,MAAM;UAAEE;QAAmB,IAAI,MAAM,OAAO,8BAA8B;QAIpEC,MAAA,GAHUD,kBAAA,CAAmB,EAGZE,IAAA,CACpBC,CAAA,IAAM,OAAOA,CAAA,IAAM,YAAYA,CAAA,KAAM,QAAQ,UAAUA,CAAA,IAAKA,CAAA,CAAEC,IAAA,KAAS,2BAC1E;MAGA,IADAP,MAAA,CAAOI,MAAM,EAAEI,WAAA,CAAY,GACvB,CAACJ,MAAA,IAAU,OAAOA,MAAA,IAAW,YAAY,EAAE,eAAeA,MAAA,GAC5D,MAAM,IAAIK,KAAA,CAAM,uCAAuC;MAGzD,MAAMC,SAAA,GAAYN,MAAA,CAAOM,SAAA;QAGnBC,WAAA,GAAc;UAClBC,OAAA,EAASV,EAAA,CAAGW,EAAA,CAAG,EAAEC,iBAAA,CAAkB;YAAEC,EAAA,EAAI;UAAqB,CAAC;UAC/DC,WAAA,EAAa;YAAET,IAAA,EAAM;UAAS;QAChC;QAGMU,MAAA,GAAS,MAAMP,SAAA,CAAUQ,IAAA,CAC7BP,WAAA,EACA,eACA,gBACA;UAAEQ,IAAA,EAAM;QAAK,CACf;MAEAnB,MAAA,CAAOiB,MAAM,EAAEG,aAAA,CAAc,GAE7BpB,MAAA,CAAOW,WAAA,CAAYC,OAAO,EAAES,GAAA,CAAIC,gBAAA,CAAiB;IACnD,CAAC;EACH,CAAC;AACH,CAAC","ignoreList":[]}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
function _type_of(obj) {
|
|
3
|
+
"@swc/helpers - typeof";
|
|
4
|
+
|
|
5
|
+
return obj && typeof Symbol < "u" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
6
|
+
}
|
|
7
|
+
describe("resolveId hooks should skip during dep optimization scan", function () {
|
|
8
|
+
describe("platform-specific-resolve", function () {
|
|
9
|
+
it("should return undefined when options.scan is true", async function () {
|
|
10
|
+
var {
|
|
11
|
+
getBaseVitePlugins
|
|
12
|
+
} = await import("../config/getBaseVitePlugins"),
|
|
13
|
+
plugins = getBaseVitePlugins(),
|
|
14
|
+
plugin = plugins.find(function (p) {
|
|
15
|
+
return (typeof p > "u" ? "undefined" : _type_of(p)) === "object" && p !== null && "name" in p && p.name === "platform-specific-resolve";
|
|
16
|
+
});
|
|
17
|
+
if (expect(plugin).toBeDefined(), !plugin || (typeof plugin > "u" ? "undefined" : _type_of(plugin)) !== "object" || !("resolveId" in plugin)) throw new Error("Plugin not found or missing resolveId");
|
|
18
|
+
var resolveId = plugin.resolveId,
|
|
19
|
+
mockContext = {
|
|
20
|
+
resolve: vi.fn().mockResolvedValue({
|
|
21
|
+
id: "/some/path/file.ts"
|
|
22
|
+
}),
|
|
23
|
+
environment: {
|
|
24
|
+
name: "client"
|
|
25
|
+
}
|
|
26
|
+
},
|
|
27
|
+
result = await resolveId.call(mockContext, "some-module", "/importer.ts", {
|
|
28
|
+
scan: !0
|
|
29
|
+
});
|
|
30
|
+
expect(result).toBeUndefined(), expect(mockContext.resolve).not.toHaveBeenCalled();
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
//# sourceMappingURL=resolveIdScan.test.native.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["describe","expect","it","vi","_type_of","obj","Symbol","constructor","getBaseVitePlugins","plugins","plugin","find","p","name","toBeDefined","Error","resolveId","mockContext","resolve","fn","mockResolvedValue","id","environment","result","call","scan"],"sources":["../../../../src/vite/plugins/resolveIdScan.test.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,QAAA,EAAUC,MAAA,EAAQC,EAAA,EAAIC,EAAA,QAAU;AAazC,SAASC,SAAAC,GAAA;EACP,uBAAS;;EACP,OAAGA,GAAA,WAAAC,MAAA,UAAAD,GAAA,CAAAE,WAAA,KAAAD,MAAqD,WAAY,UAAAD,GAAA;AAElE;AAIuBL,QACrB,CAAC,0DAAuD,EAAK,YAAW;EAAAA,QAC1E;IAGAE,EAAA,oDAAsB,oBAAW;MAC/B;UAAAM;QAAgB,+CAAuC;QAAAC,OAAA,GAAAD,kBAAA;QAAAE,MAAA,GAAAD,OAAA,CAAAE,IAAA,WAAAC,CAAA;UAGzD,OAAM,QAAAA,CAAY,SAAO,WAGnB,GAAAR,QAAA,CAAcQ,CAAA,mBAAAA,CAAA,uBAAAA,CAAA,IAAAA,CAAA,CAAAC,IAAA;QAAA,EAClB;MAA+D,IAC/DZ,MAAA,CAAAS,MAAe,EAAAI,WAAM,EAAS,GAAAJ,MAAA,YAAAA,MAAA,uBAAAN,QAAA,CAAAM,MAAA,oCAAAA,MAAA,GAChC,MAGM,IAASK,KAAA,CAAM,uCAAU;MAAA,IAC7BC,SAAA,GAAAN,MAAA,CAAAM,SAAA;QAAAC,WAAA;UACAC,OAAA,EAAAf,EAAA,CAAAgB,EAAA,GAAAC,iBAAA;YACAC,EAAA;UACA,EAAE;UACJC,WAAA;YAEAT,IAAO;UAGR;QACF;QAAAU,MAAA,SAAAP,SAAA,CAAAQ,IAAA,CAAAP,WAAA;UACFQ,IAAA","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.32",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -121,17 +121,17 @@
|
|
|
121
121
|
"@react-navigation/routers": "~7.5.1",
|
|
122
122
|
"@swc/core": "^1.14.0",
|
|
123
123
|
"@ungap/structured-clone": "^1.2.0",
|
|
124
|
-
"@vxrn/color-scheme": "1.2.
|
|
125
|
-
"@vxrn/compiler": "1.2.
|
|
126
|
-
"@vxrn/resolve": "1.2.
|
|
127
|
-
"@vxrn/tslib-lite": "1.2.
|
|
128
|
-
"@vxrn/use-isomorphic-layout-effect": "1.2.
|
|
129
|
-
"@vxrn/vite-plugin-metro": "1.2.
|
|
124
|
+
"@vxrn/color-scheme": "1.2.32",
|
|
125
|
+
"@vxrn/compiler": "1.2.32",
|
|
126
|
+
"@vxrn/resolve": "1.2.32",
|
|
127
|
+
"@vxrn/tslib-lite": "1.2.32",
|
|
128
|
+
"@vxrn/use-isomorphic-layout-effect": "1.2.32",
|
|
129
|
+
"@vxrn/vite-plugin-metro": "1.2.32",
|
|
130
130
|
"babel-dead-code-elimination": "^1.0.10",
|
|
131
131
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
132
132
|
"citty": "^0.1.6",
|
|
133
133
|
"core-js": "^3.38.1",
|
|
134
|
-
"create-vxrn": "1.2.
|
|
134
|
+
"create-vxrn": "1.2.32",
|
|
135
135
|
"escape-string-regexp": "^5.0.0",
|
|
136
136
|
"expo-linking": "~8.0.8",
|
|
137
137
|
"expo-modules-core": "~3.0.24",
|
|
@@ -157,7 +157,7 @@
|
|
|
157
157
|
"vite": "^7.1.12",
|
|
158
158
|
"vite-plugin-barrel": "^0.4.1",
|
|
159
159
|
"vite-tsconfig-paths": "^5.1.4",
|
|
160
|
-
"vxrn": "1.2.
|
|
160
|
+
"vxrn": "1.2.32",
|
|
161
161
|
"ws": "^8.18.0",
|
|
162
162
|
"xxhashjs": "^0.2.2"
|
|
163
163
|
},
|
|
@@ -11,9 +11,14 @@ export function nodeExternals(): Plugin {
|
|
|
11
11
|
|
|
12
12
|
resolveId: {
|
|
13
13
|
order: 'pre',
|
|
14
|
-
async handler(specifier, importer,
|
|
14
|
+
async handler(specifier, importer, options) {
|
|
15
|
+
// Skip during Vite's dependency optimization scan
|
|
16
|
+
// @see https://github.com/remix-run/remix/discussions/8917
|
|
17
|
+
// @ts-expect-error - scan is not in Vite's types but exists at runtime
|
|
18
|
+
if (options?.scan) return null
|
|
19
|
+
|
|
15
20
|
if (
|
|
16
|
-
isEntry || // Ignore entry points (they should always be resolved)
|
|
21
|
+
options?.isEntry || // Ignore entry points (they should always be resolved)
|
|
17
22
|
/^(?:\0|\.{1,2}\/)/.test(specifier) || // Ignore virtual modules and relative imports
|
|
18
23
|
path.isAbsolute(specifier) // Ignore already resolved ids
|
|
19
24
|
) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customNodeExternals.d.ts","sourceRoot":"","sources":["../../src/vite/customNodeExternals.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,wBAAgB,aAAa,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"customNodeExternals.d.ts","sourceRoot":"","sources":["../../src/vite/customNodeExternals.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC,wBAAgB,aAAa,IAAI,MAAM,CA+BtC"}
|