Merge remote-tracking branch 'origin/develop' into storybook

This commit is contained in:
Alex Gleason 2023-02-02 20:10:44 -06:00
commit accba58da1
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
4 changed files with 218 additions and 949 deletions

View file

@ -149,9 +149,9 @@ pages:
docker:
stage: deploy
image: docker:20.10.23
image: docker:23.0.0
services:
- docker:20.10.23-dind
- docker:23.0.0-dind
tags:
- dind
# https://medium.com/devops-with-valentine/how-to-build-a-docker-image-and-push-it-to-the-gitlab-container-registry-from-a-gitlab-ci-pipeline-acac0d1f26df

View file

@ -15,9 +15,6 @@ module.exports = (api) => {
['@babel/env', envOptions],
],
plugins: [
'@babel/syntax-dynamic-import',
['@babel/proposal-object-rest-spread', { useBuiltIns: true }],
'@babel/proposal-class-properties',
['react-intl', { messagesDir: './build/messages/' }],
'preval',
],
@ -27,7 +24,6 @@ module.exports = (api) => {
switch (env) {
case 'production':
config.plugins.push(...[
'lodash',
'@babel/transform-react-inline-elements',
[
'@babel/transform-runtime',
@ -39,12 +35,6 @@ module.exports = (api) => {
],
]);
break;
case 'development':
config.plugins.push(...[
'@babel/transform-react-jsx-source',
'@babel/transform-react-jsx-self',
]);
break;
case 'test':
config.plugins.push(...[
'transform-require-context',

View file

@ -39,18 +39,13 @@
"not dead"
],
"dependencies": {
"@babel/core": "^7.18.2",
"@babel/plugin-proposal-class-properties": "^7.17.12",
"@babel/plugin-proposal-object-rest-spread": "^7.18.0",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-react-inline-elements": "^7.16.7",
"@babel/plugin-transform-react-jsx-self": "^7.17.12",
"@babel/plugin-transform-react-jsx-source": "^7.16.7",
"@babel/plugin-transform-runtime": "^7.18.2",
"@babel/preset-env": "^7.18.2",
"@babel/preset-react": "^7.17.12",
"@babel/preset-typescript": "^7.17.12",
"@babel/runtime": "^7.18.3",
"@babel/core": "^7.20.12",
"@babel/plugin-transform-react-inline-elements": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.19.6",
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@babel/runtime": "^7.20.13",
"@fontsource/inter": "^4.5.1",
"@fontsource/roboto-mono": "^4.5.8",
"@gamestdio/websocket": "^0.3.2",
@ -102,10 +97,8 @@
"axios": "^1.2.2",
"axios-mock-adapter": "^1.21.1",
"babel-loader": "^9.0.0",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^5.1.0",
"babel-plugin-react-intl": "^7.5.20",
"babel-plugin-transform-require-context": "^0.1.1",
"blurhash": "^2.0.0",
"bootstrap-icons": "^1.5.0",
"bowser": "^2.11.0",
@ -216,7 +209,8 @@
"@testing-library/user-event": "^14.0.3",
"@typescript-eslint/eslint-plugin": "^5.15.0",
"@typescript-eslint/parser": "^5.15.0",
"babel-jest": "^29.0.0",
"babel-jest": "^29.4.1",
"babel-plugin-transform-require-context": "^0.1.1",
"cross-env": "^7.0.3",
"danger": "^11.0.7",
"eslint": "^8.0.0",

1129
yarn.lock

File diff suppressed because it is too large Load diff