From a4c6efb05e4bb9e9ae8bdb808f8929db393b07f6 Mon Sep 17 00:00:00 2001 From: josemigallas Date: Tue, 25 Apr 2023 17:14:55 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=9A=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .postcssrc.yml | 4 +- app/javascript/packs/change_password.ts | 21 ----- app/javascript/packs/login.scss | 85 ++++++++++--------- app/javascript/packs/login.ts | 13 ++- app/javascript/packs/login_page.ts | 17 ---- app/javascript/packs/request_password_page.ts | 17 ---- app/javascript/packs/sign_up_page.ts | 17 ---- .../components/ChangePassword.tsx | 2 +- .../src/LoginPage/LoginPageWrapper.tsx | 6 +- .../src/LoginPage/RequestPasswordWrapper.tsx | 7 +- .../src/LoginPage/SignupPageWrapper.tsx | 7 +- app/javascript/src/LoginPage/render.tsx | 30 +++++++ .../provider/invitee_signups/show.html.erb | 2 - app/views/provider/passwords/reset.html.slim | 3 +- app/views/provider/passwords/show.html.erb | 2 - app/views/provider/sessions/new.html.slim | 1 - config/webpack/development.js | 3 + config/webpack/environment.js | 47 +++------- package.json | 1 + tsconfig.json | 4 +- yarn.lock | 78 ++++++++++++++++- 21 files changed, 188 insertions(+), 179 deletions(-) delete mode 100644 app/javascript/packs/change_password.ts delete mode 100644 app/javascript/packs/login_page.ts delete mode 100644 app/javascript/packs/request_password_page.ts delete mode 100644 app/javascript/packs/sign_up_page.ts create mode 100644 app/javascript/src/LoginPage/render.tsx diff --git a/.postcssrc.yml b/.postcssrc.yml index a123d1fd22..95fab3ac8d 100644 --- a/.postcssrc.yml +++ b/.postcssrc.yml @@ -1,3 +1,3 @@ plugins: - postcss-smart-import: {} - postcss-cssnext: {} + # postcss-smart-import: {} + # postcss-cssnext: {} diff --git a/app/javascript/packs/change_password.ts b/app/javascript/packs/change_password.ts deleted file mode 100644 index 1952823726..0000000000 --- a/app/javascript/packs/change_password.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { ChangePasswordWrapper } from 'ChangePassword/components/ChangePassword' -import { safeFromJsonString } from 'utilities/json-utils' - -import type { Props } from 'ChangePassword/components/ChangePassword' - -document.addEventListener('DOMContentLoaded', () => { - const containerId = 'pf-login-page-container' - const changePasswordContainer = document.getElementById(containerId) - - if (!changePasswordContainer) { - throw new Error('The target ID was not found: ' + containerId) - } - - const { lostPasswordToken, url, errors } = safeFromJsonString(changePasswordContainer.dataset.changePasswordProps) ?? {} - - ChangePasswordWrapper({ - lostPasswordToken, - url, - errors - }, 'pf-login-page-container') -}) diff --git a/app/javascript/packs/login.scss b/app/javascript/packs/login.scss index 18c39ac53b..18627d43bf 100644 --- a/app/javascript/packs/login.scss +++ b/app/javascript/packs/login.scss @@ -1,45 +1,45 @@ /* As we disabled automatic PF4/React css inline injection */ /* Now we need to add pf4 styles manually */ -// import 'patternflyStyles/pf4Base' -@import '~@patternfly/patternfly/patternfly-variables.css'; -@import '~@patternfly/patternfly/patternfly-shield-noninheritable.css'; -@import '~@patternfly/patternfly/patternfly-shield-inheritable.css'; -@import '~@patternfly/patternfly/patternfly-common.css'; -@import '~@patternfly/patternfly/patternfly-globals.css'; -@import '~@patternfly/patternfly/patternfly-addons.css'; - -@import '~@patternfly/patternfly/components/Page/page.css'; -@import '~@patternfly/patternfly/components/Nav/nav.css'; -@import '~@patternfly/patternfly/components/ContextSelector/context-selector.css'; -@import '~@patternfly/patternfly/layouts/Level/level.css'; -@import '~@patternfly/patternfly/patternfly-fonts.css'; - -/****** HACK ******/ - -/* PF4 font-size is not dynamic, but ours is. -As we are still in a transition where PF4 is not totally implemented, -we are keeping the dinamycally calculated size. -This code must be removed once PF4 is implemented in the whole application */ - -@media screen and (max-width: 979px) { - html { - font-size: 0.65rem!important; - } -} - -@media screen and (min-width: 980px) { - html { - font-size:calc(0.65rem + 0.35 * ((100vw - 50rem) / 50))!important; - } -} - -@media screen and (min-width: 1600px) { - html { - font-size:1rem!important; - } -} -/****** END OF HACK ******/ +// // import 'patternflyStyles/pf4Base' +// @import '~@patternfly/patternfly/patternfly-variables.css'; +// @import '~@patternfly/patternfly/patternfly-shield-noninheritable.css'; +// @import '~@patternfly/patternfly/patternfly-shield-inheritable.css'; +// @import '~@patternfly/patternfly/patternfly-common.css'; +// @import '~@patternfly/patternfly/patternfly-globals.css'; +// @import '~@patternfly/patternfly/patternfly-addons.css'; + +// @import '~@patternfly/patternfly/components/Page/page.css'; +// @import '~@patternfly/patternfly/components/Nav/nav.css'; +// @import '~@patternfly/patternfly/components/ContextSelector/context-selector.css'; +// @import '~@patternfly/patternfly/layouts/Level/level.css'; +// @import '~@patternfly/patternfly/patternfly-fonts.css'; + +// /****** HACK ******/ + +// /* PF4 font-size is not dynamic, but ours is. +// As we are still in a transition where PF4 is not totally implemented, +// we are keeping the dinamycally calculated size. +// This code must be removed once PF4 is implemented in the whole application */ + +// @media screen and (max-width: 979px) { +// html { +// font-size: 0.65rem!important; +// } +// } + +// @media screen and (min-width: 980px) { +// html { +// font-size:calc(0.65rem + 0.35 * ((100vw - 50rem) / 50))!important; +// } +// } + +// @media screen and (min-width: 1600px) { +// html { +// font-size:1rem!important; +// } +// } +// /****** END OF HACK ******/ // import 'patternflyStyles/loginPage' @import '~@patternfly/patternfly/components/Login/login.css'; @@ -86,3 +86,10 @@ $--pf-global--info-color--200: #004368; color: $--pf-global--info-color--200; } } +// // import 'patternflyStyles/loginPage' +// @import '~@patternfly/patternfly/components/Login/login.css'; +// @import '~@patternfly/patternfly/components/BackgroundImage/background-image.css'; +// @import '~@patternfly/patternfly/components/Form/form.css'; +// @import '~@patternfly/patternfly/components/FormControl/form-control.css'; +// @import '~@patternfly/patternfly/components/Title/title.css'; +// @import '~@patternfly/patternfly/components/Button/button.css'; diff --git a/app/javascript/packs/login.ts b/app/javascript/packs/login.ts index 116fa32562..b3aec36555 100644 --- a/app/javascript/packs/login.ts +++ b/app/javascript/packs/login.ts @@ -1 +1,12 @@ -// TODO: move here login_page and sign_up_page packs +import render from 'LoginPage/render' + +document.addEventListener('DOMContentLoaded', () => { + const containerId = 'pf-login-page-container' + const container = document.getElementById(containerId) + + if (!container) { + return + } + + render(container) +}) diff --git a/app/javascript/packs/login_page.ts b/app/javascript/packs/login_page.ts deleted file mode 100644 index 812c0fba49..0000000000 --- a/app/javascript/packs/login_page.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { safeFromJsonString } from 'utilities/json-utils' -import { LoginPageWrapper } from 'LoginPage/LoginPageWrapper' - -import type { Props } from 'LoginPage/LoginPageWrapper' - -document.addEventListener('DOMContentLoaded', () => { - const containerId = 'pf-login-page-container' - const container = document.getElementById(containerId) - - if (!container) { - throw new Error('The target ID was not found: ' + containerId) - } - - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- FIXME - const loginPageProps = safeFromJsonString(container.dataset.loginProps)! - LoginPageWrapper(loginPageProps, containerId) -}) diff --git a/app/javascript/packs/request_password_page.ts b/app/javascript/packs/request_password_page.ts deleted file mode 100644 index d451f04e49..0000000000 --- a/app/javascript/packs/request_password_page.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { RequestPasswordWrapper as RequestPassword } from 'LoginPage/RequestPasswordWrapper' -import { safeFromJsonString } from 'utilities/json-utils' - -import type { Props } from 'LoginPage/RequestPasswordWrapper' - -document.addEventListener('DOMContentLoaded', () => { - const containerId = 'pf-request-page-container' - const container = document.getElementById(containerId) - - if (!container) { - throw new Error('The target ID was not found: ' + containerId) - } - - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- FIXME - const requestPageProps = safeFromJsonString(container.dataset.requestProps)! - RequestPassword(requestPageProps, containerId) -}) diff --git a/app/javascript/packs/sign_up_page.ts b/app/javascript/packs/sign_up_page.ts deleted file mode 100644 index b3bfc4ed37..0000000000 --- a/app/javascript/packs/sign_up_page.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { SignupPageWrapper } from 'LoginPage/SignupPageWrapper' -import { safeFromJsonString } from 'utilities/json-utils' - -import type { Props } from 'LoginPage/SignupPageWrapper' - -document.addEventListener('DOMContentLoaded', () => { - const containerId = 'pf-login-page-container' - const container = document.getElementById(containerId) - - if (!container) { - throw new Error('The target ID was not found: ' + containerId) - } - - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- FIXME - const signupPageProps = safeFromJsonString(container.dataset.signupProps)! - SignupPageWrapper(signupPageProps, 'pf-login-page-container') -}) diff --git a/app/javascript/src/ChangePassword/components/ChangePassword.tsx b/app/javascript/src/ChangePassword/components/ChangePassword.tsx index 561b1bcc16..c686232a0e 100644 --- a/app/javascript/src/ChangePassword/components/ChangePassword.tsx +++ b/app/javascript/src/ChangePassword/components/ChangePassword.tsx @@ -62,7 +62,7 @@ const ChangePassword: FunctionComponent = ({ brandImgSrc={brandImg} loginTitle="Change Password" > - {errors.length && } + {errors.length > 0 && }
{ } } -// eslint-disable-next-line react/jsx-props-no-spreading -const LoginPageWrapper = (props: Props, containerId: string): void => { createReactWrapper(, containerId) } - export type { Props } -export { SimpleLoginPage, LoginPageWrapper } +export { SimpleLoginPage as default } diff --git a/app/javascript/src/LoginPage/RequestPasswordWrapper.tsx b/app/javascript/src/LoginPage/RequestPasswordWrapper.tsx index b811345f75..7fd96c1ce6 100644 --- a/app/javascript/src/LoginPage/RequestPasswordWrapper.tsx +++ b/app/javascript/src/LoginPage/RequestPasswordWrapper.tsx @@ -1,6 +1,5 @@ import { LoginPage } from '@patternfly/react-core' -import { createReactWrapper } from 'utilities/createReactWrapper' import brandImg from 'LoginPage/assets/images/3scale_Logo_Reverse.png' import PF4DownstreamBG from 'LoginPage/assets/images/PF4DownstreamBG.svg' import { FlashMessages } from 'LoginPage/loginForms/FlashMessages' @@ -35,8 +34,6 @@ const RequestPassword: FunctionComponent = ({ ) -// eslint-disable-next-line react/jsx-props-no-spreading -const RequestPasswordWrapper = (props: Props, containerId: string): void => { createReactWrapper(, containerId) } - export type { Props } -export { RequestPassword, RequestPasswordWrapper } +export default RequestPassword +export { RequestPassword } diff --git a/app/javascript/src/LoginPage/SignupPageWrapper.tsx b/app/javascript/src/LoginPage/SignupPageWrapper.tsx index 47986d84eb..5b4b39b67a 100644 --- a/app/javascript/src/LoginPage/SignupPageWrapper.tsx +++ b/app/javascript/src/LoginPage/SignupPageWrapper.tsx @@ -1,6 +1,5 @@ import { LoginPage } from '@patternfly/react-core' -import { createReactWrapper } from 'utilities/createReactWrapper' import brandImg from 'LoginPage/assets/images/3scale_Logo_Reverse.png' import PF4DownstreamBG from 'LoginPage/assets/images/PF4DownstreamBG.svg' import { FlashMessages } from 'LoginPage/loginForms/FlashMessages' @@ -22,8 +21,6 @@ const SignupPage: FunctionComponent = ({ user, name, path }) => ( ) -// eslint-disable-next-line react/jsx-props-no-spreading -const SignupPageWrapper = (props: Props, containerId: string): void => { createReactWrapper(, containerId) } - export type { Props } -export { SignupPage, SignupPageWrapper } +export default SignupPage +export { SignupPage } diff --git a/app/javascript/src/LoginPage/render.tsx b/app/javascript/src/LoginPage/render.tsx new file mode 100644 index 0000000000..9d819bdf12 --- /dev/null +++ b/app/javascript/src/LoginPage/render.tsx @@ -0,0 +1,30 @@ +import { lazy, StrictMode, Suspense } from 'react' +import { render } from 'react-dom' + +/* eslint-disable @typescript-eslint/no-unsafe-return */ +// @ts-expect-error TS2691 +const LoginPage = lazy(() => import('LoginPage/LoginPageWrapper.tsx')) +// @ts-expect-error TS2691 +const RequestPassword = lazy(() => import('LoginPage/RequestPasswordWrapper.tsx')) +// @ts-expect-error TS2691 +const SignupPage = lazy(() => import('LoginPage/SignupPageWrapper.tsx')) +// @ts-expect-error TS2691 +const ChangePassword = lazy(() => import('ChangePassword/components/ChangePassword.tsx')) +/* eslint-enable @typescript-eslint/no-unsafe-return */ + +export default function (container: HTMLElement): void { + const { loginProps, changePasswordProps, signupProps, requestProps } = container.dataset + + render(( + + + {/* eslint-disable react/jsx-props-no-spreading */} + {loginProps && } + {changePasswordProps && } + {signupProps && } + {requestProps && } + {/* eslint-enable react/jsx-props-no-spreading */} + + + ), container) +} diff --git a/app/views/provider/invitee_signups/show.html.erb b/app/views/provider/invitee_signups/show.html.erb index 12a9efa10b..bfa82b0933 100644 --- a/app/views/provider/invitee_signups/show.html.erb +++ b/app/views/provider/invitee_signups/show.html.erb @@ -1,5 +1,3 @@ -<%= javascript_pack_tag 'sign_up_page' %> - <%= tag("div", :id => "pf-login-page-container", :"data-signup-props" => {:path => provider_invitee_signup_path(@invitation.token), :name => @invitation.account.name, :user => { diff --git a/app/views/provider/passwords/reset.html.slim b/app/views/provider/passwords/reset.html.slim index a830cedef8..68358db5f8 100644 --- a/app/views/provider/passwords/reset.html.slim +++ b/app/views/provider/passwords/reset.html.slim @@ -1,7 +1,6 @@ -= javascript_pack_tag 'request_password_page' - authentication_providers = (@authentication_providers || []).map { |ap| {authorizeURL: ap.authorize_url, humanKind: ap.human_kind} } - flash_messages = (flash || []).map { |f| {type: f[0], message: f[1]}} -div#pf-request-page-container data-request-props={flashMessages: flash_messages, +div#pf-login-page-container data-request-props={flashMessages: flash_messages, providerLoginPath: provider_login_path, providerPasswordPath: provider_password_path }.to_json diff --git a/app/views/provider/passwords/show.html.erb b/app/views/provider/passwords/show.html.erb index 8dcd6ebdde..f26c7b2b13 100644 --- a/app/views/provider/passwords/show.html.erb +++ b/app/views/provider/passwords/show.html.erb @@ -1,4 +1,2 @@ -<%= javascript_pack_tag 'change_password' %> - <%= tag :div, id: 'pf-login-page-container', data: { change_password_props: @password_presenter.change_password_props_json } %> diff --git a/app/views/provider/sessions/new.html.slim b/app/views/provider/sessions/new.html.slim index 73ae391dc3..a63a0c7d13 100644 --- a/app/views/provider/sessions/new.html.slim +++ b/app/views/provider/sessions/new.html.slim @@ -1,4 +1,3 @@ -= javascript_pack_tag 'login_page' - authentication_providers = (@authentication_providers || []).map { |ap| {authorizeURL: ap.authorize_url, humanKind: ap.human_kind} } - flash_messages = (flash || []).map { |f| {type: f[0], message: f[1]}} - is_master_account = domain_account.master? diff --git a/config/webpack/development.js b/config/webpack/development.js index cd80c07743..31286615f8 100644 --- a/config/webpack/development.js +++ b/config/webpack/development.js @@ -1,4 +1,5 @@ const environment = require('./environment') +const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer') // Add Webpack custom configs here environment.loaders.append('eslint', { @@ -18,4 +19,6 @@ environment.loaders.append('eslint', { const tsLoader = environment.loaders.get('ts') tsLoader.options.reportFiles = [/!(spec\/javascripts)/] +environment.plugins.append('analyzer', new BundleAnalyzerPlugin()) + module.exports = environment.toWebpackConfig() diff --git a/config/webpack/environment.js b/config/webpack/environment.js index 0f6f4106ec..4dd646211c 100644 --- a/config/webpack/environment.js +++ b/config/webpack/environment.js @@ -3,42 +3,17 @@ const path = require('path') // Add global webpack configs here -environment.loaders.delete('css') -environment.loaders.delete('moduleCss') -environment.loaders.delete('sass') -environment.loaders.delete('moduleSass') - environment.loaders.append('ts', { test: /.(ts|tsx)$/, options: {}, + include: path.resolve(__dirname, '../../app/javascript'), loader: 'ts-loader' }) -environment.loaders.append('null', { - test: /\.css$/, - include: stylesheet => stylesheet.indexOf('@patternfly/react-styles/css/') > -1, - use: ['null-loader'] -}) - -environment.loaders.append('style', { - test: /(\.css|\.scss|\.sass)$/, - use: [ - { loader: 'style-loader' }, - { loader: 'css-loader' }, - { - loader: 'sass-loader', - options: { - modules: true, - localIdentName: '[name]---[local]---[hash:base64:5]' - } - } - ] -}) - environment.loaders.append('yaml', { test: /\.ya?ml$/, use: 'yaml-loader', - include: path.resolve(__dirname, '../../app/javascript'), + include: path.resolve(__dirname, '../../app/javascript/src/QuickStarts/templates'), type: 'json' }) @@ -52,14 +27,14 @@ environment.loaders.append('yaml', { * * https://github.com/3scale/porta/pull/3072 */ -const { output } = environment.config; -const oldPublicPath = output.publicPath -output.publicPath = ''; - -const fileLoader = environment.loaders.get('file'); -Object.assign(fileLoader.use[0].options, { - publicPath: oldPublicPath, - postTransformPublicPath: (p) => `window.rails_asset_host + ${p}` -}); +// const { output } = environment.config; +// const oldPublicPath = output.publicPath +// output.publicPath = ''; + +// const fileLoader = environment.loaders.get('file'); +// Object.assign(fileLoader.use[0].options, { +// publicPath: oldPublicPath, +// postTransformPublicPath: (p) => `window.rails_asset_host + ${p}` +// }); module.exports = environment diff --git a/package.json b/package.json index 71bb80fda5..697b02b6ac 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "ts-loader": "8.4.0", "typescript": "^4.8.4", "webpack": "4.46.0", + "webpack-bundle-analyzer": "^4.8.0", "webpack-cli": "3.3.12", "webpack-dev-server": "3.11.1", "yaml-loader": "^0.6.0" diff --git a/tsconfig.json b/tsconfig.json index ac84f9e9a7..de3f626420 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,7 @@ // Modules "baseUrl": "./app/javascript/src", - "module": "ES6", + "module": "ES2020", "moduleResolution": "NodeNext", "typeRoots": ["app/javascript/src/Types", "./node_modules/@types"], @@ -26,7 +26,5 @@ "app/javascript", "spec/javascripts" ], - "exclude": [ - ], "compileOnSave": false } diff --git a/yarn.lock b/yarn.lock index d08a7b5979..58f2a5867c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1557,6 +1557,11 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== +"@discoveryjs/json-ext@0.5.7": + version "0.5.7" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" + integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== + "@emotion/babel-utils@^0.6.4": version "0.6.10" resolved "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz#83dbf3dfa933fae9fc566e54fbb45f14674c6ccc" @@ -2100,6 +2105,11 @@ resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.44.15.tgz#8eca5b3b03d1c8fd88664ab45f7a7238f9b9b218" integrity sha512-Xp82baZURMISkvpNaWNu3w4cMfc2NIsDYh9K5QpVMQ94vphQrAd54UoO5NQI574+/QY2IPGKWadfvix8324J0Q== +"@polka/url@^1.0.0-next.20": + version "1.0.0-next.21" + resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== + "@rails/webpacker@5.4.4": version "5.4.4" resolved "https://registry.yarnpkg.com/@rails/webpacker/-/webpacker-5.4.4.tgz#971a41b987c096c908ce4088accd57c1a9a7e2f7" @@ -3075,7 +3085,7 @@ acorn-jsx@^5.3.1: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-walk@^8.0.2: +acorn-walk@^8.0.0, acorn-walk@^8.0.2: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -3095,7 +3105,7 @@ acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.1.0, acorn@^8.5.0, acorn@^8.8.1: +acorn@^8.0.4, acorn@^8.1.0, acorn@^8.5.0, acorn@^8.8.1: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -4449,6 +4459,11 @@ commander@^2.19.0, commander@^2.20.0, commander@^2.5.0, commander@^2.7.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + commander@~2.11.0: version "2.11.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563" @@ -5431,6 +5446,11 @@ duplexer2@^0.1.2: dependencies: readable-stream "^2.0.2" +duplexer@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== + duplexify@^3.4.2, duplexify@^3.6.0: version "3.7.1" resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" @@ -6932,6 +6952,13 @@ graphlib@^2.1.8: dependencies: lodash "^4.17.15" +gzip-size@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462" + integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q== + dependencies: + duplexer "^0.1.2" + handle-thing@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" @@ -8906,7 +8933,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== -lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: +lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -9321,6 +9348,11 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" +mrmime@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27" + integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw== + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -9810,6 +9842,11 @@ onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" +opener@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" + integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== + opn@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" @@ -12133,6 +12170,15 @@ simple-swizzle@^0.2.2: dependencies: is-arrayish "^0.3.1" +sirv@^1.0.7: + version "1.0.19" + resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49" + integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ== + dependencies: + "@polka/url" "^1.0.0-next.20" + mrmime "^1.0.0" + totalist "^1.0.0" + sisteransi@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" @@ -12989,6 +13035,11 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +totalist@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" + integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== + touch@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz#ca0b2a3ae3211246a61b16ba9e6cbf1596287164" @@ -13483,6 +13534,22 @@ webpack-assets-manifest@^3.1.1: tapable "^1.0.0" webpack-sources "^1.0.0" +webpack-bundle-analyzer@^4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04" + integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg== + dependencies: + "@discoveryjs/json-ext" "0.5.7" + acorn "^8.0.4" + acorn-walk "^8.0.0" + chalk "^4.1.0" + commander "^7.2.0" + gzip-size "^6.0.0" + lodash "^4.17.20" + opener "^1.5.2" + sirv "^1.0.7" + ws "^7.3.1" + webpack-cli@3.3.12, webpack-cli@^3.3.12: version "3.3.12" resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a" @@ -13742,6 +13809,11 @@ ws@^6.2.1: dependencies: async-limiter "~1.0.0" +ws@^7.3.1: + version "7.5.9" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" + integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== + ws@^8.11.0: version "8.13.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" From d57f48b2ca8ab86a10a4dcfb98e117af5a7812d3 Mon Sep 17 00:00:00 2001 From: josemigallas Date: Wed, 26 Apr 2023 09:38:23 +0200 Subject: [PATCH 2/2] merge master --- app/javascript/packs/login.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/javascript/packs/login.scss b/app/javascript/packs/login.scss index 18627d43bf..8f06ee5d31 100644 --- a/app/javascript/packs/login.scss +++ b/app/javascript/packs/login.scss @@ -86,10 +86,3 @@ $--pf-global--info-color--200: #004368; color: $--pf-global--info-color--200; } } -// // import 'patternflyStyles/loginPage' -// @import '~@patternfly/patternfly/components/Login/login.css'; -// @import '~@patternfly/patternfly/components/BackgroundImage/background-image.css'; -// @import '~@patternfly/patternfly/components/Form/form.css'; -// @import '~@patternfly/patternfly/components/FormControl/form-control.css'; -// @import '~@patternfly/patternfly/components/Title/title.css'; -// @import '~@patternfly/patternfly/components/Button/button.css';