Xin Du (Clark)
|
adb381275b
|
feat(webpack): extendable babel.presets and babel envName (#5637)
|
2019-05-06 18:30:07 +04:30 |
|
Pooya Parsa
|
8576b4fcfd
|
feat: configurable aliases (#5655)
|
2019-05-06 18:29:37 +04:30 |
|
Pooya Parsa
|
ffadb3177f
|
fix(webpack): set log level to warn for HardSourcePlugin (#5653)
|
2019-05-06 15:17:37 +04:30 |
|
Pooya Parsa
|
5ebf1cc78c
|
fix: avoid using aliases in templates (#5656)
|
2019-05-06 15:16:04 +04:30 |
|
renovate[bot]
|
5631a83eb4
|
chore(deps): update all non-major dependencies (#5640)
|
2019-05-03 13:38:50 +04:30 |
|
renovate[bot]
|
8327023fc7
|
chore(deps): update dependency chokidar to v3 (#5631)
|
2019-05-02 09:23:00 +01:00 |
|
Xin Du (Clark)
|
9d50bbb465
|
chore: add core-js@3 example in readme (#5633)
|
2019-05-02 09:22:44 +01:00 |
|
renovate[bot]
|
989add8fb2
|
chore(deps): update all non-major dependencies (#5628)
|
2019-05-01 17:17:38 +01:00 |
|
Xin Du (Clark)
|
9fb720d518
|
fix(builder): call watch:restart after watch:fileChanged hook (#5620)
|
2019-04-29 22:50:38 +04:30 |
|
Xin Du (Clark)
|
56d5c0c548
|
fix(vue-renderer): await on spa:templateParams hook (#5619)
fixes #5601
|
2019-04-29 13:05:33 +04:30 |
|
renovate[bot]
|
905de666f2
|
chore(deps): update all non-major dependencies (#5591)
|
2019-04-29 12:03:21 +04:30 |
|
Xin Du (Clark)
|
a21555c8cd
|
fix(utils): node v8 not support dotAll in regex (#5608)
|
2019-04-26 23:47:51 +04:30 |
|
Xin Du (Clark)
|
b7284e1b4a
|
refactor(vue-renderer): remove chalk in renderer (#5609)
|
2019-04-26 16:24:37 +04:30 |
|
pooya parsa
|
a5cf705ed8
|
v2.6.3
|
2019-04-25 13:13:50 +04:30 |
|
pooya parsa
|
2108cd669c
|
v2.6.3
|
2019-04-25 13:05:37 +04:30 |
|
pooya parsa
|
a354d9761f
|
atomic children removal
|
2019-04-24 20:43:59 +04:30 |
|
renovate[bot]
|
89f7287356
|
chore(deps): update dependency @types/node to ^11.13.7 (#5585)
|
2019-04-23 13:47:35 +04:30 |
|
Xin Du (Clark)
|
31a15559e5
|
refactor: move modern detection from server to utils (#5584)
|
2019-04-23 13:46:56 +04:30 |
|
pooya parsa
|
912ef25fce
|
revert(vue-app): "expect 0 to be defined"
Co-authored-by: Xin Du (Clark) <clark.duxin@gmail.com>
|
2019-04-23 00:38:27 +04:30 |
|
Pooya Parsa
|
111132df23
|
refactor: avoid using _path variable (#5582)
|
2019-04-22 23:20:07 +04:30 |
|
renovate[bot]
|
1ef50f58a1
|
chore(deps): update all non-major dependencies (#5581)
|
2019-04-22 23:18:40 +04:30 |
|
Jonas Galvez
|
88a78ffa58
|
fix(utils): serialize inline functions (#5051) (#5580)
|
2019-04-22 23:17:42 +04:30 |
|
pooya parsa
|
a2790b4152
|
fix esm test
|
2019-04-21 22:31:42 +04:30 |
|
Xin Du (Clark)
|
2f9aae3fbe
|
refactor(server): exclude dist files request from browser detection (#5571)
|
2019-04-21 22:27:48 +04:30 |
|
pooya parsa
|
91c3642e64
|
fix: don't customize esm options
options like `{ cjs: { } }` resets other defaults. this ensures consitency of usage
[release]
|
2019-04-21 22:20:32 +04:30 |
|
Pooya Parsa
|
c9a95429eb
|
fix(cli): watch and reload nuxt.config (#5574)
[release]
|
2019-04-21 15:39:26 +04:30 |
|
Xin Du (Clark)
|
aea9db6f56
|
fix(webpack): fix production font preloading (#5436)
|
2019-04-20 13:05:14 +01:00 |
|
Xin Du (Clark)
|
f5bbc585ee
|
refactor(vue-renderer): split renderer into ssr, spa and modern (#5559)
|
2019-04-20 13:02:51 +01:00 |
|
Sébastien Chopin
|
01acf66c67
|
feat(vue-app): rename transition to pageTransition and deprecate it (#5558)
|
2019-04-20 14:31:59 +04:30 |
|
renovate[bot]
|
8b45da09b3
|
chore(deps): update dependency cache-loader to v3 (#5567)
|
2019-04-20 13:58:50 +04:30 |
|
renovate[bot]
|
7176ab2d4b
|
chore(deps): update all non-major dependencies (#5538)
|
2019-04-20 13:56:37 +04:30 |
|
Kevin Marrec
|
ccf23a07ed
|
fix(vue-app): fix context req and res types (#5560)
|
2019-04-20 13:46:26 +04:30 |
|
Xin Du (Clark)
|
30c2b9542e
|
chore: revert vue-router temp fix (#5490)
|
2019-04-16 13:38:25 +01:00 |
|
pooya parsa
|
6cee89324f
|
v2.6.2
|
2019-04-15 20:45:03 +04:30 |
|
Pooya Parsa
|
ff340abe6f
|
v2.6.2 (#5523)
|
2019-04-15 20:43:27 +04:30 |
|
pooya parsa
|
c0776eb2d7
|
v2.6.1
|
2019-04-04 22:28:06 +04:30 |
|
pooya parsa
|
53915c55b3
|
fix: pin esm to 3.2.20 (#5464)
|
2019-04-04 22:27:27 +04:30 |
|
pooya parsa
|
0e51676731
|
v2.6.0
|
2019-04-04 21:36:17 +04:30 |
|
renovate[bot]
|
615351d5fa
|
chore(deps): update all non-major dependencies (#5458)
|
2019-04-04 11:17:38 +04:30 |
|
renovate[bot]
|
75e8a89309
|
chore(deps): update all non-major dependencies (#5454)
|
2019-04-03 22:36:50 +04:30 |
|
Xin Du (Clark)
|
6ce99d2cc8
|
fix: revert node-externals disabling in dev mode (#5452)
|
2019-04-03 14:14:36 +04:30 |
|
renovate[bot]
|
913069ff59
|
chore(deps): update all non-major dependencies (#5447)
|
2019-04-03 11:42:43 +04:30 |
|
Xin Du (Clark)
|
e155ea43d7
|
fix(webpack): prefer main over module field for server config (#5446)
[release]
|
2019-04-02 17:30:32 +04:30 |
|
Xin Du (Clark)
|
1ae433355e
|
fix: not override externals set by build.extend (#5444)
|
2019-04-02 17:27:45 +04:30 |
|
renovate[bot]
|
424d641c9f
|
chore(deps): update all non-major dependencies (#5439)
|
2019-04-02 13:44:30 +04:30 |
|
James George
|
b978a3761d
|
feat(vue-renderer): add csp meta tags (#5354)
|
2019-04-02 00:29:58 +04:30 |
|
renovate[bot]
|
d9a2a7e519
|
chore(deps): update dependency html-minifier to v4 (#5438)
|
2019-04-01 23:55:08 +04:30 |
|
Pooya Parsa
|
516aea3d7f
|
feat(cli): add internal _generate and _build options (#5434)
|
2019-04-01 20:18:24 +04:30 |
|
Damian Stasik
|
abf7db1fd3
|
refactor(webpack): add ability to get webpack config class (#5378)
|
2019-03-31 22:15:46 +01:00 |
|
Xin Du (Clark)
|
a5a165749a
|
fix: disable node-externals for dev mode (#5414)
|
2019-04-01 01:05:06 +04:30 |
|
Xin Du (Clark)
|
159123feea
|
feat(babel-preset-app): support specifying core-js version (#5411)
|
2019-03-30 23:53:17 +04:30 |
|
Alexander Lichter
|
1bd4fb14ab
|
chore(postcss): deprecate config support (#5419)
|
2019-03-30 23:42:12 +04:30 |
|
Pooya Parsa
|
8b9969599d
|
fix(renderer): retry render if renderer is in loading or created state (#5417)
|
2019-03-30 23:35:15 +04:30 |
|
Pooya Parsa
|
001ba775fa
|
revert(core): call ready to prevent breaking changes (#5413)
|
2019-03-30 23:23:56 +04:30 |
|
renovate[bot]
|
66b956a1ba
|
chore(deps): update all non-major dependencies (#5420)
|
2019-03-30 22:59:18 +04:30 |
|
Pooya Parsa
|
832bd12091
|
refactor(typescript): use an object for _typescript (#5418)
|
2019-03-30 00:39:20 +04:30 |
|
Pooya Parsa
|
6ffc5c5792
|
feat(typescript): detect typescript based on tsconfig.json (#5412)
|
2019-03-29 23:49:30 +04:30 |
|
renovate[bot]
|
82bde15622
|
chore(deps): update dependency consola to ^2.5.8 (#5416)
|
2019-03-29 23:01:21 +04:30 |
|
renovate[bot]
|
286653292d
|
chore(deps): update dependency typescript to ^3.4.1 (#5415)
|
2019-03-29 22:56:19 +04:30 |
|
Sam Bowler
|
97db6a4b41
|
fix(vue-renderer): add the csp hash if unsafe-inline hasn't been specified (#5387)
|
2019-03-29 20:39:53 +04:30 |
|
Franck Abgrall
|
91f4eb0468
|
feat(cli): add --quiet option to nuxt generate command (#5357)
|
2019-03-29 18:38:08 +04:30 |
|
noe132
|
2d73e8aeba
|
fix(vue-app): prevent mounting page twice on redirect (#5361)
|
2019-03-29 18:36:35 +04:30 |
|
renovate[bot]
|
7ce30935fa
|
chore(deps): update all non-major dependencies (#5402)
|
2019-03-29 18:36:03 +04:30 |
|
Kevin Marrec
|
9a3fc8a44e
|
refactor(ts): only generate tsconfig.json if missing (#5356) (#5367)
Co-authored-by: SAWADA Takayoshi <sawadasuiren@gmail.com>
|
2019-03-29 18:30:49 +04:30 |
|
ryota yamamoto
|
3b85dd97fc
|
fix: SyntaxError Unexpected token export in importing babel runtime helper (#5401)
Co-authored-by: Xin Du (Clark) <clark.duxin@gmail.com>
[release]
|
2019-03-28 11:56:18 +00:00 |
|
Xin Du (Clark)
|
04ddcac4f9
|
fix: memory leak in dev mode (#5399)
|
2019-03-27 14:34:16 +00:00 |
|
renovate[bot]
|
c009a202b8
|
chore(deps): update all non-major dependencies (#5374)
|
2019-03-27 16:58:16 +04:30 |
|
renovate[bot]
|
87e0ac4637
|
chore(deps): update dependency semver to v6 (#5393)
|
2019-03-27 14:52:53 +04:30 |
|
Xin Du (Clark)
|
64fa4244d0
|
fix(build): disable loading babel.config.js by default (#5365)
|
2019-03-24 22:14:22 +04:30 |
|
Daniel Roe
|
847f2f1268
|
Merge branch 'dev' into dev
|
2019-03-23 17:44:34 +00:00 |
|
Pooya Parsa
|
b2a92ac4e3
|
Update build.d.ts
|
2019-03-23 20:41:31 +04:30 |
|
Kevin Marrec
|
69d8001d0f
|
remove old plugin options key
Co-Authored-By: danielroe <daniel@concision.co.uk>
|
2019-03-23 14:08:36 +00:00 |
|
Kevin Marrec
|
55dd4cb4df
|
greater flexibility for typeCheck options
Co-Authored-By: danielroe <daniel@concision.co.uk>
|
2019-03-23 14:06:49 +00:00 |
|
Johan Roxendal
|
77dcfe6ee8
|
fix(vue-app): decode uri in getlocation (#5337)
|
2019-03-23 13:10:38 +04:30 |
|
Pooya Parsa
|
535327c4f1
|
refactor(vue-renderer): improve ready status error (#5339)
|
2019-03-23 11:33:08 +04:30 |
|
Pooya Parsa
|
caf5198430
|
fix(builder): await for renderer to load resources (#5341)
|
2019-03-23 11:32:55 +04:30 |
|
renovate[bot]
|
a6ee8bfea0
|
chore(deps): update all non-major dependencies (#5346)
|
2019-03-23 11:22:12 +04:30 |
|
Pooya Parsa
|
439b914fd0
|
fix: fail in case of missing core-js dependency (#5342)
|
2019-03-23 11:18:18 +04:30 |
|
Pim
|
39bbe46ecb
|
fix(cli): catch all possible errors thrown from proper-filelock (#5347)
|
2019-03-23 11:16:00 +04:30 |
|
renovate[bot]
|
3c50876d73
|
chore(deps): update all non-major dependencies (#5325)
|
2019-03-22 18:01:04 +04:30 |
|
Daniel Roe
|
2c1444d991
|
fix: add type definition for configuring forkTsChecker
|
2019-03-21 23:42:50 +00:00 |
|
pooya parsa
|
5d7757bf29
|
v2.5.1
|
2019-03-22 02:18:39 +04:30 |
|
renovate[bot]
|
a0b0242919
|
chore(deps): update dependency esm to ^3.2.20 (#5322)
|
2019-03-22 02:14:47 +04:30 |
|
Pim
|
7c24280a7a
|
fix: apply default lock options before setting lock (#5320)
|
2019-03-21 23:37:50 +03:30 |
|
Thomas Reichling
|
9ff01f9b20
|
fix: remove consola.debug for hooks (#5318)
|
2019-03-21 23:22:17 +03:30 |
|
renovate[bot]
|
db200a3e69
|
chore(deps): update all non-major dependencies (#5314)
|
2019-03-21 23:15:21 +03:30 |
|
Pooya Parsa
|
20836d9341
|
hotfix: revert to corejs@2 (#5317)
|
2019-03-21 19:29:51 +00:00 |
|
Romain Lanz
|
e67b298218
|
fix(ts): wrong export used in render.d.ts (#5309)
|
2019-03-21 21:03:02 +03:30 |
|
pooya parsa
|
e2c296321b
|
v2.5.0
|
2019-03-21 16:37:34 +03:30 |
|
Pooya Parsa
|
65c1f86ea3
|
fix(webpack): always resolve core-js to v3 (#5307)
|
2019-03-21 15:18:37 +03:30 |
|
renovate[bot]
|
aa61deadf8
|
chore(deps): update all non-major dependencies to ^7.4.2 (#5306)
|
2019-03-21 15:18:23 +03:30 |
|
pooya parsa
|
c46def75cf
|
fix(cli): enable server for implicit SPA generate in nuxt build
revert it back with nuxt 3
|
2019-03-21 14:29:05 +03:30 |
|
pooya parsa
|
665f15ad36
|
fix(pkg): add missing dependencies
[release]
|
2019-03-20 22:22:36 +03:30 |
|
Alexander Lichter
|
3ac01df488
|
fix(vue-app): decode router base to support unicode characters (#5297)
|
2019-03-20 20:16:09 +03:30 |
|
Dmitry Molotkov
|
60e9f781dc
|
chore(babel-preset-app): fix lint error (#5296)
|
2019-03-20 13:20:33 +00:00 |
|
Clark Du
|
be4cee84bf
|
chore: expose absoluteRuntime
|
2019-03-20 12:42:42 +00:00 |
|
Xin Du (Clark)
|
d094c4a974
|
feat: support core-js 3 (#5291)
|
2019-03-20 15:40:10 +03:30 |
|
Nianyong
|
cf02e8226a
|
fix(vue-app): duplicated router.base when using context.redirect(object) (#5290)
|
2019-03-20 15:39:14 +03:30 |
|
Xin Du (Clark)
|
0eb5ed9763
|
fix(webpack): loaders in extend config is broken (#5292)
|
2019-03-20 15:38:24 +03:30 |
|
Sébastien Chopin
|
ef41e205e6
|
feat: loading screen (#5251)
[release]
|
2019-03-20 12:47:53 +03:30 |
|
renovate[bot]
|
fae8fb0df8
|
chore(deps): update all non-major dependencies (#5288)
|
2019-03-20 10:41:58 +03:30 |
|
renovate[bot]
|
f5f1471bc5
|
chore(deps): update all non-major dependencies (#5284)
|
2019-03-20 09:28:41 +03:30 |
|
renovate[bot]
|
f8ff8b5d62
|
chore(deps): update dependency consola to ^2.5.7 (#5283)
|
2019-03-19 21:09:36 +03:30 |
|
Pim
|
65a431d68c
|
fix: relax lock settings (#5280)
|
2019-03-19 14:54:23 +01:00 |
|
Clark Du
|
2eb1965357
|
fix: correct socket address in use error message
|
2019-03-19 11:20:08 +00:00 |
|
renovate[bot]
|
ffe5f4df5d
|
chore(deps): update all non-major dependencies (#5261)
|
2019-03-19 10:27:06 +00:00 |
|
Matsumoto Toshi
|
8bbb269d80
|
test: Add error on malformed URL (#5269)
|
2019-03-19 10:26:37 +00:00 |
|
Michael Leaney
|
d03a61b040
|
fix(vue-app): multiple named views cause invalid syntax (#5262)
|
2019-03-19 10:25:20 +00:00 |
|
renovate[bot]
|
ca1ecf0ee4
|
chore(deps): update dependency caniuse-lite to ^1.0.30000950 (#5259)
|
2019-03-17 11:57:10 +03:30 |
|
phof
|
5b7f6d78ec
|
fix(server): handle decodeURI error (#5243)
|
2019-03-17 01:03:22 +03:30 |
|
pooya parsa
|
37cd24c261
|
chore: cherry-pick goodies from #4235
Co-authored-by: Sébastien Chopin <seb@chopin.io>
|
2019-03-17 00:52:01 +03:30 |
|
Pooya Parsa
|
d6b505aa50
|
test: fail tests in case of unhandled errors (#5255)
|
2019-03-16 16:12:35 +03:30 |
|
renovate[bot]
|
020fa8e1b6
|
chore(deps): update all non-major dependencies (#5252)
|
2019-03-16 10:44:14 +03:30 |
|
renovate[bot]
|
4281c22b45
|
chore(deps): update dependency caniuse-lite to ^1.0.30000948 (#5249)
|
2019-03-15 11:24:24 +03:30 |
|
renovate[bot]
|
5f6f12eea7
|
chore(deps): update dependency @nuxt/devalue to ^1.2.2 (#5240)
|
2019-03-14 13:01:52 +00:00 |
|
pooya parsa
|
cb3171f296
|
update @types/chokidar
|
2019-03-14 13:56:52 +03:30 |
|
pooya parsa
|
f89227e968
|
fix typo in index.d.ts
|
2019-03-14 13:52:12 +03:30 |
|
Daniel Hritzkiv
|
29c3c4250c
|
fix(ts): deprecate isClient , isServer , isStatic (#5211)
|
2019-03-14 13:43:21 +03:30 |
|
Kevin Marrec
|
920f444b6e
|
refactor(ts): better DX for typescript support (#5079)
Breaking change : `build.useForkTsChecker` renamed to `build.typescript.typeCheck`
|
2019-03-14 13:37:47 +03:30 |
|
Julien Dargelos
|
821676511b
|
fix(webpack): clone config.entry (fixes #4849) (#5236)
|
2019-03-14 13:35:19 +03:30 |
|
renovate[bot]
|
b22d97ea3a
|
chore(deps): update all non-major dependencies to ^2.6.9 (#5234)
|
2019-03-14 13:29:47 +03:30 |
|
renovate[bot]
|
0dd22deba3
|
chore(deps): update all non-major dependencies (#5232)
|
2019-03-14 09:25:52 +03:30 |
|
renovate[bot]
|
650a80d744
|
chore(deps): update dependency proper-lockfile to v4 (#5226)
|
2019-03-14 00:02:18 +03:30 |
|
Xin Du (Clark)
|
1fb7538dfe
|
fix: publicPath is not reactive in dev restarting (#5227)
|
2019-03-13 22:45:26 +03:30 |
|
renovate[bot]
|
ff93d14bbc
|
chore(deps): update all non-major dependencies (#5224)
[release]
|
2019-03-13 14:03:43 +03:30 |
|
Pooya Parsa
|
aabb1f69e7
|
perf(core): skip esm for node_modules and non .js files (#5220)
|
2019-03-13 13:54:39 +03:30 |
|
Alexander Lichter
|
adf423a57f
|
fix(postcss): default to preset-env and cssnano last (#5215)
|
2019-03-13 13:40:05 +03:30 |
|
Alexander Lichter
|
37006f6267
|
fix(vua-app): clone mount error to prevent mutating read-only error object (#5214)
|
2019-03-13 01:37:38 +03:30 |
|
Xin Du (Clark)
|
648062c308
|
fix: correct public path in generation and start (#5202)
|
2019-03-12 15:52:15 +00:00 |
|
Jarek Lipski
|
c6565c97c6
|
feat(generate): return non-zero code or page error (fixes #4991) (#5195)
|
2019-03-11 23:25:54 +03:30 |
|
renovate[bot]
|
1336ac9c56
|
chore(deps): update all non-major dependencies (#5180)
|
2019-03-11 13:37:29 +00:00 |
|
Clark Du
|
2f2baacbcc
|
test: try to fix unhandled request
|
2019-03-11 13:22:09 +00:00 |
|
Pooya Parsa
|
13cb0f73d9
|
refactor: remove builder coupling from server (#5157)
|
2019-03-08 20:43:23 +00:00 |
|
Xin Du (Clark)
|
9e1ef888d8
|
fix: respect namespaced in store module (#5189)
|
2019-03-08 22:12:20 +03:30 |
|
Xin Du (Clark)
|
1ea86617ca
|
fix: keep-alive component data should not be updated (#5188)
|
2019-03-08 16:43:27 +00:00 |
|
Pooya Parsa
|
d07aefa5db
|
feat(vue-renderer): use async fs (#5186)
|
2019-03-08 12:20:03 +00:00 |
|
renovate[bot]
|
2cbddeb142
|
chore(deps): update all non-major dependencies (#5174)
|
2019-03-07 23:04:30 +03:30 |
|
Dmitry Molotkov
|
a867dbd34b
|
fix(builder, vue-app): order of plugin execution based on order in array (#5163)
|
2019-03-07 23:03:20 +03:30 |
|
Yutaka Sasaki
|
41028a407b
|
fix(vue-app): avoid css chunk error (#5173)
|
2019-03-07 16:43:09 +03:30 |
|
renovate[bot]
|
688ab27596
|
chore(deps): update dependency fork-ts-checker-webpack-plugin to v1 (#5172)
|
2019-03-07 11:34:21 +03:30 |
|
renovate[bot]
|
50e9d6213d
|
chore(deps): update all non-major dependencies (#5171)
|
2019-03-07 10:42:51 +03:30 |
|
renovate[bot]
|
26bfa47112
|
chore(deps): update dependency webpack-dev-middleware to ^3.6.1 (#5170)
|
2019-03-06 16:37:49 +00:00 |
|
renovate[bot]
|
840ccb4bdf
|
chore(deps): update dependency extract-css-chunks-webpack-plugin to v4 (#5160)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Xin Du (Clark) <clark.duxin@gmail.com>
|
2019-03-06 11:16:07 +00:00 |
|
renovate[bot]
|
083ac57514
|
chore(deps): update dependency esm to ^3.2.11 (#5165)
|
2019-03-06 09:35:08 +00:00 |
|
Clark Du
|
a188f07f19
|
chore: remove unnecessary checks
|
2019-03-05 17:07:05 +00:00 |
|
renovate[bot]
|
43709fda15
|
chore(deps): update all non-major dependencies (#5158)
|
2019-03-05 09:21:06 +03:30 |
|
Xin Du (Clark)
|
cc573a4925
|
test: unit tests for server module (#5154)
|
2019-03-04 20:12:33 +00:00 |
|
renovate[bot]
|
e3991aacdf
|
chore(deps): update dependency extract-css-chunks-webpack-plugin to ^3.3.3 (#5156)
|
2019-03-04 20:11:51 +00:00 |
|
Clark Du
|
52fe145adc
|
feat(babel): include es6.object.assign by default
|
2019-03-04 16:39:58 +00:00 |
|
renovate[bot]
|
340c10736b
|
chore(deps): update all non-major dependencies (#5149)
|
2019-03-04 10:19:33 +03:30 |
|