diff --git a/package.json b/package.json index ab06c61617..8184b5f06b 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,8 @@ "@koa/cors": "5.0.0", "@koa/multer": "3.0.2", "@koa/router": "8.0.8", + "@ladjs/koa-views": "9.0.0", + "@peertube/http-signature": "1.7.0", "@swc/core": "1.4.12", "@twemoji/parser": "15.1.1", "abort-controller": "3.0.0", @@ -88,7 +90,6 @@ "highlight.js": "10.6.0", "html-minifier": "4.0.0", "http-proxy-agent": "5.0.0", - "@peertube/http-signature": "1.7.0", "https-proxy-agent": "5.0.1", "insert-text-at-cursor": "0.3.0", "ip-cidr": "3.0.11", @@ -107,7 +108,6 @@ "koa-mount": "4.0.0", "koa-send": "5.0.1", "koa-slow": "2.1.0", - "koa-views": "8.0.0", "langmap": "0.0.16", "loader-utils": "2.0.4", "moji": "0.5.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d642884cb9..c5489d51d7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,6 +39,9 @@ importers: '@koa/router': specifier: 8.0.8 version: 8.0.8 + '@ladjs/koa-views': + specifier: 9.0.0 + version: 9.0.0(@babel/core@7.23.7)(@types/koa@2.13.4)(lodash@4.17.21)(pug@3.0.3) '@peertube/http-signature': specifier: 1.7.0 version: 1.7.0 @@ -116,7 +119,7 @@ importers: version: 7.0.3 css-loader: specifier: 6.7.3 - version: 6.7.3(webpack@5.76.0) + version: 6.7.3(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) cssnano: specifier: 5.1.15 version: 5.1.15(postcss@8.4.31) @@ -197,16 +200,16 @@ importers: version: 4.1.0 jsdom: specifier: 19.0.0 - version: 19.0.0 + version: 19.0.0(bufferutil@4.0.7)(utf-8-validate@5.0.10) json5: specifier: 2.2.3 version: 2.2.3 json5-loader: specifier: 4.0.1 - version: 4.0.1(webpack@5.76.0) + version: 4.0.1(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) jsonld: specifier: 8.3.2 - version: 8.3.2 + version: 8.3.2(web-streams-polyfill@3.3.3) jsrsasign: specifier: 11.0.0 version: 11.0.0 @@ -234,9 +237,6 @@ importers: koa-slow: specifier: 2.1.0 version: 2.1.0 - koa-views: - specifier: 8.0.0 - version: 8.0.0(@types/koa@2.13.4)(pug@3.0.3) langmap: specifier: 0.0.16 version: 0.0.16 @@ -290,7 +290,7 @@ importers: version: 8.4.31 postcss-loader: specifier: 7.0.2 - version: 7.0.2(postcss@8.4.31)(webpack@5.76.0) + version: 7.0.2(postcss@8.4.31)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) private-ip: specifier: 2.3.4 version: 2.3.4 @@ -299,7 +299,7 @@ importers: version: 7.2.3 progress-bar-webpack-plugin: specifier: 2.1.0 - version: 2.1.0(webpack@5.76.0) + version: 2.1.0(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) promise-limit: specifier: 2.7.0 version: 2.7.0 @@ -380,7 +380,7 @@ importers: version: 0.59.0 stylus-loader: specifier: 7.1.0 - version: 7.1.0(stylus@0.59.0)(webpack@5.76.0) + version: 7.1.0(stylus@0.59.0)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) summaly: specifier: mei23/summaly#3.13.0 version: https://codeload.github.com/mei23/summaly/tar.gz/db9600aa73d8747c0fd83f7e3da298273ec1fd3c @@ -395,7 +395,7 @@ importers: version: 0.0.1 terser-webpack-plugin: specifier: 4.2.3 - version: 4.2.3(webpack@5.76.0) + version: 4.2.3(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) textarea-caret: specifier: 3.1.0 version: 3.1.0 @@ -410,13 +410,13 @@ importers: version: 0.2.1 ts-loader: specifier: 9.4.2 - version: 9.4.2(typescript@4.9.5)(webpack@5.76.0) + version: 9.4.2(typescript@4.9.5)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) ts-node: specifier: 10.9.1 version: 10.9.1(@swc/core@1.4.12)(@types/node@18.11.18)(typescript@4.9.5) typeorm: specifier: 0.2.38 - version: 0.2.38(pg-query-stream@4.5.5)(pg@8.8.0)(redis@3.1.2) + version: 0.2.38(ioredis@5.2.5)(pg-query-stream@4.5.5(pg@8.8.0))(pg@8.8.0)(redis@3.1.2) typescript: specifier: 4.9.5 version: 4.9.5 @@ -452,7 +452,7 @@ importers: version: 1.3.35(vue@2.7.14) vue-loader: specifier: 15.9.8 - version: 15.9.8(css-loader@6.7.3)(pug@3.0.3)(vue-template-compiler@2.7.14)(webpack@5.76.0) + version: 15.9.8(css-loader@6.7.3(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)))(lodash@4.17.21)(pug@3.0.3)(vue-template-compiler@2.7.14)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) vue-marquee-text-component: specifier: 1.2.0 version: 1.2.0 @@ -482,7 +482,7 @@ importers: version: 3.6.2(vue@2.7.14) vuex-persistedstate: specifier: 3.2.0 - version: 3.2.0(vue@2.7.14)(vuex@3.6.2) + version: 3.2.0(vue@2.7.14)(vuex@3.6.2(vue@2.7.14)) web-push: specifier: 3.5.0 version: 3.5.0 @@ -651,7 +651,7 @@ importers: version: 3.3.2 '@types/webpack': specifier: 5.28.0 - version: 5.28.0(@swc/core@1.4.12)(webpack-cli@4.10.0) + version: 5.28.0(@swc/core@1.4.12)(webpack-cli@4.10.0(webpack@5.76.0)) '@types/webpack-stream': specifier: 3.2.12 version: 3.2.12 @@ -660,7 +660,7 @@ importers: version: 1.0.5 '@typescript-eslint/eslint-plugin': specifier: 5.52.0 - version: 5.52.0(@typescript-eslint/parser@5.52.0)(eslint@8.36.0)(typescript@4.9.5) + version: 5.52.0(@typescript-eslint/parser@5.52.0(eslint@8.36.0)(typescript@4.9.5))(eslint@8.36.0)(typescript@4.9.5) '@typescript-eslint/parser': specifier: 5.52.0 version: 5.52.0(eslint@8.36.0)(typescript@4.9.5) @@ -950,6 +950,165 @@ packages: resolution: {integrity: sha512-FnT93N4NUehnXr+juupDmG2yfi0JnWdCmNEuIXpCG4TtG+9xvtrLambBH3RclycopVUOEYAim2lydiNBI7IRVg==} engines: {node: '>= 8.0.0'} + '@ladjs/consolidate@1.0.4': + resolution: {integrity: sha512-ErvBg5acSqns86V/xW7gjqqnBBs6thnpMB0gGc3oM7WHsV8PWrnBtKI6dumHDT3UT/zEOfGzp7dmSFqWoCXKWQ==} + engines: {node: '>=14'} + peerDependencies: + '@babel/core': ^7.22.5 + arc-templates: ^0.5.3 + atpl: '>=0.7.6' + bracket-template: ^1.1.5 + coffee-script: ^1.12.7 + dot: ^1.1.3 + dust: ^0.3.0 + dustjs-helpers: ^1.7.4 + dustjs-linkedin: ^2.7.5 + eco: ^1.1.0-rc-3 + ect: ^0.5.9 + ejs: ^3.1.5 + haml-coffee: ^1.14.1 + hamlet: ^0.3.3 + hamljs: ^0.6.2 + handlebars: ^4.7.6 + hogan.js: ^3.0.2 + htmling: ^0.0.8 + jazz: ^0.0.18 + jqtpl: ~1.1.0 + just: ^0.1.8 + liquid-node: ^3.0.1 + liquor: ^0.0.5 + lodash: ^4.17.20 + mote: ^0.2.0 + mustache: ^4.0.1 + nunjucks: ^3.2.2 + plates: ~0.4.11 + pug: ^3.0.0 + qejs: ^3.0.5 + ractive: ^1.3.12 + react: '>=16.13.1' + react-dom: '>=16.13.1' + slm: ^2.0.0 + swig: ^1.4.2 + swig-templates: ^2.0.3 + teacup: ^2.0.0 + templayed: '>=0.2.3' + then-pug: '*' + tinyliquid: ^0.2.34 + toffee: ^0.3.6 + twig: ^1.15.2 + twing: ^5.0.2 + underscore: ^1.11.0 + vash: ^0.13.0 + velocityjs: ^2.0.1 + walrus: ^0.10.1 + whiskers: ^0.4.0 + peerDependenciesMeta: + '@babel/core': + optional: true + arc-templates: + optional: true + atpl: + optional: true + bracket-template: + optional: true + coffee-script: + optional: true + dot: + optional: true + dust: + optional: true + dustjs-helpers: + optional: true + dustjs-linkedin: + optional: true + eco: + optional: true + ect: + optional: true + ejs: + optional: true + haml-coffee: + optional: true + hamlet: + optional: true + hamljs: + optional: true + handlebars: + optional: true + hogan.js: + optional: true + htmling: + optional: true + jazz: + optional: true + jqtpl: + optional: true + just: + optional: true + liquid-node: + optional: true + liquor: + optional: true + lodash: + optional: true + mote: + optional: true + mustache: + optional: true + nunjucks: + optional: true + plates: + optional: true + pug: + optional: true + qejs: + optional: true + ractive: + optional: true + react: + optional: true + react-dom: + optional: true + slm: + optional: true + swig: + optional: true + swig-templates: + optional: true + teacup: + optional: true + templayed: + optional: true + then-pug: + optional: true + tinyliquid: + optional: true + toffee: + optional: true + twig: + optional: true + twing: + optional: true + underscore: + optional: true + vash: + optional: true + velocityjs: + optional: true + walrus: + optional: true + whiskers: + optional: true + + '@ladjs/koa-views@9.0.0': + resolution: {integrity: sha512-/nzUN3HhB7SIxrE4c2MXCLARXMwgoy7xJogyX8lNJo4VBxM6dVQ47iZWjOoHxTBKGFNAv2OTQ0rWI7HYpiv8kg==} + engines: {node: '>=14'} + peerDependencies: + '@types/koa': ^2.13.1 + peerDependenciesMeta: + '@types/koa': + optional: true + '@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0': resolution: {integrity: sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==} cpu: [arm64] @@ -2386,171 +2545,6 @@ packages: whiskers: optional: true - consolidate@0.16.0: - resolution: {integrity: sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==} - engines: {node: '>= 0.10.0'} - peerDependencies: - arc-templates: ^0.5.3 - atpl: '>=0.7.6' - babel-core: ^6.26.3 - bracket-template: ^1.1.5 - coffee-script: ^1.12.7 - dot: ^1.1.3 - dust: ^0.3.0 - dustjs-helpers: ^1.7.4 - dustjs-linkedin: ^2.7.5 - eco: ^1.1.0-rc-3 - ect: ^0.5.9 - ejs: ^3.1.5 - haml-coffee: ^1.14.1 - hamlet: ^0.3.3 - hamljs: ^0.6.2 - handlebars: ^4.7.6 - hogan.js: ^3.0.2 - htmling: ^0.0.8 - jade: ^1.11.0 - jazz: ^0.0.18 - jqtpl: ~1.1.0 - just: ^0.1.8 - liquid-node: ^3.0.1 - liquor: ^0.0.5 - lodash: ^4.17.20 - marko: ^3.14.4 - mote: ^0.2.0 - mustache: ^4.0.1 - nunjucks: ^3.2.2 - plates: ~0.4.11 - pug: ^3.0.0 - qejs: ^3.0.5 - ractive: ^1.3.12 - razor-tmpl: ^1.3.1 - react: ^16.13.1 - react-dom: ^16.13.1 - slm: ^2.0.0 - squirrelly: ^5.1.0 - swig: ^1.4.2 - swig-templates: ^2.0.3 - teacup: ^2.0.0 - templayed: '>=0.2.3' - then-jade: '*' - then-pug: '*' - tinyliquid: ^0.2.34 - toffee: ^0.3.6 - twig: ^1.15.2 - twing: ^5.0.2 - underscore: ^1.11.0 - vash: ^0.13.0 - velocityjs: ^2.0.1 - walrus: ^0.10.1 - whiskers: ^0.4.0 - peerDependenciesMeta: - arc-templates: - optional: true - atpl: - optional: true - babel-core: - optional: true - bracket-template: - optional: true - coffee-script: - optional: true - dot: - optional: true - dust: - optional: true - dustjs-helpers: - optional: true - dustjs-linkedin: - optional: true - eco: - optional: true - ect: - optional: true - ejs: - optional: true - haml-coffee: - optional: true - hamlet: - optional: true - hamljs: - optional: true - handlebars: - optional: true - hogan.js: - optional: true - htmling: - optional: true - jade: - optional: true - jazz: - optional: true - jqtpl: - optional: true - just: - optional: true - liquid-node: - optional: true - liquor: - optional: true - lodash: - optional: true - marko: - optional: true - mote: - optional: true - mustache: - optional: true - nunjucks: - optional: true - plates: - optional: true - pug: - optional: true - qejs: - optional: true - ractive: - optional: true - razor-tmpl: - optional: true - react: - optional: true - react-dom: - optional: true - slm: - optional: true - squirrelly: - optional: true - swig: - optional: true - swig-templates: - optional: true - teacup: - optional: true - templayed: - optional: true - then-jade: - optional: true - then-pug: - optional: true - tinyliquid: - optional: true - toffee: - optional: true - twig: - optional: true - twing: - optional: true - underscore: - optional: true - vash: - optional: true - velocityjs: - optional: true - walrus: - optional: true - whiskers: - optional: true - constantinople@4.0.1: resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==} @@ -4187,14 +4181,6 @@ packages: resolution: {integrity: sha512-ii6s1zuZ51p+SY7WIrwjRi1tmPrNpeHEaw5UYi4h1QzAPmIcNk16e9zwKd9+eNNzI9n+Q2LXHAvt1MCfs7j/8w==} engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'} - koa-views@8.0.0: - resolution: {integrity: sha512-nvGKdG8yVyomhouwN060SWd7Q9kGYRr322dwN6jvI04hgiDEW9vsPXEje9OEtBgGXxHURe7xOzo3bxQ3DBc1Nw==} - peerDependencies: - '@types/koa': ^2.13.1 - peerDependenciesMeta: - '@types/koa': - optional: true - koa@2.13.4: resolution: {integrity: sha512-43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g==} engines: {node: ^4.8.4 || ^6.10.1 || ^7.10.1 || >= 8.1.4} @@ -5976,7 +5962,6 @@ packages: summaly@https://codeload.github.com/mei23/summaly/tar.gz/db9600aa73d8747c0fd83f7e3da298273ec1fd3c: resolution: {tarball: https://codeload.github.com/mei23/summaly/tar.gz/db9600aa73d8747c0fd83f7e3da298273ec1fd3c} - name: summaly version: 3.13.0 supports-color@2.0.0: @@ -7070,10 +7055,10 @@ snapshots: dependencies: '@jridgewell/trace-mapping': 0.3.9 - '@digitalbazaar/http-client@3.4.1': + '@digitalbazaar/http-client@3.4.1(web-streams-polyfill@3.3.3)': dependencies: ky: 0.33.3 - ky-universal: 0.11.0(ky@0.33.3) + ky-universal: 0.11.0(ky@0.33.3)(web-streams-polyfill@3.3.3) undici: 5.28.4 transitivePeerDependencies: - web-streams-polyfill @@ -7216,6 +7201,74 @@ snapshots: transitivePeerDependencies: - supports-color + '@ladjs/consolidate@1.0.4(@babel/core@7.23.7)(lodash@4.17.21)(pug@3.0.3)': + optionalDependencies: + '@babel/core': 7.23.7 + lodash: 4.17.21 + pug: 3.0.3 + + '@ladjs/koa-views@9.0.0(@babel/core@7.23.7)(@types/koa@2.13.4)(lodash@4.17.21)(pug@3.0.3)': + dependencies: + '@ladjs/consolidate': 1.0.4(@babel/core@7.23.7)(lodash@4.17.21)(pug@3.0.3) + debug: 4.3.4(supports-color@8.1.1) + get-paths: 0.0.7 + koa-send: 5.0.1 + mz: 2.7.0 + pretty: 2.0.0 + resolve-path: 1.4.0 + optionalDependencies: + '@types/koa': 2.13.4 + transitivePeerDependencies: + - '@babel/core' + - arc-templates + - atpl + - bracket-template + - coffee-script + - dot + - dust + - dustjs-helpers + - dustjs-linkedin + - eco + - ect + - ejs + - haml-coffee + - hamlet + - hamljs + - handlebars + - hogan.js + - htmling + - jazz + - jqtpl + - just + - liquid-node + - liquor + - lodash + - mote + - mustache + - nunjucks + - plates + - pug + - qejs + - ractive + - react + - react-dom + - slm + - supports-color + - swig + - swig-templates + - teacup + - templayed + - then-pug + - tinyliquid + - toffee + - twig + - twing + - underscore + - vash + - velocityjs + - walrus + - whiskers + '@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0': optional: true @@ -7658,7 +7711,7 @@ snapshots: anymatch: 3.1.3 source-map: 0.7.4 - '@types/webpack@5.28.0(@swc/core@1.4.12)(webpack-cli@4.10.0)': + '@types/webpack@5.28.0(@swc/core@1.4.12)(webpack-cli@4.10.0(webpack@5.76.0))': dependencies: '@types/node': 18.11.18 tapable: 2.2.1 @@ -7675,7 +7728,7 @@ snapshots: '@types/zen-observable@0.8.3': {} - '@typescript-eslint/eslint-plugin@5.52.0(@typescript-eslint/parser@5.52.0)(eslint@8.36.0)(typescript@4.9.5)': + '@typescript-eslint/eslint-plugin@5.52.0(@typescript-eslint/parser@5.52.0(eslint@8.36.0)(typescript@4.9.5))(eslint@8.36.0)(typescript@4.9.5)': dependencies: '@typescript-eslint/parser': 5.52.0(eslint@8.36.0)(typescript@4.9.5) '@typescript-eslint/scope-manager': 5.52.0 @@ -7689,6 +7742,7 @@ snapshots: regexpp: 3.2.0 semver: 7.3.8 tsutils: 3.21.0(typescript@4.9.5) + optionalDependencies: typescript: 4.9.5 transitivePeerDependencies: - supports-color @@ -7700,6 +7754,7 @@ snapshots: '@typescript-eslint/typescript-estree': 5.52.0(typescript@4.9.5) debug: 4.3.4(supports-color@8.1.1) eslint: 8.36.0 + optionalDependencies: typescript: 4.9.5 transitivePeerDependencies: - supports-color @@ -7716,6 +7771,7 @@ snapshots: debug: 4.3.4(supports-color@8.1.1) eslint: 8.36.0 tsutils: 3.21.0(typescript@4.9.5) + optionalDependencies: typescript: 4.9.5 transitivePeerDependencies: - supports-color @@ -7731,6 +7787,7 @@ snapshots: is-glob: 4.0.3 semver: 7.3.8 tsutils: 3.21.0(typescript@4.9.5) + optionalDependencies: typescript: 4.9.5 transitivePeerDependencies: - supports-color @@ -7761,9 +7818,9 @@ snapshots: postcss: 8.4.31 source-map: 0.7.4 - '@vue/component-compiler-utils@3.3.0(pug@3.0.3)': + '@vue/component-compiler-utils@3.3.0(lodash@4.17.21)(pug@3.0.3)': dependencies: - consolidate: 0.15.1(pug@3.0.3) + consolidate: 0.15.1(lodash@4.17.21)(pug@3.0.3) hash-sum: 1.0.2 lru-cache: 4.1.5 merge-source-map: 1.1.0 @@ -7904,17 +7961,17 @@ snapshots: '@webassemblyjs/ast': 1.11.1 '@xtuc/long': 4.2.2 - '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0)(webpack@5.76.0)': + '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0(webpack@5.76.0))(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0))': dependencies: webpack: 5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0) webpack-cli: 4.10.0(webpack@5.76.0) - '@webpack-cli/info@1.5.0(webpack-cli@4.10.0)': + '@webpack-cli/info@1.5.0(webpack-cli@4.10.0(webpack@5.76.0))': dependencies: envinfo: 7.8.1 webpack-cli: 4.10.0(webpack@5.76.0) - '@webpack-cli/serve@1.7.0(webpack-cli@4.10.0)': + '@webpack-cli/serve@1.7.0(webpack-cli@4.10.0(webpack@5.76.0))': dependencies: webpack-cli: 4.10.0(webpack@5.76.0) @@ -7986,7 +8043,7 @@ snapshots: indent-string: 4.0.0 ajv-formats@2.1.1(ajv@8.12.0): - dependencies: + optionalDependencies: ajv: 8.12.0 ajv-keywords@3.5.2(ajv@6.12.6): @@ -8713,14 +8770,11 @@ snapshots: consola@3.2.3: {} - consolidate@0.15.1(pug@3.0.3): - dependencies: - bluebird: 3.7.2 - pug: 3.0.3 - - consolidate@0.16.0(pug@3.0.3): + consolidate@0.15.1(lodash@4.17.21)(pug@3.0.3): dependencies: bluebird: 3.7.2 + optionalDependencies: + lodash: 4.17.21 pug: 3.0.3 constantinople@4.0.1: @@ -8794,7 +8848,7 @@ snapshots: dependencies: postcss: 8.4.31 - css-loader@6.7.3(webpack@5.76.0): + css-loader@6.7.3(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)): dependencies: icss-utils: 5.1.0(postcss@8.4.31) postcss: 8.4.31 @@ -8951,6 +9005,7 @@ snapshots: debug@4.3.4(supports-color@8.1.1): dependencies: ms: 2.1.2 + optionalDependencies: supports-color: 8.1.1 debuglog@1.0.1: {} @@ -10402,7 +10457,7 @@ snapshots: jschardet@3.0.0: {} - jsdom@19.0.0: + jsdom@19.0.0(bufferutil@4.0.7)(utf-8-validate@5.0.10): dependencies: abab: 2.0.6 acorn: 8.8.1 @@ -10429,7 +10484,7 @@ snapshots: whatwg-encoding: 2.0.0 whatwg-mimetype: 3.0.0 whatwg-url: 10.0.0 - ws: 8.12.0 + ws: 8.12.0(bufferutil@4.0.7)(utf-8-validate@5.0.10) xml-name-validator: 4.0.0 transitivePeerDependencies: - bufferutil @@ -10452,7 +10507,7 @@ snapshots: json-stringify-safe@5.0.1: {} - json5-loader@4.0.1(webpack@5.76.0): + json5-loader@4.0.1(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)): dependencies: json5: 2.2.3 loader-utils: 2.0.4 @@ -10465,9 +10520,9 @@ snapshots: json5@2.2.3: {} - jsonld@8.3.2: + jsonld@8.3.2(web-streams-polyfill@3.3.3): dependencies: - '@digitalbazaar/http-client': 3.4.1 + '@digitalbazaar/http-client': 3.4.1(web-streams-polyfill@3.3.3) canonicalize: 1.0.8 lru-cache: 6.0.0 rdf-canonize: 3.4.0 @@ -10572,72 +10627,6 @@ snapshots: lodash.isregexp: 3.0.5 q: 1.4.1 - koa-views@8.0.0(@types/koa@2.13.4)(pug@3.0.3): - dependencies: - '@types/koa': 2.13.4 - consolidate: 0.16.0(pug@3.0.3) - debug: 4.3.4(supports-color@8.1.1) - get-paths: 0.0.7 - koa-send: 5.0.1 - mz: 2.7.0 - pretty: 2.0.0 - resolve-path: 1.4.0 - transitivePeerDependencies: - - arc-templates - - atpl - - babel-core - - bracket-template - - coffee-script - - dot - - dust - - dustjs-helpers - - dustjs-linkedin - - eco - - ect - - ejs - - haml-coffee - - hamlet - - hamljs - - handlebars - - hogan.js - - htmling - - jade - - jazz - - jqtpl - - just - - liquid-node - - liquor - - lodash - - marko - - mote - - mustache - - nunjucks - - plates - - pug - - qejs - - ractive - - razor-tmpl - - react - - react-dom - - slm - - squirrelly - - supports-color - - swig - - swig-templates - - teacup - - templayed - - then-jade - - then-pug - - tinyliquid - - toffee - - twig - - twing - - underscore - - vash - - velocityjs - - walrus - - whiskers - koa@2.13.4: dependencies: accepts: 1.3.8 @@ -10666,11 +10655,13 @@ snapshots: transitivePeerDependencies: - supports-color - ky-universal@0.11.0(ky@0.33.3): + ky-universal@0.11.0(ky@0.33.3)(web-streams-polyfill@3.3.3): dependencies: abort-controller: 3.0.0 ky: 0.33.3 node-fetch: 3.3.2 + optionalDependencies: + web-streams-polyfill: 3.3.3 ky@0.33.3: {} @@ -11507,7 +11498,7 @@ snapshots: dependencies: postcss: 8.4.31 - postcss-loader@7.0.2(postcss@8.4.31)(webpack@5.76.0): + postcss-loader@7.0.2(postcss@8.4.31)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)): dependencies: cosmiconfig: 7.1.0 klona: 2.0.5 @@ -11723,7 +11714,7 @@ snapshots: process-nextick-args@2.0.1: {} - progress-bar-webpack-plugin@2.1.0(webpack@5.76.0): + progress-bar-webpack-plugin@2.1.0(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)): dependencies: chalk: 3.0.0 progress: 2.0.3 @@ -12437,7 +12428,7 @@ snapshots: postcss: 8.4.31 postcss-selector-parser: 6.0.11 - stylus-loader@7.1.0(stylus@0.59.0)(webpack@5.76.0): + stylus-loader@7.1.0(stylus@0.59.0)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)): dependencies: fast-glob: 3.2.12 klona: 2.0.5 @@ -12599,7 +12590,7 @@ snapshots: mkdirp: 1.0.4 yallist: 4.0.0 - terser-webpack-plugin@4.2.3(webpack@5.76.0): + terser-webpack-plugin@4.2.3(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)): dependencies: cacache: 15.3.0 find-cache-dir: 3.3.2 @@ -12614,15 +12605,16 @@ snapshots: transitivePeerDependencies: - bluebird - terser-webpack-plugin@5.3.6(@swc/core@1.4.12)(webpack@5.76.0): + terser-webpack-plugin@5.3.6(@swc/core@1.4.12)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)): dependencies: '@jridgewell/trace-mapping': 0.3.17 - '@swc/core': 1.4.12 jest-worker: 27.5.1 schema-utils: 3.1.1 serialize-javascript: 6.0.1 terser: 5.16.1 webpack: 5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0) + optionalDependencies: + '@swc/core': 1.4.12 terser@5.16.1: dependencies: @@ -12736,7 +12728,7 @@ snapshots: dependencies: punycode: 2.1.1 - ts-loader@9.4.2(typescript@4.9.5)(webpack@5.76.0): + ts-loader@9.4.2(typescript@4.9.5)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)): dependencies: chalk: 4.1.2 enhanced-resolve: 5.12.0 @@ -12748,7 +12740,6 @@ snapshots: ts-node@10.9.1(@swc/core@1.4.12)(@types/node@18.11.18)(typescript@4.9.5): dependencies: '@cspotcode/source-map-support': 0.8.1 - '@swc/core': 1.4.12 '@tsconfig/node10': 1.0.9 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 @@ -12763,6 +12754,8 @@ snapshots: typescript: 4.9.5 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + optionalDependencies: + '@swc/core': 1.4.12 tslib@1.14.1: {} @@ -12812,7 +12805,7 @@ snapshots: typedarray@0.0.6: {} - typeorm@0.2.38(pg-query-stream@4.5.5)(pg@8.8.0)(redis@3.1.2): + typeorm@0.2.38(ioredis@5.2.5)(pg-query-stream@4.5.5(pg@8.8.0))(pg@8.8.0)(redis@3.1.2): dependencies: '@sqltools/formatter': 1.2.5 app-root-path: 3.1.0 @@ -12824,9 +12817,6 @@ snapshots: glob: 7.2.0 js-yaml: 4.1.0 mkdirp: 1.0.4 - pg: 8.8.0 - pg-query-stream: 4.5.5(pg@8.8.0) - redis: 3.1.2 reflect-metadata: 0.1.13 sha.js: 2.4.11 tslib: 2.4.1 @@ -12834,6 +12824,11 @@ snapshots: yargonaut: 1.1.4 yargs: 17.6.2 zen-observable-ts: 1.1.0 + optionalDependencies: + ioredis: 5.2.5 + pg: 8.8.0 + pg-query-stream: 4.5.5(pg@8.8.0) + redis: 3.1.2 transitivePeerDependencies: - supports-color @@ -13080,16 +13075,17 @@ snapshots: dependencies: vue: 2.7.14 - vue-loader@15.9.8(css-loader@6.7.3)(pug@3.0.3)(vue-template-compiler@2.7.14)(webpack@5.76.0): + vue-loader@15.9.8(css-loader@6.7.3(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)))(lodash@4.17.21)(pug@3.0.3)(vue-template-compiler@2.7.14)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)): dependencies: - '@vue/component-compiler-utils': 3.3.0(pug@3.0.3) - css-loader: 6.7.3(webpack@5.76.0) + '@vue/component-compiler-utils': 3.3.0(lodash@4.17.21)(pug@3.0.3) + css-loader: 6.7.3(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) hash-sum: 1.0.2 loader-utils: 1.4.2 vue-hot-reload-api: 2.3.4 vue-style-loader: 4.1.3 - vue-template-compiler: 2.7.14 webpack: 5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0) + optionalDependencies: + vue-template-compiler: 2.7.14 transitivePeerDependencies: - arc-templates - atpl @@ -13187,7 +13183,7 @@ snapshots: dependencies: vue: 2.7.14 - vuex-persistedstate@3.2.0(vue@2.7.14)(vuex@3.6.2): + vuex-persistedstate@3.2.0(vue@2.7.14)(vuex@3.6.2(vue@2.7.14)): dependencies: deepmerge: 4.2.2 shvl: 2.0.3 @@ -13231,9 +13227,9 @@ snapshots: webpack-cli@4.10.0(webpack@5.76.0): dependencies: '@discoveryjs/json-ext': 0.5.7 - '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0)(webpack@5.76.0) - '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0) - '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0) + '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0(webpack@5.76.0))(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) + '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0(webpack@5.76.0)) + '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0(webpack@5.76.0)) colorette: 2.0.19 commander: 7.2.0 cross-spawn: 7.0.3 @@ -13279,10 +13275,11 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.1.1 tapable: 2.2.1 - terser-webpack-plugin: 5.3.6(@swc/core@1.4.12)(webpack@5.76.0) + terser-webpack-plugin: 5.3.6(@swc/core@1.4.12)(webpack@5.76.0(@swc/core@1.4.12)(webpack-cli@4.10.0)) watchpack: 2.4.0 - webpack-cli: 4.10.0(webpack@5.76.0) webpack-sources: 3.2.3 + optionalDependencies: + webpack-cli: 4.10.0(webpack@5.76.0) transitivePeerDependencies: - '@swc/core' - esbuild @@ -13383,7 +13380,10 @@ snapshots: wrappy@1.0.2: {} - ws@8.12.0: {} + ws@8.12.0(bufferutil@4.0.7)(utf-8-validate@5.0.10): + optionalDependencies: + bufferutil: 4.0.7 + utf-8-validate: 5.0.10 xev@2.0.1: {} diff --git a/src/server/web/index.ts b/src/server/web/index.ts index 4cc78cf895..5d5484fff0 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -8,7 +8,7 @@ import * as Koa from 'koa'; import * as Router from '@koa/router'; import * as send from 'koa-send'; import * as favicon from 'koa-favicon'; -import * as views from 'koa-views'; +import * as views from '@ladjs/koa-views'; import docs from './docs'; import packFeed from './feed';