@tramvai/cli 4.41.116 → 4.41.124
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/lib/commands/new/steps/installDependencies.js +1 -1
- package/lib/commands/new/steps/installDependencies.js.map +1 -1
- package/lib/library/webpack/module/externals.js +1 -1
- package/lib/library/webpack/module/externals.js.map +1 -1
- package/lib/schema/autogeneratedSchema.json +15 -15
- package/package.json +4 -4
- package/schema.json +15 -15
- package/src/commands/new/steps/installDependencies.ts +1 -1
- package/src/commands/new/templates/shared/_prettierrc.js.hbs +1 -1
- package/src/library/webpack/module/externals.ts +1 -1
- package/src/schema/autogeneratedSchema.json +15 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installDependencies.js","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":";;;;AACA,0DAA0B;AAC1B,0DAA0B;AAK1B,MAAM,wBAAwB,GAAG;IAC/B,kBAAkB;IAClB,wBAAwB;IACxB,oBAAoB;IACpB,qBAAqB;IACrB,yBAAyB;IACzB,qBAAqB;IACrB,cAAc;IACd,qBAAqB;IACrB,gCAAgC;IAChC,SAAS;CACV,CAAC;AAEF,MAAM,IAAI,GAA4E;IACpF,GAAG,EAAE;QACH,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,wBAAwB;YACxB,mCAAmC;YACnC,wBAAwB;YACxB,wBAAwB;YACxB,qBAAqB;YACrB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,wBAAwB;KAC9C;IACD,WAAW,EAAE;QACX,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,yBAAyB;YACzB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,CAAC,GAAG,wBAAwB,EAAE,yBAAyB,CAAC;KAC9E;CACF,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,wBAAwB;IACxB,8BAA8B;IAC9B,gCAAgC;IAChC,cAAc;IACd,cAAc;IACd,sBAAsB;IACtB,2BAA2B;IAC3B,gCAAgC;IAChC,gBAAgB;IAChB,UAAU;IACV,aAAa;IACb,
|
|
1
|
+
{"version":3,"file":"installDependencies.js","sourceRoot":"","sources":["../../../../src/commands/new/steps/installDependencies.ts"],"names":[],"mappings":";;;;AACA,0DAA0B;AAC1B,0DAA0B;AAK1B,MAAM,wBAAwB,GAAG;IAC/B,kBAAkB;IAClB,wBAAwB;IACxB,oBAAoB;IACpB,qBAAqB;IACrB,yBAAyB;IACzB,qBAAqB;IACrB,cAAc;IACd,qBAAqB;IACrB,gCAAgC;IAChC,SAAS;CACV,CAAC;AAEF,MAAM,IAAI,GAA4E;IACpF,GAAG,EAAE;QACH,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,wBAAwB;YACxB,mCAAmC;YACnC,wBAAwB;YACxB,wBAAwB;YACxB,qBAAqB;YACrB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,wBAAwB;YACxB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,wBAAwB;KAC9C;IACD,WAAW,EAAE;QACX,YAAY,EAAE;YACZ,eAAe;YACf,gBAAgB;YAChB,gBAAgB;YAChB,yBAAyB;YACzB,OAAO;YACP,WAAW;YACX,cAAc;SACf;QACD,mBAAmB,EAAE,CAAC,GAAG,wBAAwB,EAAE,yBAAyB,CAAC;KAC9E;CACF,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,wBAAwB;IACxB,8BAA8B;IAC9B,gCAAgC;IAChC,cAAc;IACd,cAAc;IACd,sBAAsB;IACtB,2BAA2B;IAC3B,gCAAgC;IAChC,gBAAgB;IAChB,UAAU;IACV,aAAa;IACb,0BAA0B;IAC1B,YAAY;CACb,CAAC;AAEF,MAAM,uBAAuB,GAAmE;IAC9F,GAAG,EAAE;QACH,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE,oBAAoB,CAAC;QACnE,OAAO,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,oBAAoB,CAAC;KACzD;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,KAAK,CAAC;QACb,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;KAC1B;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,CAAC,KAAK,CAAC;QACb,OAAO,EAAE,CAAC,KAAK,EAAE,YAAY,CAAC;KAC/B;CACF,CAAC;AAEF,SAAsB,mBAAmB,CAAC,EACxC,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,gBAAgB,GAMjB;;QACC,MAAM,eAAe,GAAG,uBAAuB,CAAC,cAAc,CAAC,CAAC;QAChE,MAAM,OAAO,GAAY;YACvB,GAAG,EAAE,QAAQ;YACb,GAAG,EAAE;gBACH,uBAAuB,EAAE,MAAM;aAChC;YACD,KAAK,EAAE,SAAS;SACjB,CAAC;QAEF,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;QAE3E,MAAM,IAAA,eAAK,EAAC,cAAc,EAAE,CAAC,GAAG,eAAe,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,CAAC;QAE5F,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,CAAC;QAE3E,MAAM,IAAA,eAAK,EAAC,cAAc,EAAE,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,EAAE,OAAO,CAAC,CAAC;QAEvF,IAAI,gBAAgB,KAAK,MAAM,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,+BAA+B,CAAC,CAAC;YAE5E,MAAM,IAAA,eAAK,EACT,cAAc,EACd,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,mBAAmB,CAAC,EAC/D,OAAO,CACR,CAAC;SACH;IACH,CAAC;CAAA;AArCD,kDAqCC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const resolveExternal_1 = tslib_1.__importDefault(require("./resolveExternal"));
|
|
5
|
-
const modules = ['react', 'react-dom'];
|
|
5
|
+
const modules = ['react', 'react-dom', 'react/jsx-runtime', 'react/jsx-dev-runtime'];
|
|
6
6
|
exports.default = modules.reduce((acc, name) => {
|
|
7
7
|
acc[name] = {
|
|
8
8
|
window: (0, resolveExternal_1.default)(name),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"externals.js","sourceRoot":"","sources":["../../../../src/library/webpack/module/externals.ts"],"names":[],"mappings":";;;AAAA,gFAAgD;AAEhD,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"externals.js","sourceRoot":"","sources":["../../../../src/library/webpack/module/externals.ts"],"names":[],"mappings":";;;AAAA,gFAAgD;AAEhD,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,uBAAuB,CAAC,CAAC;AAErF,kBAAe,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;IAC1C,GAAG,CAAC,IAAI,CAAC,GAAG;QACV,MAAM,EAAE,IAAA,yBAAe,EAAC,IAAI,CAAC;QAC7B,SAAS,EAAE,IAAI;QACf,QAAQ,EAAE,IAAI;QACd,GAAG,EAAE,IAAI;QACT,GAAG,EAAE,SAAS,IAAA,yBAAe,EAAC,IAAI,CAAC;aAChC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;aACtB,IAAI,CAAC,EAAE,CAAC,EAAE;KACd,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC,EAAE,EAAwB,CAAC,CAAC"}
|
|
@@ -1242,23 +1242,23 @@
|
|
|
1242
1242
|
"dotAll": {
|
|
1243
1243
|
"type": "boolean"
|
|
1244
1244
|
},
|
|
1245
|
-
"__@match@
|
|
1245
|
+
"__@match@8062": {
|
|
1246
1246
|
"type": "object",
|
|
1247
1247
|
"additionalProperties": false
|
|
1248
1248
|
},
|
|
1249
|
-
"__@replace@
|
|
1249
|
+
"__@replace@8064": {
|
|
1250
1250
|
"type": "object",
|
|
1251
1251
|
"additionalProperties": false
|
|
1252
1252
|
},
|
|
1253
|
-
"__@search@
|
|
1253
|
+
"__@search@8067": {
|
|
1254
1254
|
"type": "object",
|
|
1255
1255
|
"additionalProperties": false
|
|
1256
1256
|
},
|
|
1257
|
-
"__@split@
|
|
1257
|
+
"__@split@8069": {
|
|
1258
1258
|
"type": "object",
|
|
1259
1259
|
"additionalProperties": false
|
|
1260
1260
|
},
|
|
1261
|
-
"__@matchAll@
|
|
1261
|
+
"__@matchAll@8071": {
|
|
1262
1262
|
"type": "object",
|
|
1263
1263
|
"additionalProperties": false
|
|
1264
1264
|
}
|
|
@@ -1999,23 +1999,23 @@
|
|
|
1999
1999
|
"dotAll": {
|
|
2000
2000
|
"type": "boolean"
|
|
2001
2001
|
},
|
|
2002
|
-
"__@match@
|
|
2002
|
+
"__@match@8062": {
|
|
2003
2003
|
"type": "object",
|
|
2004
2004
|
"additionalProperties": false
|
|
2005
2005
|
},
|
|
2006
|
-
"__@replace@
|
|
2006
|
+
"__@replace@8064": {
|
|
2007
2007
|
"type": "object",
|
|
2008
2008
|
"additionalProperties": false
|
|
2009
2009
|
},
|
|
2010
|
-
"__@search@
|
|
2010
|
+
"__@search@8067": {
|
|
2011
2011
|
"type": "object",
|
|
2012
2012
|
"additionalProperties": false
|
|
2013
2013
|
},
|
|
2014
|
-
"__@split@
|
|
2014
|
+
"__@split@8069": {
|
|
2015
2015
|
"type": "object",
|
|
2016
2016
|
"additionalProperties": false
|
|
2017
2017
|
},
|
|
2018
|
-
"__@matchAll@
|
|
2018
|
+
"__@matchAll@8071": {
|
|
2019
2019
|
"type": "object",
|
|
2020
2020
|
"additionalProperties": false
|
|
2021
2021
|
}
|
|
@@ -2756,23 +2756,23 @@
|
|
|
2756
2756
|
"dotAll": {
|
|
2757
2757
|
"type": "boolean"
|
|
2758
2758
|
},
|
|
2759
|
-
"__@match@
|
|
2759
|
+
"__@match@8062": {
|
|
2760
2760
|
"type": "object",
|
|
2761
2761
|
"additionalProperties": false
|
|
2762
2762
|
},
|
|
2763
|
-
"__@replace@
|
|
2763
|
+
"__@replace@8064": {
|
|
2764
2764
|
"type": "object",
|
|
2765
2765
|
"additionalProperties": false
|
|
2766
2766
|
},
|
|
2767
|
-
"__@search@
|
|
2767
|
+
"__@search@8067": {
|
|
2768
2768
|
"type": "object",
|
|
2769
2769
|
"additionalProperties": false
|
|
2770
2770
|
},
|
|
2771
|
-
"__@split@
|
|
2771
|
+
"__@split@8069": {
|
|
2772
2772
|
"type": "object",
|
|
2773
2773
|
"additionalProperties": false
|
|
2774
2774
|
},
|
|
2775
|
-
"__@matchAll@
|
|
2775
|
+
"__@matchAll@8071": {
|
|
2776
2776
|
"type": "object",
|
|
2777
2777
|
"additionalProperties": false
|
|
2778
2778
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/cli",
|
|
3
|
-
"version": "4.41.
|
|
3
|
+
"version": "4.41.124",
|
|
4
4
|
"description": "Cli инструмент для сборки и запуска приложений",
|
|
5
5
|
"files": [
|
|
6
6
|
"src",
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"@tinkoff/dippy": "0.10.13",
|
|
67
67
|
"@tinkoff/is-modern-lib": "4.0.4",
|
|
68
68
|
"@tinkoff/logger": "^0.10.286",
|
|
69
|
-
"@tinkoff/minicss-class-generator": "0.4.
|
|
69
|
+
"@tinkoff/minicss-class-generator": "0.4.4",
|
|
70
70
|
"@tinkoff/package-manager-wrapper": "0.3.4",
|
|
71
71
|
"@tinkoff/request-core": "^0.10.0",
|
|
72
72
|
"@tinkoff/request-plugin-protocol-http": "^0.12.1",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"@tinkoff/utils": "^2.1.3",
|
|
75
75
|
"@tinkoff/webpack-dedupe-plugin": "3.0.3",
|
|
76
76
|
"@tramvai/build": "5.0.7",
|
|
77
|
-
"@tramvai/react": "4.41.
|
|
77
|
+
"@tramvai/react": "4.41.124",
|
|
78
78
|
"@tramvai/tools-check-versions": "0.6.15",
|
|
79
79
|
"@tramvai/tools-migrate": "0.8.16",
|
|
80
80
|
"ajv": "^8.12.0",
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
"env-ci": "^5.0.2",
|
|
102
102
|
"execa": "^5.1.1",
|
|
103
103
|
"exit": "^0.1.2",
|
|
104
|
-
"express": "^4.
|
|
104
|
+
"express": "^4.21.2",
|
|
105
105
|
"fastify": "^4.14.1",
|
|
106
106
|
"figures": "^3.2.0",
|
|
107
107
|
"file-loader": "^6.2.0",
|
package/schema.json
CHANGED
|
@@ -1264,23 +1264,23 @@
|
|
|
1264
1264
|
"dotAll": {
|
|
1265
1265
|
"type": "boolean"
|
|
1266
1266
|
},
|
|
1267
|
-
"__@match@
|
|
1267
|
+
"__@match@8062": {
|
|
1268
1268
|
"type": "object",
|
|
1269
1269
|
"additionalProperties": false
|
|
1270
1270
|
},
|
|
1271
|
-
"__@replace@
|
|
1271
|
+
"__@replace@8064": {
|
|
1272
1272
|
"type": "object",
|
|
1273
1273
|
"additionalProperties": false
|
|
1274
1274
|
},
|
|
1275
|
-
"__@search@
|
|
1275
|
+
"__@search@8067": {
|
|
1276
1276
|
"type": "object",
|
|
1277
1277
|
"additionalProperties": false
|
|
1278
1278
|
},
|
|
1279
|
-
"__@split@
|
|
1279
|
+
"__@split@8069": {
|
|
1280
1280
|
"type": "object",
|
|
1281
1281
|
"additionalProperties": false
|
|
1282
1282
|
},
|
|
1283
|
-
"__@matchAll@
|
|
1283
|
+
"__@matchAll@8071": {
|
|
1284
1284
|
"type": "object",
|
|
1285
1285
|
"additionalProperties": false
|
|
1286
1286
|
}
|
|
@@ -2030,23 +2030,23 @@
|
|
|
2030
2030
|
"dotAll": {
|
|
2031
2031
|
"type": "boolean"
|
|
2032
2032
|
},
|
|
2033
|
-
"__@match@
|
|
2033
|
+
"__@match@8062": {
|
|
2034
2034
|
"type": "object",
|
|
2035
2035
|
"additionalProperties": false
|
|
2036
2036
|
},
|
|
2037
|
-
"__@replace@
|
|
2037
|
+
"__@replace@8064": {
|
|
2038
2038
|
"type": "object",
|
|
2039
2039
|
"additionalProperties": false
|
|
2040
2040
|
},
|
|
2041
|
-
"__@search@
|
|
2041
|
+
"__@search@8067": {
|
|
2042
2042
|
"type": "object",
|
|
2043
2043
|
"additionalProperties": false
|
|
2044
2044
|
},
|
|
2045
|
-
"__@split@
|
|
2045
|
+
"__@split@8069": {
|
|
2046
2046
|
"type": "object",
|
|
2047
2047
|
"additionalProperties": false
|
|
2048
2048
|
},
|
|
2049
|
-
"__@matchAll@
|
|
2049
|
+
"__@matchAll@8071": {
|
|
2050
2050
|
"type": "object",
|
|
2051
2051
|
"additionalProperties": false
|
|
2052
2052
|
}
|
|
@@ -2796,23 +2796,23 @@
|
|
|
2796
2796
|
"dotAll": {
|
|
2797
2797
|
"type": "boolean"
|
|
2798
2798
|
},
|
|
2799
|
-
"__@match@
|
|
2799
|
+
"__@match@8062": {
|
|
2800
2800
|
"type": "object",
|
|
2801
2801
|
"additionalProperties": false
|
|
2802
2802
|
},
|
|
2803
|
-
"__@replace@
|
|
2803
|
+
"__@replace@8064": {
|
|
2804
2804
|
"type": "object",
|
|
2805
2805
|
"additionalProperties": false
|
|
2806
2806
|
},
|
|
2807
|
-
"__@search@
|
|
2807
|
+
"__@search@8067": {
|
|
2808
2808
|
"type": "object",
|
|
2809
2809
|
"additionalProperties": false
|
|
2810
2810
|
},
|
|
2811
|
-
"__@split@
|
|
2811
|
+
"__@split@8069": {
|
|
2812
2812
|
"type": "object",
|
|
2813
2813
|
"additionalProperties": false
|
|
2814
2814
|
},
|
|
2815
|
-
"__@matchAll@
|
|
2815
|
+
"__@matchAll@8071": {
|
|
2816
2816
|
"type": "object",
|
|
2817
2817
|
"additionalProperties": false
|
|
2818
2818
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
module.exports = require('prettier-config
|
|
1
|
+
module.exports = require('@tramvai/prettier-config');
|
|
@@ -1242,23 +1242,23 @@
|
|
|
1242
1242
|
"dotAll": {
|
|
1243
1243
|
"type": "boolean"
|
|
1244
1244
|
},
|
|
1245
|
-
"__@match@
|
|
1245
|
+
"__@match@8062": {
|
|
1246
1246
|
"type": "object",
|
|
1247
1247
|
"additionalProperties": false
|
|
1248
1248
|
},
|
|
1249
|
-
"__@replace@
|
|
1249
|
+
"__@replace@8064": {
|
|
1250
1250
|
"type": "object",
|
|
1251
1251
|
"additionalProperties": false
|
|
1252
1252
|
},
|
|
1253
|
-
"__@search@
|
|
1253
|
+
"__@search@8067": {
|
|
1254
1254
|
"type": "object",
|
|
1255
1255
|
"additionalProperties": false
|
|
1256
1256
|
},
|
|
1257
|
-
"__@split@
|
|
1257
|
+
"__@split@8069": {
|
|
1258
1258
|
"type": "object",
|
|
1259
1259
|
"additionalProperties": false
|
|
1260
1260
|
},
|
|
1261
|
-
"__@matchAll@
|
|
1261
|
+
"__@matchAll@8071": {
|
|
1262
1262
|
"type": "object",
|
|
1263
1263
|
"additionalProperties": false
|
|
1264
1264
|
}
|
|
@@ -1999,23 +1999,23 @@
|
|
|
1999
1999
|
"dotAll": {
|
|
2000
2000
|
"type": "boolean"
|
|
2001
2001
|
},
|
|
2002
|
-
"__@match@
|
|
2002
|
+
"__@match@8062": {
|
|
2003
2003
|
"type": "object",
|
|
2004
2004
|
"additionalProperties": false
|
|
2005
2005
|
},
|
|
2006
|
-
"__@replace@
|
|
2006
|
+
"__@replace@8064": {
|
|
2007
2007
|
"type": "object",
|
|
2008
2008
|
"additionalProperties": false
|
|
2009
2009
|
},
|
|
2010
|
-
"__@search@
|
|
2010
|
+
"__@search@8067": {
|
|
2011
2011
|
"type": "object",
|
|
2012
2012
|
"additionalProperties": false
|
|
2013
2013
|
},
|
|
2014
|
-
"__@split@
|
|
2014
|
+
"__@split@8069": {
|
|
2015
2015
|
"type": "object",
|
|
2016
2016
|
"additionalProperties": false
|
|
2017
2017
|
},
|
|
2018
|
-
"__@matchAll@
|
|
2018
|
+
"__@matchAll@8071": {
|
|
2019
2019
|
"type": "object",
|
|
2020
2020
|
"additionalProperties": false
|
|
2021
2021
|
}
|
|
@@ -2756,23 +2756,23 @@
|
|
|
2756
2756
|
"dotAll": {
|
|
2757
2757
|
"type": "boolean"
|
|
2758
2758
|
},
|
|
2759
|
-
"__@match@
|
|
2759
|
+
"__@match@8062": {
|
|
2760
2760
|
"type": "object",
|
|
2761
2761
|
"additionalProperties": false
|
|
2762
2762
|
},
|
|
2763
|
-
"__@replace@
|
|
2763
|
+
"__@replace@8064": {
|
|
2764
2764
|
"type": "object",
|
|
2765
2765
|
"additionalProperties": false
|
|
2766
2766
|
},
|
|
2767
|
-
"__@search@
|
|
2767
|
+
"__@search@8067": {
|
|
2768
2768
|
"type": "object",
|
|
2769
2769
|
"additionalProperties": false
|
|
2770
2770
|
},
|
|
2771
|
-
"__@split@
|
|
2771
|
+
"__@split@8069": {
|
|
2772
2772
|
"type": "object",
|
|
2773
2773
|
"additionalProperties": false
|
|
2774
2774
|
},
|
|
2775
|
-
"__@matchAll@
|
|
2775
|
+
"__@matchAll@8071": {
|
|
2776
2776
|
"type": "object",
|
|
2777
2777
|
"additionalProperties": false
|
|
2778
2778
|
}
|