From 3833b79d7c9294799261a576d79b9f9561f80f30 Mon Sep 17 00:00:00 2001 From: Tue Nguyen Date: Thu, 7 Apr 2022 12:25:41 -0400 Subject: [PATCH] Remove API_URL --- .eslintrc.js | 3 - .github/workflows/docker-build-and-push.yml | 6 - .github/workflows/release.yml | 1 - .gitpod.yml | 2 - config/env.development | 16 - config/env.production | 5 - config/env.staging | 5 - docker/docker-compose.yml | 2 - package.json | 4 +- pnpm-lock.yaml | 311 ++++++++++---------- src/web/Dockerfile | 7 - src/web/app/next.config.js | 3 +- src/web/app/src/config.ts | 12 +- 13 files changed, 161 insertions(+), 216 deletions(-) delete mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index a94ace5518..0000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - extends: '@senecacdot/eslint-config-telescope', -}; diff --git a/.github/workflows/docker-build-and-push.yml b/.github/workflows/docker-build-and-push.yml index 56c13b7259..f02366befb 100644 --- a/.github/workflows/docker-build-and-push.yml +++ b/.github/workflows/docker-build-and-push.yml @@ -12,11 +12,6 @@ on: required: false default: 'https://dev.telescope.cdot.systems' type: string - api_url: - description: 'The microservice gateway URL (defaults to staging)' - required: false - default: 'https://dev.telescope.cdot.systems' - type: string image_url: description: 'The image microservice URL (defaults to staging)' required: false @@ -83,7 +78,6 @@ jobs: image: nginx build-args: | WEB_URL=${{ inputs.web_url }} - API_URL=${{ inputs.api_url }} IMAGE_URL=${{ inputs.image_url }} SSO_URL=${{ inputs.sso_url }} POSTS_URL=${{ inputs.posts_url }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 545b748b01..73a4cf2674 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,6 @@ jobs: with: deploy_tag: production web_url: 'https://telescope.cdot.systems' - api_url: 'https://telescope.cdot.systems' image_url: 'https://api.telescope.cdot.systems/v1/image' sso_url: 'https://api.telescope.cdot.systems/v1/auth' posts_url: 'https://api.telescope.cdot.systems/v1/posts' diff --git a/.gitpod.yml b/.gitpod.yml index ed9dbdb9eb..66f00f2d46 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -6,7 +6,6 @@ tasks: openMode: split-left # Copying env.development and replacing 'localhost' with Gitpod urls before: | - eval $(gp env -e API_URL=$(gp url 3000)) eval $(gp env -e WEB_URL=$(gp url 8000)) eval $(gp env -e API_HOST=$(gp url 8443)) eval $(gp env -e SSO_LOGIN_URL=$(gp url 8081)) @@ -15,7 +14,6 @@ tasks: sed -r \ -e "s@(.+=)http://localhost:8000(/[^ ]*)*@\1$WEB_URL\2@g" \ - -e "s@(.+=)http://localhost:3000(/[^ ]*)*@\1$API_URL\2@g" \ -e "s@(.+=)http://localhost:8081(/[^ ]*)*@\1$SSO_LOGIN_URL\2@g" \ -e "s@(.+=)http://kong:8000(/[^ ]*)*@\1$SUPABASE_API\2@g" \ -e "s@(.+=)http://localhost([^:]*)@\1$API_HOST\2@g" \ diff --git a/config/env.development b/config/env.development index b6829ce0cd..6f38b126bd 100644 --- a/config/env.development +++ b/config/env.development @@ -187,22 +187,6 @@ DEPENDENCY_DISCOVERY_URL=http://localhost/v1/dependency-discovery # NODE_ENV should be one of "development" or "production" NODE_ENV=development -# PORT is the port used by the web server -PORT=3000 - -# API_URL is the URL of the Telescope Web API server. Change this to -# pick which backend server our frontend uses. If you are developing -# locally, this will be localhost:{PORT}, probably http://localhost:3000. -# Other possible values include: -# -# (local development) -# API_URL=http://localhost:3000 -# (our staging server) -# API_URL=https://dev.telescope.cdot.systems -# (our production server) -# API_URL=https://telescope.cdot.systems -API_URL=http://localhost:3000 - # PROXY_FRONTEND=1 will allow proxying the Next dev server (http://localhost:8000) # through our node server (http://localhost:3000). Useful for testing locally. # To run: diff --git a/config/env.production b/config/env.production index 8459d9f656..9d6e50ce39 100644 --- a/config/env.production +++ b/config/env.production @@ -180,11 +180,6 @@ DEPENDENCY_DISCOVERY_URL=https://api.telescope.cdot.systems/v1/dependency-discov # NODE_ENV should be one of "development" or "production" NODE_ENV=production -# PORT is the port used by the web server -PORT=3000 - -API_URL=https://telescope.cdot.systems - # LOG_LEVEL is used to set the level of debugging for the logs. # info, error and debug are commonly used levels. See http://getpino.io/#/docs/api?id=level for more info on levels. # to completely disable all logs, use silent. diff --git a/config/env.staging b/config/env.staging index c3279d20a5..a9d47390e4 100644 --- a/config/env.staging +++ b/config/env.staging @@ -182,11 +182,6 @@ DEPENDENCY_DISCOVERY_URL=https://dev.api.telescope.cdot.systems/v1/dependency-di # NODE_ENV should be one of "development" or "production" NODE_ENV=production -# PORT is the port used by the web server -PORT=3000 - -API_URL=https://dev.telescope.cdot.systems - # LOG_LEVEL is used to set the level of debugging for the logs. # info, error and debug are commonly used levels. See http://getpino.io/#/docs/api?id=level for more info on levels. # to completely disable all logs, use silent. diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index aabd30eb53..181c31e2b2 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -261,8 +261,6 @@ services: args: # Web front-end URL - WEB_URL=${WEB_URL} - # Telescope 1.0 API URL - - API_URL=${API_URL} # Telescope 2.0 Microservice URLs - IMAGE_URL=${IMAGE_URL} - SSO_URL=${SSO_URL} diff --git a/package.json b/package.json index 0be1dd8abc..cd94644b4b 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "build": "pnpm turbo run build", "dev": "pnpm dev --prefix src/web/app --", "develop": "pnpm dev", - "eslint": "TIMING=1 eslint --config .eslintrc.js --ignore-path .gitignore", - "eslint-fix": "eslint --config .eslintrc.js --ignore-path .gitignore --fix", + "eslint": "TIMING=1 eslint --ignore-path .gitignore", + "eslint-fix": "eslint --ignore-path .gitignore --fix", "lint": "pnpm turbo run lint && pnpm eslint", "clean": "pnpm turbo run clean && pnpm -r exec rm -rf node_modules", "prettier": "prettier --write \"./**/*.{md,jsx,json,html,css,js,yml,ts,tsx}\"", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index de42ac14e8..93c3e73f7a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1858,6 +1858,7 @@ packages: dependencies: '@babel/core': 7.17.9 '@babel/helper-plugin-utils': 7.16.7 + dev: false /@babel/plugin-transform-arrow-functions/7.16.7_@babel+core@7.17.8: resolution: {integrity: sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==} @@ -3130,7 +3131,7 @@ packages: '@slorber/static-site-generator-webpack-plugin': 4.0.4 '@svgr/webpack': 6.2.1 autoprefixer: 10.4.4_postcss@8.4.12 - babel-loader: 8.2.4_7ee2ee6f8cbdc1e65df0788b3107bc6d + babel-loader: 8.2.4_acba72ea4bf9d339cdfcd8f55cdb7006 babel-plugin-dynamic-import-node: 2.3.0 boxen: 6.2.1 chokidar: 3.5.3 @@ -3138,35 +3139,35 @@ packages: cli-table3: 0.6.1 combine-promises: 1.1.0 commander: 5.1.0 - copy-webpack-plugin: 10.2.4_webpack@5.71.0 + copy-webpack-plugin: 10.2.4_webpack@5.72.0 core-js: 3.21.1 - css-loader: 6.7.1_webpack@5.71.0 - css-minimizer-webpack-plugin: 3.4.1_clean-css@5.3.0+webpack@5.71.0 + css-loader: 6.7.1_webpack@5.72.0 + css-minimizer-webpack-plugin: 3.4.1_clean-css@5.3.0+webpack@5.72.0 cssnano: 5.1.7_postcss@8.4.12 del: 6.0.0 detect-port: 1.3.0 escape-html: 1.0.3 eta: 1.12.3 - file-loader: 6.2.0_webpack@5.71.0 + file-loader: 6.2.0_webpack@5.72.0 fs-extra: 10.0.1 html-minifier-terser: 6.1.0 html-tags: 3.2.0 - html-webpack-plugin: 5.5.0_webpack@5.71.0 + html-webpack-plugin: 5.5.0_webpack@5.72.0 import-fresh: 3.3.0 is-root: 2.1.0 leven: 3.1.0 lodash: 4.17.21 - mini-css-extract-plugin: 2.6.0_webpack@5.71.0 + mini-css-extract-plugin: 2.6.0_webpack@5.72.0 nprogress: 0.2.0 postcss: 8.4.12 - postcss-loader: 6.2.1_postcss@8.4.12+webpack@5.71.0 + postcss-loader: 6.2.1_postcss@8.4.12+webpack@5.72.0 prompts: 2.4.2 react: 17.0.2 - react-dev-utils: 12.0.0_2b5269e92beebd53cbbc8c85f8a0d8d9 + react-dev-utils: 12.0.0_6a0113e768db0748a6823124c8b1cb6b react-dom: 17.0.2_react@17.0.2 react-helmet-async: 1.2.3_react-dom@17.0.2+react@17.0.2 react-loadable: /@docusaurus/react-loadable/5.5.2_react@17.0.2 - react-loadable-ssr-addon-v5-slorber: 1.0.1_fc8cb065053e04bf73bf05d6b2de63ea + react-loadable-ssr-addon-v5-slorber: 1.0.1_e9a32d0ed12f8f09954f994457231c0d react-router: 5.2.1_react@17.0.2 react-router-config: 5.1.1_react-router@5.2.1+react@17.0.2 react-router-dom: 5.3.0_react@17.0.2 @@ -3175,16 +3176,16 @@ packages: semver: 7.3.6 serve-handler: 6.1.3 shelljs: 0.8.5 - terser-webpack-plugin: 5.3.1_webpack@5.71.0 + terser-webpack-plugin: 5.3.1_webpack@5.72.0 tslib: 2.3.1 update-notifier: 5.1.0 - url-loader: 4.1.1_file-loader@6.2.0+webpack@5.71.0 + url-loader: 4.1.1_file-loader@6.2.0+webpack@5.72.0 wait-on: 6.0.1 - webpack: 5.71.0 + webpack: 5.72.0 webpack-bundle-analyzer: 4.5.0 - webpack-dev-server: 4.8.1_webpack@5.71.0 + webpack-dev-server: 4.8.1_webpack@5.72.0 webpack-merge: 5.8.0 - webpackbar: 5.0.2_webpack@5.71.0 + webpackbar: 5.0.2_webpack@5.72.0 transitivePeerDependencies: - '@parcel/css' - '@swc/core' @@ -3230,7 +3231,7 @@ packages: '@docusaurus/utils': 2.0.0-beta.17 '@mdx-js/mdx': 1.6.22 escape-html: 1.0.3 - file-loader: 6.2.0_webpack@5.71.0 + file-loader: 6.2.0_webpack@5.72.0 fs-extra: 10.0.1 image-size: 1.0.1 mdast-util-to-string: 2.0.0 @@ -3240,8 +3241,8 @@ packages: stringify-object: 3.3.0 tslib: 2.3.1 unist-util-visit: 2.0.3 - url-loader: 4.1.1_file-loader@6.2.0+webpack@5.71.0 - webpack: 5.71.0 + url-loader: 4.1.1_file-loader@6.2.0+webpack@5.72.0 + webpack: 5.72.0 transitivePeerDependencies: - '@swc/core' - esbuild @@ -3293,7 +3294,7 @@ packages: remark-admonitions: 1.2.1 tslib: 2.3.1 utility-types: 3.10.0 - webpack: 5.71.0 + webpack: 5.72.0 transitivePeerDependencies: - '@parcel/css' - '@swc/core' @@ -3332,7 +3333,7 @@ packages: remark-admonitions: 1.2.1 tslib: 2.3.1 utility-types: 3.10.0 - webpack: 5.71.0 + webpack: 5.72.0 transitivePeerDependencies: - '@parcel/css' - '@swc/core' @@ -3365,7 +3366,7 @@ packages: react-dom: 17.0.2_react@17.0.2 remark-admonitions: 1.2.1 tslib: 2.3.1 - webpack: 5.71.0 + webpack: 5.72.0 transitivePeerDependencies: - '@parcel/css' - '@swc/core' @@ -3686,7 +3687,7 @@ packages: joi: 17.6.0 querystring: 0.2.1 utility-types: 3.10.0 - webpack: 5.71.0 + webpack: 5.72.0 webpack-merge: 5.8.0 transitivePeerDependencies: - '@swc/core' @@ -3723,7 +3724,7 @@ packages: dependencies: '@docusaurus/logger': 2.0.0-beta.17 '@svgr/webpack': 6.2.1 - file-loader: 6.2.0_webpack@5.71.0 + file-loader: 6.2.0_webpack@5.72.0 fs-extra: 10.0.1 github-slugger: 1.4.0 globby: 11.1.0 @@ -3734,8 +3735,8 @@ packages: resolve-pathname: 3.0.0 shelljs: 0.8.5 tslib: 2.3.1 - url-loader: 4.1.1_file-loader@6.2.0+webpack@5.71.0 - webpack: 5.71.0 + url-loader: 4.1.1_file-loader@6.2.0+webpack@5.72.0 + webpack: 5.72.0 transitivePeerDependencies: - '@swc/core' - esbuild @@ -6565,34 +6566,34 @@ packages: - supports-color dev: true - /babel-loader/8.2.4_7ee2ee6f8cbdc1e65df0788b3107bc6d: + /babel-loader/8.2.4_@babel+core@7.17.8+webpack@5.9.0: resolution: {integrity: sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==} engines: {node: '>= 8.9'} peerDependencies: '@babel/core': ^7.0.0 webpack: '>=2' dependencies: - '@babel/core': 7.17.9 + '@babel/core': 7.17.8 find-cache-dir: 3.3.2 loader-utils: 2.0.2 make-dir: 3.1.0 schema-utils: 2.7.1 - webpack: 5.71.0 - dev: false + webpack: 5.9.0 - /babel-loader/8.2.4_@babel+core@7.17.8+webpack@5.9.0: + /babel-loader/8.2.4_acba72ea4bf9d339cdfcd8f55cdb7006: resolution: {integrity: sha512-8dytA3gcvPPPv4Grjhnt8b5IIiTcq/zeXOPk4iTYI0SVXcsmuGg7JtBRDp8S9X+gJfhQ8ektjXZlDu1Bb33U8A==} engines: {node: '>= 8.9'} peerDependencies: '@babel/core': ^7.0.0 webpack: '>=2' dependencies: - '@babel/core': 7.17.8 + '@babel/core': 7.17.9 find-cache-dir: 3.3.2 loader-utils: 2.0.2 make-dir: 3.1.0 schema-utils: 2.7.1 - webpack: 5.9.0 + webpack: 5.72.0 + dev: false /babel-plugin-apply-mdx-type-prop/1.6.22_@babel+core@7.12.9: resolution: {integrity: sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==} @@ -6923,7 +6924,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001325 - electron-to-chromium: 1.4.104 + electron-to-chromium: 1.4.106 escalade: 3.1.1 node-releases: 2.0.2 picocolors: 1.0.0 @@ -7032,7 +7033,7 @@ packages: clone-response: 1.0.2 get-stream: 5.2.0 http-cache-semantics: 4.1.0 - keyv: 4.2.1 + keyv: 4.2.2 lowercase-keys: 2.0.0 normalize-url: 6.1.0 responselike: 2.0.0 @@ -7165,7 +7166,7 @@ packages: dependencies: css-select: 4.3.0 css-what: 6.1.0 - domelementtype: 2.2.0 + domelementtype: 2.3.0 domhandler: 4.3.1 domutils: 2.8.0 dev: false @@ -7564,7 +7565,7 @@ packages: toggle-selection: 1.0.6 dev: false - /copy-webpack-plugin/10.2.4_webpack@5.71.0: + /copy-webpack-plugin/10.2.4_webpack@5.72.0: resolution: {integrity: sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==} engines: {node: '>= 12.20.0'} peerDependencies: @@ -7576,7 +7577,7 @@ packages: normalize-path: 3.0.0 schema-utils: 4.0.0 serialize-javascript: 6.0.0 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /core-js-compat/3.21.1: @@ -7686,7 +7687,7 @@ packages: isobject: 3.0.1 dev: false - /css-loader/6.7.1_webpack@5.71.0: + /css-loader/6.7.1_webpack@5.72.0: resolution: {integrity: sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -7700,10 +7701,10 @@ packages: postcss-modules-values: 4.0.0_postcss@8.4.12 postcss-value-parser: 4.2.0 semver: 7.3.6 - webpack: 5.71.0 + webpack: 5.72.0 dev: false - /css-minimizer-webpack-plugin/3.4.1_clean-css@5.3.0+webpack@5.71.0: + /css-minimizer-webpack-plugin/3.4.1_clean-css@5.3.0+webpack@5.72.0: resolution: {integrity: sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -7729,7 +7730,7 @@ packages: schema-utils: 4.0.0 serialize-javascript: 6.0.0 source-map: 0.6.1 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /css-select/1.2.0: @@ -8750,7 +8751,7 @@ packages: /dom-serializer/1.3.2: resolution: {integrity: sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==} dependencies: - domelementtype: 2.2.0 + domelementtype: 2.3.0 domhandler: 4.3.1 entities: 2.2.0 dev: false @@ -8759,8 +8760,8 @@ packages: resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==} dev: false - /domelementtype/2.2.0: - resolution: {integrity: sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==} + /domelementtype/2.3.0: + resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} dev: false /domexception/2.0.1: @@ -8787,7 +8788,7 @@ packages: resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==} engines: {node: '>= 4'} dependencies: - domelementtype: 2.2.0 + domelementtype: 2.3.0 dev: false /dompurify/2.3.4: @@ -8812,7 +8813,7 @@ packages: resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==} dependencies: dom-serializer: 1.3.2 - domelementtype: 2.2.0 + domelementtype: 2.3.0 domhandler: 4.3.1 dev: false @@ -8872,8 +8873,8 @@ packages: jake: 10.8.4 dev: false - /electron-to-chromium/1.4.104: - resolution: {integrity: sha512-2kjoAyiG7uMyGRM9mx25s3HAzmQG2ayuYXxsFmYugHSDcwxREgLtscZvbL1JcW9S/OemeQ3f/SG6JhDwpnCclQ==} + /electron-to-chromium/1.4.106: + resolution: {integrity: sha512-ZYfpVLULm67K7CaaGP7DmjyeMY4naxsbTy+syVVxT6QHI1Ww8XbJjmr9fDckrhq44WzCrcC5kH3zGpdusxwwqg==} /emitter-listener/1.1.2: resolution: {integrity: sha512-Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ==} @@ -9021,8 +9022,8 @@ packages: ext: 1.6.0 dev: false - /esbuild-android-64/0.14.32: - resolution: {integrity: sha512-q1qjB2UcoWehR9Yp9dO2RdJUeLLrXAYsbOU4tkYa+GmJzxTwuvOrMdvaemsXYqb7F4STVTca9KpfqGicEChtUg==} + /esbuild-android-64/0.14.34: + resolution: {integrity: sha512-XfxcfJqmMYsT/LXqrptzFxmaR3GWzXHDLdFNIhm6S00zPaQF1TBBWm+9t0RZ6LRR7iwH57DPjaOeW20vMqI4Yw==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -9030,8 +9031,8 @@ packages: dev: false optional: true - /esbuild-android-arm64/0.14.32: - resolution: {integrity: sha512-bs1uu+RuM15f8yjFc0FhPDE/6NID4fKl7beDVsGCme6Q8ld2IzRXmp5QaHurlcH93PFyQnUgVvdahIWgtK2QZw==} + /esbuild-android-arm64/0.14.34: + resolution: {integrity: sha512-T02+NXTmSRL1Mc6puz+R9CB54rSPICkXKq6+tw8B6vxZFnCPzbJxgwIX4kcluz9p8nYBjF3+lSilTGWb7+Xgew==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -9039,8 +9040,8 @@ packages: dev: false optional: true - /esbuild-darwin-64/0.14.32: - resolution: {integrity: sha512-6MekflAld28wYtzanwZTxQlxMPeYw/yv1ToFG2hpo3LGxOIE2mBD5IJaMCcyy1//EYvGnGToO3p6XKdbS8E1QQ==} + /esbuild-darwin-64/0.14.34: + resolution: {integrity: sha512-pLRip2Bh4Ng7Bf6AMgCrSp3pPe/qZyf11h5Qo2mOfJqLWzSVjxrXW+CFRJfrOVP7TCnh/gmZSM2AFdCPB72vtw==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -9048,8 +9049,8 @@ packages: dev: false optional: true - /esbuild-darwin-arm64/0.14.32: - resolution: {integrity: sha512-BHYIjiPDYQTD+4zwqdqRo+I2bbg3fn9mah/gZm4SCCy+7uwTTYOYobIunHT7wVCgxnFCr50PJUdaMrEoCImRbw==} + /esbuild-darwin-arm64/0.14.34: + resolution: {integrity: sha512-vpidSJEBxx6lf1NWgXC+DCmGqesJuZ5Y8aQVVsaoO4i8tRXbXb0whChRvop/zd3nfNM4dIl5EXAky0knRX5I6w==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -9057,8 +9058,8 @@ packages: dev: false optional: true - /esbuild-freebsd-64/0.14.32: - resolution: {integrity: sha512-6BOBhtfAf9AlfjL1AvtfVOxwY82tHPfYrA0lskJpFjfiEMGTLU6e0vdOwb4+4x++gGz49azuGK0woYqdfL03uw==} + /esbuild-freebsd-64/0.14.34: + resolution: {integrity: sha512-m0HBjePhe0hAQJgtMRMNV9kMgIyV4/qSnzPx42kRMQBcPhgjAq1JRu4Il26czC+9FgpMbFkUktb07f/Lwnc6CA==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -9066,8 +9067,8 @@ packages: dev: false optional: true - /esbuild-freebsd-arm64/0.14.32: - resolution: {integrity: sha512-zIRR4gKQW56p/xLM8TlpxVBNiX0w3VoR9ZxfH4nrfJ7QiL0SYHRy8YPL5C7zMWRjSze2WxQRHfS9bHKdVrVXBw==} + /esbuild-freebsd-arm64/0.14.34: + resolution: {integrity: sha512-cpRc2B94L1KvMPPYB4D6G39jLqpKlD3noAMY4/e86iXXXkhUYJJEtTuyNFTa9JRpWM0xCAp4mxjHjoIiLuoCLA==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -9075,8 +9076,8 @@ packages: dev: false optional: true - /esbuild-linux-32/0.14.32: - resolution: {integrity: sha512-kn0AkGtPvzA6xiv93/mavvZ7DVinu/ewh2F2S0/8mE8/PXi3D4+svZ6V3beV5DIH7vcHVuGhoooWav8HPF04tg==} + /esbuild-linux-32/0.14.34: + resolution: {integrity: sha512-8nQaEaoW7MH/K/RlozJa+lE1ejHIr8fuPIHhc513UebRav7HtXgQvxHQ6VZRUkWtep23M6dd7UqhwO1tMOfzQQ==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -9084,8 +9085,8 @@ packages: dev: false optional: true - /esbuild-linux-64/0.14.32: - resolution: {integrity: sha512-Ie+PMvrPj/HCOmSc0QubKttDxP2iBtPzDu+b+V3HGDGwkGmVpDkyXx1NXp5LjkIphIay2QekMwy1dSw3KDqCew==} + /esbuild-linux-64/0.14.34: + resolution: {integrity: sha512-Y3of4qQoLLlAgf042MlrY1P+7PnN9zWj8nVtw9XQG5hcLOZLz7IKpU35oeu7n4wvyaZHwvQqDJ93gRLqdJekcQ==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -9093,8 +9094,8 @@ packages: dev: false optional: true - /esbuild-linux-arm/0.14.32: - resolution: {integrity: sha512-R/Bvn/YQNDyvfN0SERh/I7hKPqN+nSSruQdVeiYEJ+jc3fUi73jXYAscpTQgIBeER/yXnEsgJGU/UQ9+sscr7A==} + /esbuild-linux-arm/0.14.34: + resolution: {integrity: sha512-9lpq1NcJqssAF7alCO6zL3gvBVVt/lKw4oetUM7OgNnRX0OWpB+ZIO9FwCrSj/dMdmgDhPLf+119zB8QxSMmAg==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -9102,8 +9103,8 @@ packages: dev: false optional: true - /esbuild-linux-arm64/0.14.32: - resolution: {integrity: sha512-ykoqKaxX95nB+lk2K/+qxr0ke+BxkeVi0yKOnymCR5Ive7IZDHa4BJX53NEGSBKLfWPwKE6SXTz8qcEewSntoA==} + /esbuild-linux-arm64/0.14.34: + resolution: {integrity: sha512-IlWaGtj9ir7+Nrume1DGcyzBDlK8GcnJq0ANKwcI9pVw8tqr+6GD0eqyF9SF1mR8UmAp+odrx1H5NdR2cHdFHA==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -9111,8 +9112,8 @@ packages: dev: false optional: true - /esbuild-linux-mips64le/0.14.32: - resolution: {integrity: sha512-IilnlBexpHpt/5po0cle/L/S6CYnwaq23UuAqWzxp+opHLOCNnyANpC1jOoP551aRx4JuZ7z3xZZ7bYQZB147w==} + /esbuild-linux-mips64le/0.14.34: + resolution: {integrity: sha512-k3or+01Rska1AjUyNjA4buEwB51eyN/xPQAoOx1CjzAQC3l8rpjUDw55kXyL63O/1MUi4ISvtNtl8gLwdyEcxw==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -9120,8 +9121,8 @@ packages: dev: false optional: true - /esbuild-linux-ppc64le/0.14.32: - resolution: {integrity: sha512-TR6l5nWZbfq7jSY+1vsiQjT4m67NWplNhbX6GBieZq6DBt0nTx1XgTZAdKROF7jTuaK7YrCYlPXtfO3w86Mysw==} + /esbuild-linux-ppc64le/0.14.34: + resolution: {integrity: sha512-+qxb8M9FfM2CJaVU7GgYpJOHM1ngQOx+/VrtBjb4C8oVqaPcESCeg2anjl+HRZy8VpYc71q/iBYausPPbJ+Keg==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -9129,8 +9130,8 @@ packages: dev: false optional: true - /esbuild-linux-riscv64/0.14.32: - resolution: {integrity: sha512-aSOcUzTeIAslfri8e+bMpyzQuxhcIiNhWyuCGGXum2PtxwYiUqR8/UCMYfwYtYkhr1yABOFOfs83mm9KBy5qCQ==} + /esbuild-linux-riscv64/0.14.34: + resolution: {integrity: sha512-Y717ltBdQ5j5sZIHdy1DV9kieo0wMip0dCmVSTceowCPYSn1Cg33Kd6981+F/3b9FDMzNWldZFOBRILViENZSA==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -9138,8 +9139,8 @@ packages: dev: false optional: true - /esbuild-linux-s390x/0.14.32: - resolution: {integrity: sha512-dNlip+EvexxKjRZitFCWCd7DVk64c7R5ySr8aFEMHCb/RriNiyDxYJGzYWm4EMJsMRMupMUHlMY64BAa3Op9FA==} + /esbuild-linux-s390x/0.14.34: + resolution: {integrity: sha512-bDDgYO4LhL4+zPs+WcBkXph+AQoPcQRTv18FzZS0WhjfH8TZx2QqlVPGhmhZ6WidrY+jKthUqO6UhGyIb4MpmA==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -9147,8 +9148,8 @@ packages: dev: false optional: true - /esbuild-netbsd-64/0.14.32: - resolution: {integrity: sha512-Pa3QByYqxzlBFQQQhjYBPg3WUfSjwibqzh1hC6mPDRUHnCeUcrLoBuIiG4xqOYEpQM9/kDowIBsrGIQEVWWdQA==} + /esbuild-netbsd-64/0.14.34: + resolution: {integrity: sha512-cfaFGXdRt0+vHsjNPyF0POM4BVSHPSbhLPe8mppDc7GDDxjIl08mV1Zou14oDWMp/XZMjYN1kWYRSfftiD0vvQ==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -9156,8 +9157,8 @@ packages: dev: false optional: true - /esbuild-openbsd-64/0.14.32: - resolution: {integrity: sha512-uWKKqpCjkMY8TCIobFvaSETonQY3OrmgnoTCC3tF+lvMoneYjppB6akx7L5Xv0kP+1tnSbrIof1ca8PfqGUyjw==} + /esbuild-openbsd-64/0.14.34: + resolution: {integrity: sha512-vmy9DxXVnRiI14s8GKuYBtess+EVcDALkbpTqd5jw4XITutIzyB7n4x0Tj5utAkKsgZJB22lLWGekr0ABnSLow==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -9165,8 +9166,8 @@ packages: dev: false optional: true - /esbuild-sunos-64/0.14.32: - resolution: {integrity: sha512-Ar+u3mBk0oVV4Fwv/qlinJZNIPPtTBSG+1W42o8lOaVxJ+rJgecDoeUN+5uyd9at0BK1SVrQ1qZ4wjHKB0qFpQ==} + /esbuild-sunos-64/0.14.34: + resolution: {integrity: sha512-eNPVatNET1F7tRMhii7goL/eptfxc0ALRjrj9SPFNqp0zmxrehBFD6BaP3R4LjMn6DbMO0jOAnTLFKr8NqcJAA==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -9174,8 +9175,8 @@ packages: dev: false optional: true - /esbuild-windows-32/0.14.32: - resolution: {integrity: sha512-rLMsbflMY6Hjh3rmQnCDVZahJQ7n+XfT6o1+no5pHRpDlMh38MHthgGh35q+EcOMgrGP3ppnw70rhJq80SaYTQ==} + /esbuild-windows-32/0.14.34: + resolution: {integrity: sha512-EFhpXyHEcnqWYe2rAHFd8dRw8wkrd9U+9oqcyoEL84GbanAYjiiIjBZsnR8kl0sCQ5w6bLpk7vCEIA2VS32Vcg==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -9183,8 +9184,8 @@ packages: dev: false optional: true - /esbuild-windows-64/0.14.32: - resolution: {integrity: sha512-OHnMMxYufVgLXIMnwLynLMKguHMrsVnWcehieSP9i6ZX31KEsOFYWrorcnTWOn4rbZVLSL10ofxLuVIgRW3SWw==} + /esbuild-windows-64/0.14.34: + resolution: {integrity: sha512-a8fbl8Ky7PxNEjf1aJmtxdDZj32/hC7S1OcA2ckEpCJRTjiKslI9vAdPpSjrKIWhws4Galpaawy0nB7fjHYf5Q==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -9192,8 +9193,8 @@ packages: dev: false optional: true - /esbuild-windows-arm64/0.14.32: - resolution: {integrity: sha512-ddavy6IPUBySMfqDfG243TgtuqwQBNJQJPVaA4DaavmMfpBsUxFrSV+HzBWXTKU3I9EcuoEvIATLuQ7NJKxjwg==} + /esbuild-windows-arm64/0.14.34: + resolution: {integrity: sha512-EYvmKbSa2B3sPnpC28UEu9jBK5atGV4BaVRE7CYGUci2Hlz4AvtV/LML+TcDMT6gBgibnN2gcltWclab3UutMg==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -9201,32 +9202,32 @@ packages: dev: false optional: true - /esbuild/0.14.32: - resolution: {integrity: sha512-RuzVUP/bkStmnVHK6Gh3gjaMjfXNLqBqvYVDiS9JKl5KdRdRLUeW5Wo8NrbL7cL6CW7Cyak7SvACqyPOBuA8vA==} + /esbuild/0.14.34: + resolution: {integrity: sha512-QIWdPT/gFF6hCaf4m7kP0cJ+JIuFkdHibI7vVFvu3eJS1HpVmYHWDulyN5WXwbRA0SX/7ZDaJ/1DH8SdY9xOJg==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-64: 0.14.32 - esbuild-android-arm64: 0.14.32 - esbuild-darwin-64: 0.14.32 - esbuild-darwin-arm64: 0.14.32 - esbuild-freebsd-64: 0.14.32 - esbuild-freebsd-arm64: 0.14.32 - esbuild-linux-32: 0.14.32 - esbuild-linux-64: 0.14.32 - esbuild-linux-arm: 0.14.32 - esbuild-linux-arm64: 0.14.32 - esbuild-linux-mips64le: 0.14.32 - esbuild-linux-ppc64le: 0.14.32 - esbuild-linux-riscv64: 0.14.32 - esbuild-linux-s390x: 0.14.32 - esbuild-netbsd-64: 0.14.32 - esbuild-openbsd-64: 0.14.32 - esbuild-sunos-64: 0.14.32 - esbuild-windows-32: 0.14.32 - esbuild-windows-64: 0.14.32 - esbuild-windows-arm64: 0.14.32 + esbuild-android-64: 0.14.34 + esbuild-android-arm64: 0.14.34 + esbuild-darwin-64: 0.14.34 + esbuild-darwin-arm64: 0.14.34 + esbuild-freebsd-64: 0.14.34 + esbuild-freebsd-arm64: 0.14.34 + esbuild-linux-32: 0.14.34 + esbuild-linux-64: 0.14.34 + esbuild-linux-arm: 0.14.34 + esbuild-linux-arm64: 0.14.34 + esbuild-linux-mips64le: 0.14.34 + esbuild-linux-ppc64le: 0.14.34 + esbuild-linux-riscv64: 0.14.34 + esbuild-linux-s390x: 0.14.34 + esbuild-netbsd-64: 0.14.34 + esbuild-openbsd-64: 0.14.34 + esbuild-sunos-64: 0.14.34 + esbuild-windows-32: 0.14.34 + esbuild-windows-64: 0.14.34 + esbuild-windows-arm64: 0.14.34 dev: false /escalade/3.1.1: @@ -9845,7 +9846,7 @@ packages: engines: {node: '>= 10.17.0'} hasBin: true dependencies: - debug: 4.3.4 + debug: 4.3.3 get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: @@ -9990,7 +9991,7 @@ packages: flat-cache: 3.0.4 dev: true - /file-loader/6.2.0_webpack@5.71.0: + /file-loader/6.2.0_webpack@5.72.0: resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -9998,7 +9999,7 @@ packages: dependencies: loader-utils: 2.0.2 schema-utils: 3.1.1 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /file-uri-to-path/2.0.0: @@ -10177,8 +10178,8 @@ packages: signal-exit: 3.0.7 dev: true - /fork-ts-checker-webpack-plugin/6.5.0_2b5269e92beebd53cbbc8c85f8a0d8d9: - resolution: {integrity: sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==} + /fork-ts-checker-webpack-plugin/6.5.1_6a0113e768db0748a6823124c8b1cb6b: + resolution: {integrity: sha512-x1wumpHOEf4gDROmKTaB6i4/Q6H3LwmjVO7fIX47vBwlZbtPjU33hgoMuD/Q/y6SU8bnuYSoN6ZQOLshGp0T/g==} engines: {node: '>=10', yarn: '>=1.0.0'} peerDependencies: eslint: '>= 6' @@ -10206,7 +10207,7 @@ packages: semver: 7.3.6 tapable: 1.1.3 typescript: 4.4.4 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /form-data/3.0.1: @@ -10870,7 +10871,7 @@ packages: resolution: {integrity: sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==} dev: false - /html-webpack-plugin/5.5.0_webpack@5.71.0: + /html-webpack-plugin/5.5.0_webpack@5.72.0: resolution: {integrity: sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==} engines: {node: '>=10.13.0'} peerDependencies: @@ -10881,7 +10882,7 @@ packages: lodash: 4.17.21 pretty-error: 4.0.0 tapable: 2.2.1 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /htmlparser2/3.10.1: @@ -10898,7 +10899,7 @@ packages: /htmlparser2/6.1.0: resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==} dependencies: - domelementtype: 2.2.0 + domelementtype: 2.3.0 domhandler: 4.3.1 domutils: 2.8.0 entities: 2.2.0 @@ -11592,7 +11593,7 @@ packages: resolution: {integrity: sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==} engines: {node: '>=8'} dependencies: - '@babel/core': 7.17.9 + '@babel/core': 7.17.8 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 semver: 6.3.0 @@ -12086,16 +12087,16 @@ packages: resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/core': 7.17.9 + '@babel/core': 7.17.8 '@babel/generator': 7.17.9 - '@babel/plugin-syntax-typescript': 7.16.7_@babel+core@7.17.9 + '@babel/plugin-syntax-typescript': 7.16.7_@babel+core@7.17.8 '@babel/traverse': 7.17.9 '@babel/types': 7.17.0 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 '@types/babel__traverse': 7.14.2 '@types/prettier': 2.4.4 - babel-preset-current-node-syntax: 1.0.1_@babel+core@7.17.9 + babel-preset-current-node-syntax: 1.0.1_@babel+core@7.17.8 chalk: 4.1.2 expect: 27.5.1 graceful-fs: 4.2.10 @@ -12161,7 +12162,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 17.0.23 + '@types/node': 16.11.26 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -12498,8 +12499,8 @@ packages: dependencies: json-buffer: 3.0.0 - /keyv/4.2.1: - resolution: {integrity: sha512-cAJq5cTfxQdq1DHZEVNpnk4mEvhP+8UP8UQftLtTtJ98beKkRHf+62M0mIDM2u/IWXyP8bmGB375/6uGdSX2MA==} + /keyv/4.2.2: + resolution: {integrity: sha512-uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ==} dependencies: compress-brotli: 1.3.6 json-buffer: 3.0.1 @@ -13036,14 +13037,14 @@ packages: tiny-warning: 1.0.3 dev: false - /mini-css-extract-plugin/2.6.0_webpack@5.71.0: + /mini-css-extract-plugin/2.6.0_webpack@5.72.0: resolution: {integrity: sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w==} engines: {node: '>= 12.13.0'} peerDependencies: webpack: ^5.0.0 dependencies: schema-utils: 4.0.0 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /minimalistic-assert/1.0.1: @@ -14171,7 +14172,7 @@ packages: readable-stream: 3.6.0 rfdc: 1.3.0 secure-json-parse: 2.4.0 - sonic-boom: 2.6.0 + sonic-boom: 2.7.0 strip-json-comments: 3.1.1 dev: false @@ -14195,7 +14196,7 @@ packages: quick-format-unescaped: 4.0.4 real-require: 0.1.0 safe-stable-stringify: 2.3.1 - sonic-boom: 2.6.0 + sonic-boom: 2.7.0 thread-stream: 0.13.2 dev: false @@ -14485,7 +14486,7 @@ packages: postcss-selector-parser: 6.0.10 dev: false - /postcss-loader/6.2.1_postcss@8.4.12+webpack@5.71.0: + /postcss-loader/6.2.1_postcss@8.4.12+webpack@5.72.0: resolution: {integrity: sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -14496,7 +14497,7 @@ packages: klona: 2.0.5 postcss: 8.4.12 semver: 7.3.6 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /postcss-merge-idents/5.1.1_postcss@8.4.12: @@ -15208,7 +15209,7 @@ packages: pure-color: 1.3.0 dev: false - /react-dev-utils/12.0.0_2b5269e92beebd53cbbc8c85f8a0d8d9: + /react-dev-utils/12.0.0_6a0113e768db0748a6823124c8b1cb6b: resolution: {integrity: sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ==} engines: {node: '>=14'} dependencies: @@ -15221,7 +15222,7 @@ packages: escape-string-regexp: 4.0.0 filesize: 8.0.7 find-up: 5.0.0 - fork-ts-checker-webpack-plugin: 6.5.0_2b5269e92beebd53cbbc8c85f8a0d8d9 + fork-ts-checker-webpack-plugin: 6.5.1_6a0113e768db0748a6823124c8b1cb6b global-modules: 2.0.0 globby: 11.1.0 gzip-size: 6.0.0 @@ -15347,7 +15348,7 @@ packages: react-dom: 17.0.2_react@17.0.2 dev: false - /react-loadable-ssr-addon-v5-slorber/1.0.1_fc8cb065053e04bf73bf05d6b2de63ea: + /react-loadable-ssr-addon-v5-slorber/1.0.1_e9a32d0ed12f8f09954f994457231c0d: resolution: {integrity: sha512-lq3Lyw1lGku8zUEJPDxsNm1AfYHBrO9Y1+olAYwpUJ2IGFBskM0DMKok97A6LWUpHm+o7IvQBOWu9MLenp9Z+A==} engines: {node: '>=10.13.0'} peerDependencies: @@ -15356,7 +15357,7 @@ packages: dependencies: '@babel/runtime': 7.17.9 react-loadable: /@docusaurus/react-loadable/5.5.2_react@17.0.2 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /react-p5-wrapper/3.1.0_react-dom@17.0.2+react@17.0.2: @@ -16407,7 +16408,7 @@ packages: engines: {node: '>= 10'} dependencies: agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.3 socks: 2.6.2 transitivePeerDependencies: - supports-color @@ -16420,8 +16421,8 @@ packages: ip: 1.1.5 smart-buffer: 4.2.0 - /sonic-boom/2.6.0: - resolution: {integrity: sha512-6xYZFRmDEtxGqfOKcDQ4cPLrNa0SPEDI+wlzDAHowXE6YV42NeXqg9mP2KkiM8JVu3lHfZ2iQKYlGOz+kTpphg==} + /sonic-boom/2.7.0: + resolution: {integrity: sha512-Ynxp0OGQG91wvDjCbFlRMHbSUmDq7dE/EgDeUJ/j+Q9x1FVkFry20cjLykxRSmlm3QS0B4JYAKE8239XKN4SHQ==} dependencies: atomic-sleep: 1.0.0 dev: false @@ -16988,7 +16989,7 @@ packages: supports-hyperlinks: 2.2.0 dev: true - /terser-webpack-plugin/5.3.1_webpack@5.71.0: + /terser-webpack-plugin/5.3.1_webpack@5.72.0: resolution: {integrity: sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -17009,7 +17010,7 @@ packages: serialize-javascript: 6.0.0 source-map: 0.6.1 terser: 5.12.1 - webpack: 5.71.0 + webpack: 5.72.0 /terser-webpack-plugin/5.3.1_webpack@5.9.0: resolution: {integrity: sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==} @@ -17677,7 +17678,7 @@ packages: dependencies: punycode: 2.1.1 - /url-loader/4.1.1_file-loader@6.2.0+webpack@5.71.0: + /url-loader/4.1.1_file-loader@6.2.0+webpack@5.72.0: resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} engines: {node: '>= 10.13.0'} peerDependencies: @@ -17687,11 +17688,11 @@ packages: file-loader: optional: true dependencies: - file-loader: 6.2.0_webpack@5.71.0 + file-loader: 6.2.0_webpack@5.72.0 loader-utils: 2.0.2 mime-types: 2.1.35 schema-utils: 3.1.1 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /url-parse-lax/3.0.0: @@ -17853,7 +17854,7 @@ packages: stylus: optional: true dependencies: - esbuild: 0.14.32 + esbuild: 0.14.34 postcss: 8.4.12 resolve: 1.22.0 rollup: 2.70.1 @@ -18008,7 +18009,7 @@ packages: - utf-8-validate dev: false - /webpack-dev-middleware/5.3.1_webpack@5.71.0: + /webpack-dev-middleware/5.3.1_webpack@5.72.0: resolution: {integrity: sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==} engines: {node: '>= 12.13.0'} peerDependencies: @@ -18019,10 +18020,10 @@ packages: mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.0.0 - webpack: 5.71.0 + webpack: 5.72.0 dev: false - /webpack-dev-server/4.8.1_webpack@5.71.0: + /webpack-dev-server/4.8.1_webpack@5.72.0: resolution: {integrity: sha512-dwld70gkgNJa33czmcj/PlKY/nOy/BimbrgZRaR9vDATBQAYgLzggR0nxDtPLJiLrMgZwbE6RRfJ5vnBBasTyg==} engines: {node: '>= 12.13.0'} hasBin: true @@ -18060,8 +18061,8 @@ packages: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack: 5.71.0 - webpack-dev-middleware: 5.3.1_webpack@5.71.0 + webpack: 5.72.0 + webpack-dev-middleware: 5.3.1_webpack@5.72.0 ws: 8.5.0 transitivePeerDependencies: - bufferutil @@ -18096,8 +18097,8 @@ packages: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - /webpack/5.71.0: - resolution: {integrity: sha512-g4dFT7CFG8LY0iU5G8nBL6VlkT21Z7dcYDpJAEJV5Q1WLb9UwnFbrem1k7K52ILqEmomN7pnzWFxxE6SlDY56A==} + /webpack/5.72.0: + resolution: {integrity: sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==} engines: {node: '>=10.13.0'} hasBin: true peerDependencies: @@ -18127,7 +18128,7 @@ packages: neo-async: 2.6.2 schema-utils: 3.1.1 tapable: 2.2.1 - terser-webpack-plugin: 5.3.1_webpack@5.71.0 + terser-webpack-plugin: 5.3.1_webpack@5.72.0 watchpack: 2.3.1 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -18175,7 +18176,7 @@ packages: - uglify-js dev: true - /webpackbar/5.0.2_webpack@5.71.0: + /webpackbar/5.0.2_webpack@5.72.0: resolution: {integrity: sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ==} engines: {node: '>=12'} peerDependencies: @@ -18185,7 +18186,7 @@ packages: consola: 2.15.3 pretty-time: 1.1.0 std-env: 3.0.1 - webpack: 5.71.0 + webpack: 5.72.0 dev: false /websocket-driver/0.7.4: diff --git a/src/web/Dockerfile b/src/web/Dockerfile index c6849c9e7f..c83d44d32a 100644 --- a/src/web/Dockerfile +++ b/src/web/Dockerfile @@ -1,8 +1,3 @@ -# NEXT_PUBLIC_API_URL is needed by the next.js build, which we define -# as a build ARG in API_URL. NOTE: if you add or change anything to -# these build args, also update .github/workflows/docker-build-and-push.yml -# and the workflows that call it. -ARG API_URL # API Service URLs, set via ENV in docker or next build ARG IMAGE_URL ARG SSO_URL @@ -46,8 +41,6 @@ FROM base as build-app WORKDIR /app # Copy the various API URLs build args over so next.js can see them in next.config.js -ARG API_URL -ENV NEXT_PUBLIC_API_URL ${API_URL} ARG IMAGE_URL ENV NEXT_PUBLIC_IMAGE_URL ${IMAGE_URL} diff --git a/src/web/app/next.config.js b/src/web/app/next.config.js index d776ecd2b1..ddf7192e63 100644 --- a/src/web/app/next.config.js +++ b/src/web/app/next.config.js @@ -20,7 +20,6 @@ const loadApiUrlFromEnv = (envFile) => dotenv.config({ path: envFile }); // and ./Dockerfile, and need to be kept in sync! const envVarsToForward = [ 'WEB_URL', - 'API_URL', 'IMAGE_URL', 'POSTS_URL', 'SSO_URL', @@ -32,7 +31,7 @@ const envVarsToForward = [ 'ANON_KEY', ]; -// Copy an existing ENV Var so it's visible to next: API_URL -> NEXT_PUBLIC_API_URL +// Copy an existing ENV Var so it's visible to next: WEB_URL -> NEXT_PUBLIC_WEB_URL const forwardToNext = (envVar) => { if (process.env[envVar]) { process.env[`NEXT_PUBLIC_${envVar}`] = process.env[envVar]; diff --git a/src/web/app/src/config.ts b/src/web/app/src/config.ts index a76db9aa9f..455f25d3b2 100644 --- a/src/web/app/src/config.ts +++ b/src/web/app/src/config.ts @@ -1,9 +1,6 @@ // This comes via the top level .env and its API_URL value, // and gets set in next.config.js at build time. -// The URL to use when accessing the Telescope 1.0 backend APIs -const telescopeUrl = process.env.NEXT_PUBLIC_API_URL; - // The URL where our front-end is being hosted. const webUrl = process.env.NEXT_PUBLIC_WEB_URL; @@ -24,30 +21,25 @@ const title = `Telescope`; const description = `A tool for tracking blogs in orbit around Seneca's open source involvement`; const author = `SDDS Students and Professors`; const keywords = `Telescope, Seneca College, Open Source, Programming, Software Development, Blogs, Education, CDOT, SDDS, Students, Professors, Learning, Teaching`; -const image = `${telescopeUrl}/logoImages/apple-splash-1334-750.jpg`; +const image = `/logo.svg`; const imageAlt = `Telescope Logo`; const loginUrl = `${ssoServiceUrl}/login`; const logoutUrl = `${ssoServiceUrl}/logout`; -const userFeedsUrl = `${telescopeUrl}/user/feeds`; -const feedsUrl = `${telescopeUrl}/feeds`; export { title, description, author, - telescopeUrl, webUrl, ssoServiceUrl, + image, imageServiceUrl, supabaseUrl, anonKey, loginUrl, logoutUrl, - userFeedsUrl, - feedsUrl, keywords, - image, imageAlt, postsServiceUrl, searchServiceUrl,