From 1b990b4a65b1af95314131658a582223e8513f8b Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sun, 7 Aug 2022 21:28:09 +0400 Subject: [PATCH 01/89] Use Vite as a frontend runner --- .gitignore | 8 + Gemfile | 2 + Gemfile.lock | 9 + Procfile.dev | 3 + .../behaviors/markdown/copy_as_gfm.js | 2 +- app/assets/javascripts/commons/vue.js | 2 +- app/assets/javascripts/dompurify.js | 6 + .../extensions/source_editor_webide_ext.js | 2 +- .../javascripts/entries/jira_connect_app.js | 1 + app/assets/javascripts/entries/main.js | 1 + .../javascripts/entries/performance_bar.js | 1 + .../javascripts/entries/redirect_listbox.js | 1 + .../javascripts/entries/sandboxed_mermaid.js | 1 + app/assets/javascripts/entries/sentry.js | 1 + app/assets/javascripts/ide/lib/editor.js | 2 +- app/assets/javascripts/lib/utils/poll.js | 2 +- app/assets/javascripts/lib/utils/webpack.js | 2 +- .../javascripts/locale/ensure_single_line.cjs | 6 +- app/assets/javascripts/main.js | 4 +- app/assets/javascripts/sentry/index.js | 2 +- app/assets/javascripts/sourcegraph/index.js | 2 +- .../components/lib/utils/props_utils.js | 2 +- .../vue_shared/directives/validation.js | 2 +- app/assets/javascripts/webpack.js | 6 +- app/assets/stylesheets/application.scss | 8 +- app/assets/stylesheets/components/index.sass | 18 ++ .../stylesheets/framework/dropdowns.scss | 2 +- app/assets/stylesheets/framework/files.scss | 2 +- .../stylesheets/framework/source_editor.scss | 2 +- app/assets/stylesheets/highlight/common.scss | 2 +- app/assets/stylesheets/pages/notes.scss | 6 +- app/helpers/application_helper.rb | 6 +- app/helpers/javascript_helper.rb | 0 app/helpers/webpack_helper.rb | 19 +- app/views/layouts/_head.html.haml | 10 +- app/views/layouts/_loading_hints.html.haml | 10 +- app/views/layouts/_mailer.html.haml | 2 +- app/views/layouts/component_preview.html.haml | 8 +- app/views/layouts/notify.html.haml | 4 +- app/views/layouts/service_desk.html.haml | 4 +- app/views/notify/_note_email.html.haml | 2 +- app/views/notify/new_review_email.html.haml | 2 +- .../notify/repository_push_email.html.haml | 2 +- app/views/profiles/preferences/show.html.haml | 2 +- bin/vite | 27 ++ .../initializers/content_security_policy.rb | 1 + config/vite.json | 24 ++ package.json | 81 ++--- vite.config.ts | 86 ++++++ yarn.lock | 290 +++++++++++++++++- 50 files changed, 590 insertions(+), 100 deletions(-) create mode 100644 Procfile.dev create mode 100644 app/assets/javascripts/dompurify.js create mode 100644 app/assets/javascripts/entries/jira_connect_app.js create mode 100644 app/assets/javascripts/entries/main.js create mode 100644 app/assets/javascripts/entries/performance_bar.js create mode 100644 app/assets/javascripts/entries/redirect_listbox.js create mode 100644 app/assets/javascripts/entries/sandboxed_mermaid.js create mode 100644 app/assets/javascripts/entries/sentry.js create mode 100644 app/assets/stylesheets/components/index.sass create mode 100644 app/helpers/javascript_helper.rb create mode 100755 bin/vite create mode 100644 config/vite.json create mode 100644 vite.config.ts diff --git a/.gitignore b/.gitignore index 1dd9f4ef8aa2b6..218ceaf40df875 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,11 @@ tags.lock tags.temp .stylelintcache .solargraph.yml + +# Vite Ruby +/public/vite* +node_modules +# Vite uses dotenv and suggests to ignore local-only env files. See +# https://vitejs.dev/guide/env-and-mode.html#env-files +*.local + diff --git a/Gemfile b/Gemfile index 3660b31d27d23b..90ad441f5e89f9 100644 --- a/Gemfile +++ b/Gemfile @@ -15,6 +15,8 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 gem 'rails', '~> 6.1.7.2' +gem 'vite_rails' + gem 'bootsnap', '~> 1.16.0', require: false # Pin openssl to match the version bundled with our supported Rubies. diff --git a/Gemfile.lock b/Gemfile.lock index deec0b5c88d635..2a2aad2a67a848 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -380,6 +380,7 @@ GEM doorkeeper (>= 5.5, < 5.7) json-jwt (>= 1.15.0) dotenv (2.7.6) + dry-cli (0.7.0) dry-configurable (0.12.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5.0) @@ -1546,6 +1547,13 @@ GEM activesupport (>= 5.0.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) + vite_rails (3.0.10) + railties (>= 5.1, < 8) + vite_ruby (~> 3.0) + vite_ruby (3.2.0) + dry-cli (~> 0.7.0) + rack-proxy (~> 0.6, >= 0.6.1) + zeitwerk (~> 2.2) vmstat (2.3.0) warden (1.2.9) rack (>= 2.0.9) @@ -1888,6 +1896,7 @@ DEPENDENCIES validates_hostname (~> 1.0.11) version_sorter (~> 2.3) view_component (~> 2.74.1) + vite_rails vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 2.3) diff --git a/Procfile.dev b/Procfile.dev new file mode 100644 index 00000000000000..1acf605c346448 --- /dev/null +++ b/Procfile.dev @@ -0,0 +1,3 @@ + +vite: bin/vite dev +web: bin/rails s diff --git a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js index 19ebab36481cc9..8ebd27cb10a60c 100644 --- a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js +++ b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js @@ -189,7 +189,7 @@ export class CopyAsGFM { // Export CopyAsGFM as a global for rspec to access // see /spec/features/markdown/copy_as_gfm_spec.rb -if (process.env.NODE_ENV !== 'production') { +if (import.meta.env.NODE_ENV !== 'production') { window.CopyAsGFM = CopyAsGFM; } diff --git a/app/assets/javascripts/commons/vue.js b/app/assets/javascripts/commons/vue.js index cd24a503631352..09aeece6bfefb8 100644 --- a/app/assets/javascripts/commons/vue.js +++ b/app/assets/javascripts/commons/vue.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import GlFeatureFlagsPlugin from '~/vue_shared/gl_feature_flags_plugin'; import Translate from '~/vue_shared/translate'; -if (process.env.NODE_ENV !== 'production') { +if (import.meta.env.NODE_ENV !== 'production') { Vue.config.productionTip = false; } diff --git a/app/assets/javascripts/dompurify.js b/app/assets/javascripts/dompurify.js new file mode 100644 index 00000000000000..7a26e5d14d6374 --- /dev/null +++ b/app/assets/javascripts/dompurify.js @@ -0,0 +1,6 @@ +// eslint-disable-next-line +import DOMPurify from '../../../node_modules/dompurify/dist/purify.es.js'; + +const { sanitize, addHook } = DOMPurify; + +export { sanitize, addHook }; diff --git a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js index 6270517b3f3ca9..bfc05583d406c4 100644 --- a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js +++ b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js @@ -101,7 +101,7 @@ export class EditorWebIdeExtension { try { this.disposable.dispose(); } catch (e) { - if (process.env.NODE_ENV !== 'test') { + if (import.meta.env.NODE_ENV !== 'test') { // eslint-disable-next-line no-console console.error(e); } diff --git a/app/assets/javascripts/entries/jira_connect_app.js b/app/assets/javascripts/entries/jira_connect_app.js new file mode 100644 index 00000000000000..8647dd6e5b0caf --- /dev/null +++ b/app/assets/javascripts/entries/jira_connect_app.js @@ -0,0 +1 @@ +export * from '../jira_connect/subscriptions/index.js'; diff --git a/app/assets/javascripts/entries/main.js b/app/assets/javascripts/entries/main.js new file mode 100644 index 00000000000000..3b3efd44ef7f69 --- /dev/null +++ b/app/assets/javascripts/entries/main.js @@ -0,0 +1 @@ +import '../main.js'; diff --git a/app/assets/javascripts/entries/performance_bar.js b/app/assets/javascripts/entries/performance_bar.js new file mode 100644 index 00000000000000..6aa39ed0887ef9 --- /dev/null +++ b/app/assets/javascripts/entries/performance_bar.js @@ -0,0 +1 @@ +export { default } from '../performance_bar/index.js'; diff --git a/app/assets/javascripts/entries/redirect_listbox.js b/app/assets/javascripts/entries/redirect_listbox.js new file mode 100644 index 00000000000000..6a57302cb69f4c --- /dev/null +++ b/app/assets/javascripts/entries/redirect_listbox.js @@ -0,0 +1 @@ +import '../entrypoints/behaviors/redirect_listbox.js'; diff --git a/app/assets/javascripts/entries/sandboxed_mermaid.js b/app/assets/javascripts/entries/sandboxed_mermaid.js new file mode 100644 index 00000000000000..7d2520ffc01e29 --- /dev/null +++ b/app/assets/javascripts/entries/sandboxed_mermaid.js @@ -0,0 +1 @@ +export { default } from '../lib/mermaid.js'; diff --git a/app/assets/javascripts/entries/sentry.js b/app/assets/javascripts/entries/sentry.js new file mode 100644 index 00000000000000..179994e7497c19 --- /dev/null +++ b/app/assets/javascripts/entries/sentry.js @@ -0,0 +1 @@ +export { default } from '../sentry/index.js'; diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js index 80191f635a3aef..e4dd2a4ef16df2 100644 --- a/app/assets/javascripts/ide/lib/editor.js +++ b/app/assets/javascripts/ide/lib/editor.js @@ -149,7 +149,7 @@ export default class Editor { } catch (e) { this.instance = null; - if (process.env.NODE_ENV !== 'test') { + if (import.meta.env.NODE_ENV !== 'test') { // eslint-disable-next-line no-console console.error(e); } diff --git a/app/assets/javascripts/lib/utils/poll.js b/app/assets/javascripts/lib/utils/poll.js index 73add1e37ee69a..30db5a075c6614 100644 --- a/app/assets/javascripts/lib/utils/poll.js +++ b/app/assets/javascripts/lib/utils/poll.js @@ -91,7 +91,7 @@ export default class Poll { // So we don't make our specs artificially slower this.timeoutID = setTimeout( () => this.makeRequest(), - process.env.NODE_ENV !== 'test' ? delay : 1, + import.meta.env.NODE_ENV !== 'test' ? delay : 1, ); } diff --git a/app/assets/javascripts/lib/utils/webpack.js b/app/assets/javascripts/lib/utils/webpack.js index 38d2f3d75512ed..52409687ccb34a 100644 --- a/app/assets/javascripts/lib/utils/webpack.js +++ b/app/assets/javascripts/lib/utils/webpack.js @@ -10,5 +10,5 @@ export function resetServiceWorkersPublicPath() { // see: https://webpack.js.org/guides/public-path/ const relativeRootPath = (gon && gon.relative_url_root) || ''; const webpackAssetPath = joinPaths(relativeRootPath, '/assets/webpack/'); - __webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase + // __webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase } diff --git a/app/assets/javascripts/locale/ensure_single_line.cjs b/app/assets/javascripts/locale/ensure_single_line.cjs index c2c637770016d7..d9f732d9254eca 100644 --- a/app/assets/javascripts/locale/ensure_single_line.cjs +++ b/app/assets/javascripts/locale/ensure_single_line.cjs @@ -13,7 +13,7 @@ const SPLIT_REGEX = /\s*[\r\n]+\s*/; * @param {String} str * @returns {String} */ -module.exports = function ensureSingleLine(str) { +function ensureSingleLine(str) { // This guard makes the function significantly faster if (str.includes('\n') || str.includes('\r')) { return str @@ -22,4 +22,6 @@ module.exports = function ensureSingleLine(str) { .join(' '); } return str; -}; +} + +export default ensureSingleLine; diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 4c715c4993ff0e..eecefe5ef3eea3 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -3,7 +3,7 @@ import jQuery from 'jquery'; // bootstrap webpack, common libs, polyfills, and behaviors -import './webpack'; +// import './webpack'; import './commons'; import './behaviors'; @@ -54,7 +54,7 @@ window.$ = jQuery; window.gl = window.gl || {}; // inject test utilities if necessary -if (process.env.NODE_ENV !== 'production' && gon?.test_env) { +if (import.meta.env.NODE_ENV !== 'production' && gon?.test_env) { import(/* webpackMode: "eager" */ './test_utils'); } diff --git a/app/assets/javascripts/sentry/index.js b/app/assets/javascripts/sentry/index.js index 5539a061726b7c..eb527686f04499 100644 --- a/app/assets/javascripts/sentry/index.js +++ b/app/assets/javascripts/sentry/index.js @@ -10,7 +10,7 @@ const index = function index() { environment: gon.sentry_environment, currentUserId: gon.current_user_id, allowUrls: - process.env.NODE_ENV === 'production' + import.meta.env.NODE_ENV === 'production' ? [gon.gitlab_url] : [gon.gitlab_url, 'webpack-internal://'], release: gon.revision, diff --git a/app/assets/javascripts/sourcegraph/index.js b/app/assets/javascripts/sourcegraph/index.js index 487a565b1526e7..0fde68c330a5d7 100644 --- a/app/assets/javascripts/sourcegraph/index.js +++ b/app/assets/javascripts/sourcegraph/index.js @@ -17,7 +17,7 @@ export default function initSourcegraph() { return; } - const assetsUrl = new URL(process.env.SOURCEGRAPH_PUBLIC_PATH, window.location.href); + const assetsUrl = new URL(import.meta.env.SOURCEGRAPH_PUBLIC_PATH, window.location.href); const scriptPath = new URL('scripts/integration.bundle.js', assetsUrl).href; window.SOURCEGRAPH_ASSETS_URL = assetsUrl.href; diff --git a/app/assets/javascripts/vue_shared/components/lib/utils/props_utils.js b/app/assets/javascripts/vue_shared/components/lib/utils/props_utils.js index b115b1fb34ba4f..f38c24a782686a 100644 --- a/app/assets/javascripts/vue_shared/components/lib/utils/props_utils.js +++ b/app/assets/javascripts/vue_shared/components/lib/utils/props_utils.js @@ -12,7 +12,7 @@ export const propsUnion = (components) => components.reduce((acc, component) => { Object.entries(component.props ?? {}).forEach(([propName, propOptions]) => { - if (process.env.NODE_ENV !== 'production') { + if (import.meta.env.NODE_ENV !== 'production') { if (typeof propOptions !== 'object' || !('type' in propOptions)) { throw new Error( `Cannot create props union: expected verbose prop options for prop "${propName}"`, diff --git a/app/assets/javascripts/vue_shared/directives/validation.js b/app/assets/javascripts/vue_shared/directives/validation.js index fc0ff78e7b4a5b..94592aecca4ad6 100644 --- a/app/assets/javascripts/vue_shared/directives/validation.js +++ b/app/assets/javascripts/vue_shared/directives/validation.js @@ -50,7 +50,7 @@ const createValidator = (context, feedbackMap) => ({ el, reportInvalidInput = fa const { name } = el; if (!name) { - if (process.env.NODE_ENV === 'development') { + if (import.meta.env.NODE_ENV === 'development') { // eslint-disable-next-line no-console console.warn( '[gitlab] the validation directive requires the given input to have "name" attribute', diff --git a/app/assets/javascripts/webpack.js b/app/assets/javascripts/webpack.js index 1c6e632135d5f5..f06d6b01e3dd12 100644 --- a/app/assets/javascripts/webpack.js +++ b/app/assets/javascripts/webpack.js @@ -7,6 +7,6 @@ * e.g. the `window` scope, because it needs to be executed in the scope of webpack. */ -if (gon && gon.webpack_public_path) { - __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line camelcase -} +// if (gon && gon.webpack_public_path) { +// __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line camelcase +// } diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 40228b93e01b5f..f912d858332b20 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -13,19 +13,19 @@ @import 'page_specific_files'; // Component specific styles, will be moved to gitlab-ui -@import 'components/**/*'; +@import './components/index.sass'; // Vendors specific styles -@import 'vendors/**/*'; +@import './vendors/atwho.scss'; // Styles for JS behaviors. @import 'behaviors'; // EE-only stylesheets -@import 'application_ee'; +//@import 'application_ee'; // JH-only stylesheets -@import 'application_jh'; +//@import 'application_jh'; /* print styles */ @media print { diff --git a/app/assets/stylesheets/components/index.sass b/app/assets/stylesheets/components/index.sass new file mode 100644 index 00000000000000..bba9ac16374e2a --- /dev/null +++ b/app/assets/stylesheets/components/index.sass @@ -0,0 +1,18 @@ +@import './avatar' +@import './collapsible_card' +@import './content_editor' +@import './dashboard_skeleton' +@import './date_time_picker' +@import './deployment_instance' +@import './feature_highlight' +@import './milestone_combobox' +@import './ref_selector' +@import './related_items_list' +@import './release_block' +@import './release_block_milestone_info' +@import './whats_new' +@import './batch_comments/review_bar' +@import './design_management/design' +@import './design_management/design_list_item' +@import './severity/icons' +@import './upload_dropzone/upload_dropzone' diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index ebb9466eb158a5..41e20d57acd7e6 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -545,7 +545,7 @@ left: 1rem; width: 1rem; height: 1rem; - mask-image: asset_url('icons-stacked.svg#check'); + mask-image: url('icons-stacked.svg#check'); mask-repeat: no-repeat; mask-size: cover; mask-position: center center; diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 06c5b26f39b76c..705f1c8afdbb14 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -537,7 +537,7 @@ span.idiff { @include gl-h-5; @include gl-float-left; background-color: $gray-400; - mask-image: asset_url('icons-stacked.svg#doc-versions'); + mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#doc-versions'); mask-repeat: no-repeat; mask-size: cover; mask-position: center; diff --git a/app/assets/stylesheets/framework/source_editor.scss b/app/assets/stylesheets/framework/source_editor.scss index 046b8636f65b6a..24b2e2e85e1090 100644 --- a/app/assets/stylesheets/framework/source_editor.scss +++ b/app/assets/stylesheets/framework/source_editor.scss @@ -54,7 +54,7 @@ @include gl-mr-2; @include gl-w-4; @include gl-h-4; - mask-image: asset_url('icons-stacked.svg#link'); + mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#link'); mask-repeat: no-repeat; mask-size: cover; mask-position: center; diff --git a/app/assets/stylesheets/highlight/common.scss b/app/assets/stylesheets/highlight/common.scss index 96df8487c0efd4..106be43e15dd62 100644 --- a/app/assets/stylesheets/highlight/common.scss +++ b/app/assets/stylesheets/highlight/common.scss @@ -107,7 +107,7 @@ @include gl-w-5; @include gl-h-5; background-color: rgba($color, 0.3); - mask-image: asset_url('icons-stacked.svg##{$icon}'); + mask-image: url('@gitlab/svgs/dist/icons-stacked.svg##{$icon}'); mask-repeat: no-repeat; mask-size: cover; mask-position: center; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 567f24be3361d7..ca7cea3a346eb2 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -984,9 +984,13 @@ $system-note-svg-size: 1rem; .unified-diff-components-diff-note-button { &::before { background-color: $blue-500; - mask-image: asset_url('icons-stacked.svg#comment'); + -webkit-mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#comment'); + mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#comment'); + -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; + -webkit-mask-size: cover; mask-size: cover; + -webkit-mask-position: center; mask-position: center; content: ''; width: 12px; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 93b7c8c0b94649..09d46f44251a89 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -274,9 +274,9 @@ def page_filter_path(options = {}) def stylesheet_link_tag_defer(path) if startup_css_enabled? - stylesheet_link_tag(path, media: "print", crossorigin: ActionController::Base.asset_host ? 'anonymous' : nil) + vite_stylesheet_tag(path, media: "print", crossorigin: ActionController::Base.asset_host ? 'anonymous' : nil) else - stylesheet_link_tag(path, crossorigin: ActionController::Base.asset_host ? 'anonymous' : nil) + vite_stylesheet_tag(path, crossorigin: ActionController::Base.asset_host ? 'anonymous' : nil) end end @@ -401,7 +401,7 @@ def add_page_specific_style(path, defer: true) if defer stylesheet_link_tag_defer path else - stylesheet_link_tag path + vite_stylesheet_tag path end end end diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb new file mode 100644 index 00000000000000..e69de29bb2d1d6 diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb index ba3c232bec418f..14c4998a03a64f 100644 --- a/app/helpers/webpack_helper.rb +++ b/app/helpers/webpack_helper.rb @@ -13,8 +13,12 @@ def prefetch_link_tag(source) link_tag end + def vite_stylesheet_tag(path, *args) + super("stylesheets/#{path}.scss", *args) + end + def webpack_bundle_tag(bundle) - javascript_include_tag(*webpack_entrypoint_paths(bundle)) + vite_javascript_tag bundle end def webpack_preload_asset_tag(asset, options = {}) @@ -43,20 +47,17 @@ def webpack_controller_bundle_tags route = [*controller.controller_path.split('/'), action].compact until chunks.any? || route.empty? - entrypoint = "pages.#{route.join('.')}" + entrypoint = "javascripts/pages/#{route.join('/')}/index.js" begin - chunks = webpack_entrypoint_paths(entrypoint, extension: 'js') - rescue Gitlab::Webpack::Manifest::AssetMissingError + chunks.push entrypoint + vite_asset_path(entrypoint) ? nil : chunks.pop + rescue # no bundle exists for this path end route.pop end - if chunks.empty? - chunks = webpack_entrypoint_paths("default", extension: 'js') - end - - javascript_include_tag(*chunks) + vite_javascript_tag(*chunks) end def webpack_entrypoint_paths(source, extension: nil, exclude_duplicates: true) diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index dd441d0d1556b7..cb7a0f7d572eb9 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -9,6 +9,8 @@ %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge' } + = vite_client_tag + = render 'layouts/startup_js' - if page_canonical_link @@ -34,8 +36,8 @@ = stylesheet_link_tag_defer "application" = yield :page_specific_styles = stylesheet_link_tag_defer 'application_utilities' - = stylesheet_link_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations'] - = stylesheet_link_tag "test_environment", media: "all" if Rails.env.test? + = vite_stylesheet_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations'] + = vite_stylesheet_tag "test_environment", media: "all" if Rails.env.test? = stylesheet_link_tag_defer "fonts" @@ -44,7 +46,7 @@ - if startup_css_enabled? = render 'layouts/startup_css_activation' - = stylesheet_link_tag 'performance_bar' if performance_bar_enabled? + = vite_stylesheet_tag 'performance_bar' if performance_bar_enabled? = Gon::Base.render_data(nonce: content_security_policy_nonce) @@ -55,6 +57,8 @@ = webpack_bundle_tag 'legacy_sentry' = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? + = vite_javascript_tag "main" + = yield :page_specific_javascripts = webpack_controller_bundle_tags diff --git a/app/views/layouts/_loading_hints.html.haml b/app/views/layouts/_loading_hints.html.haml index 9026bec84c3ec9..42a32978454408 100644 --- a/app/views/layouts/_loading_hints.html.haml +++ b/app/views/layouts/_loading_hints.html.haml @@ -5,12 +5,12 @@ %link{ rel: 'dns-prefetch', href: ActionController::Base.asset_host } %link{ rel: 'preconnect', href: ActionController::Base.asset_host, crossorigin: '' } - if user_application_theme == 'gl-dark' - = preload_link_tag(path_to_stylesheet('application_utilities_dark'), crossorigin: css_crossorigin) - = preload_link_tag(path_to_stylesheet('application_dark'), crossorigin: css_crossorigin) + = preload_link_tag(vite_asset_url('stylesheets/application_utilities_dark.scss'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(vite_asset_url('stylesheets/application_dark.scss'), crossorigin: css_crossorigin, as: "style") - else - = preload_link_tag(path_to_stylesheet('application_utilities'), crossorigin: css_crossorigin) - = preload_link_tag(path_to_stylesheet('application'), crossorigin: css_crossorigin) - = preload_link_tag(path_to_stylesheet("highlight/themes/#{user_color_scheme}"), crossorigin: css_crossorigin) + = preload_link_tag(vite_asset_url('stylesheets/application_utilities.scss'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(vite_asset_url('stylesheets/application.scss'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(vite_asset_url("stylesheets/highlight/themes/#{user_color_scheme}.scss"), crossorigin: css_crossorigin, as: "style") - if Gitlab::Tracking.enabled? && Gitlab::Tracking.collector_hostname %link{ rel: 'preconnect', href: "https://#{Gitlab::Tracking.collector_hostname}", crossorigin: '' } -# Do not use preload_link_tag for fonts, to work around Firefox double-fetch bug. diff --git a/app/views/layouts/_mailer.html.haml b/app/views/layouts/_mailer.html.haml index 95ebe09a2e62a1..f754225a9ad235 100644 --- a/app/views/layouts/_mailer.html.haml +++ b/app/views/layouts/_mailer.html.haml @@ -12,7 +12,7 @@ %style{ type: 'text/css', 'data-premailer': 'ignore' } = asset_to_string('mailer_client_specific.css').html_safe - = stylesheet_link_tag 'mailer.css' + = vite_stylesheet_tag 'mailer' %body = yield :preview_text %table#body{ border: "0", cellpadding: "0", cellspacing: "0" } diff --git a/app/views/layouts/component_preview.html.haml b/app/views/layouts/component_preview.html.haml index a1b1304f994029..d9e9d9443faa23 100644 --- a/app/views/layouts/component_preview.html.haml +++ b/app/views/layouts/component_preview.html.haml @@ -1,10 +1,10 @@ %head - if params[:lookbook][:display][:theme] == 'light' - = stylesheet_link_tag "application" - = stylesheet_link_tag "application_utilities" + = vite_stylesheet_tag "application" + = vite_stylesheet_tag "application_utilities" - else - = stylesheet_link_tag "application_dark" - = stylesheet_link_tag "application_utilities_dark" + = vite_stylesheet_tag "application_dark" + = vite_stylesheet_tag "application_utilities_dark" %body .container.gl-mt-6 - if params[:lookbook][:display][:bg_dark] diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index c557dc365341df..a05f12c43d6c87 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -4,13 +4,13 @@ %title GitLab - if Feature.enabled?(:enhanced_notify_css) - = stylesheet_link_tag 'notify_enhanced' + = vite_stylesheet_tag 'notify_enhanced' %style{ type: 'text/css', 'data-premailer': 'ignore' } -# The MUA automatically turns some text into links. -# Match the color of explicit links ($blue-600 from typography.scss). a { color: #1068bf; } - else - = stylesheet_link_tag 'notify' + = vite_stylesheet_tag 'notify' = yield :head %body .content diff --git a/app/views/layouts/service_desk.html.haml b/app/views/layouts/service_desk.html.haml index 7ac108e7f31e81..23c88403ea9159 100644 --- a/app/views/layouts/service_desk.html.haml +++ b/app/views/layouts/service_desk.html.haml @@ -6,13 +6,13 @@ GitLab -# haml-lint:enable NoPlainNodes - if Feature.enabled?(:enhanced_notify_css) - = stylesheet_link_tag 'notify_enhanced' + = vite_stylesheet_tag 'notify_enhanced' %style{ type: 'text/css', 'data-premailer': 'ignore' } -# The MUA automatically turns some text into links. -# Match the color of explicit links ($blue-600 from typography.scss). a { color: #1068bf; } - else - = stylesheet_link_tag 'notify' + = vite_stylesheet_tag 'notify' = yield :head %body = html_header_message diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml index 2f0e62981eced4..bb217154c1b6be 100644 --- a/app/views/notify/_note_email.html.haml +++ b/app/views/notify/_note_email.html.haml @@ -26,7 +26,7 @@ - if discussion&.diff_discussion? && discussion.on_text? - if include_stylesheet_link = content_for :head do - = stylesheet_link_tag 'mailers/highlighted_diff_email' + = vite_stylesheet_tag 'mailers/highlighted_diff_email' %table.code.gl-mb-5 = render partial: "projects/diffs/email_line", diff --git a/app/views/notify/new_review_email.html.haml b/app/views/notify/new_review_email.html.haml index afc1bd682156ba..149c3c08c04e58 100644 --- a/app/views/notify/new_review_email.html.haml +++ b/app/views/notify/new_review_email.html.haml @@ -1,6 +1,6 @@ - if @include_diff_discussion_stylesheet = content_for :head do - = stylesheet_link_tag 'mailers/highlighted_diff_email' + = vite_stylesheet_tag 'mailers/highlighted_diff_email' %table{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;margin:0 auto;border-collapse:separate;border-spacing:0;" } %tbody diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml index d493f9d5d9839a..adc651d0b346b0 100644 --- a/app/views/notify/repository_push_email.html.haml +++ b/app/views/notify/repository_push_email.html.haml @@ -1,5 +1,5 @@ = content_for :head do - = stylesheet_link_tag 'mailers/highlighted_diff_email' + = vite_stylesheet_tag 'mailers/highlighted_diff_email' %h3 = s_('Notify|%{author_name} %{action_name} %{ref_type} %{ref_name} at %{project_link}').html_safe % {author_name: @message.author_name, action_name: @message.action_name, ref_type: @message.ref_type, ref_name: @message.ref_name, project_link: link_to(@message.project_name_with_namespace, strip_tags(project_url(@message.project)))} diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index b10d05efc4f09e..be3553b5904829 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -8,7 +8,7 @@ - data_attributes = { themes: @themes, integration_views: integration_views.to_json, user_fields: user_fields, body_classes: Gitlab::Themes.body_classes, profile_preferences_path: profile_preferences_path } - Gitlab::Themes.each do |theme| - = stylesheet_link_tag "themes/#{theme.css_filename}" if theme.css_filename + = vite_stylesheet_tag "themes/#{theme.css_filename}" if theme.css_filename = gitlab_ui_form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { id: "profile-preferences-form" } do |f| .row.gl-mt-3.js-preferences-form.js-search-settings-section diff --git a/bin/vite b/bin/vite new file mode 100755 index 00000000000000..7527d097eb6e52 --- /dev/null +++ b/bin/vite @@ -0,0 +1,27 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'vite' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) + +bundle_binstub = File.expand_path("bundle", __dir__) + +if File.file?(bundle_binstub) + if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ + load(bundle_binstub) + else + abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. +Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") + end +end + +require "rubygems" +require "bundler/setup" + +load Gem.bin_path("vite_ruby", "vite") diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index f7c3f4e98b55c5..5145ffae0a780e 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -3,6 +3,7 @@ csp_settings = Settings.gitlab.content_security_policy csp_settings['enabled'] = Gitlab::ContentSecurityPolicy::ConfigLoader.default_enabled if csp_settings['enabled'].nil? +csp_settings['enabled'] = false csp_settings['report_only'] = false if csp_settings['report_only'].nil? csp_settings['directives'] ||= {} diff --git a/config/vite.json b/config/vite.json new file mode 100644 index 00000000000000..f4ae61a770c16f --- /dev/null +++ b/config/vite.json @@ -0,0 +1,24 @@ +{ + "all": { + "sourceCodeDir": "app/assets", + "entrypointsDir": "javascripts/entries", + "additionalEntrypoints": [ + "~/images/**/*", + "~/stylesheets/**/*.scss", + "~/javascripts/pages/**/index.js" + ], + "watchAdditionalPaths": [], + "devServerConnectTimeout": 1 + }, + "development": { + "autoBuild": true, + "publicOutputDir": "vite-dev", + "host": "172.16.123.1", + "port": 3038 + }, + "test": { + "autoBuild": true, + "publicOutputDir": "vite-test", + "port": 3037 + } +} diff --git a/package.json b/package.json index bb57680aa233fb..ec33137e00ac65 100644 --- a/package.json +++ b/package.json @@ -62,41 +62,44 @@ "@gitlab/web-ide": "0.0.1-dev-20230120231236", "@rails/actioncable": "6.1.4-7", "@rails/ujs": "6.1.4-7", + "@rollup/plugin-graphql": "^1.1.0", "@sourcegraph/code-host-integration": "0.0.84", - "@tiptap/core": "^2.0.0-beta.202", - "@tiptap/extension-blockquote": "^2.0.0-beta.202", - "@tiptap/extension-bold": "^2.0.0-beta.202", - "@tiptap/extension-bubble-menu": "2.0.0-beta.200", - "@tiptap/extension-bullet-list": "^2.0.0-beta.202", - "@tiptap/extension-code": "^2.0.0-beta.202", - "@tiptap/extension-code-block": "^2.0.0-beta.202", - "@tiptap/extension-code-block-lowlight": "2.0.0-beta.202", - "@tiptap/extension-document": "^2.0.0-beta.202", - "@tiptap/extension-dropcursor": "^2.0.0-beta.202", - "@tiptap/extension-gapcursor": "^2.0.0-beta.202", - "@tiptap/extension-hard-break": "^2.0.0-beta.202", - "@tiptap/extension-heading": "^2.0.0-beta.202", - "@tiptap/extension-highlight": "^2.0.0-beta.209", - "@tiptap/extension-history": "^2.0.0-beta.202", - "@tiptap/extension-horizontal-rule": "^2.0.0-beta.202", - "@tiptap/extension-image": "^2.0.0-beta.202", - "@tiptap/extension-italic": "^2.0.0-beta.202", - "@tiptap/extension-link": "^2.0.0-beta.202", - "@tiptap/extension-list-item": "^2.0.0-beta.202", - "@tiptap/extension-ordered-list": "^2.0.0-beta.202", - "@tiptap/extension-paragraph": "^2.0.0-beta.202", - "@tiptap/extension-strike": "^2.0.0-beta.202", - "@tiptap/extension-subscript": "^2.0.0-beta.202", - "@tiptap/extension-superscript": "^2.0.0-beta.202", - "@tiptap/extension-table": "^2.0.0-beta.202", - "@tiptap/extension-table-cell": "^2.0.0-beta.202", - "@tiptap/extension-table-header": "^2.0.0-beta.202", - "@tiptap/extension-table-row": "^2.0.0-beta.202", - "@tiptap/extension-task-item": "^2.0.0-beta.202", - "@tiptap/extension-task-list": "^2.0.0-beta.202", - "@tiptap/extension-text": "^2.0.0-beta.202", - "@tiptap/suggestion": "^2.0.0-beta.202", - "@tiptap/vue-2": "2.0.0-beta.200", + "@sentry/browser": "5.30.0", + "@sourcegraph/code-host-integration": "0.0.82", + "@tiptap/core": "^2.0.0-beta.182", + "@tiptap/extension-blockquote": "^2.0.0-beta.29", + "@tiptap/extension-bold": "^2.0.0-beta.28", + "@tiptap/extension-bubble-menu": "^2.0.0-beta.61", + "@tiptap/extension-bullet-list": "^2.0.0-beta.29", + "@tiptap/extension-code": "^2.0.0-beta.28", + "@tiptap/extension-code-block-lowlight": "2.0.0-beta.73", + "@tiptap/extension-document": "^2.0.0-beta.17", + "@tiptap/extension-dropcursor": "^2.0.0-beta.28", + "@tiptap/extension-gapcursor": "^2.0.0-beta.38", + "@tiptap/extension-hard-break": "^2.0.0-beta.33", + "@tiptap/extension-heading": "^2.0.0-beta.29", + "@tiptap/extension-highlight": "^2.0.0-beta.35", + "@tiptap/extension-history": "^2.0.0-beta.25", + "@tiptap/extension-horizontal-rule": "^2.0.0-beta.36", + "@tiptap/extension-image": "^2.0.0-beta.30", + "@tiptap/extension-italic": "^2.0.0-beta.28", + "@tiptap/extension-link": "^2.0.0-beta.43", + "@tiptap/extension-list-item": "^2.0.0-beta.23", + "@tiptap/extension-ordered-list": "^2.0.0-beta.30", + "@tiptap/extension-paragraph": "^2.0.0-beta.26", + "@tiptap/extension-strike": "^2.0.0-beta.29", + "@tiptap/extension-subscript": "^2.0.0-beta.13", + "@tiptap/extension-superscript": "^2.0.0-beta.13", + "@tiptap/extension-table": "^2.0.0-beta.54", + "@tiptap/extension-table-cell": "^2.0.0-beta.23", + "@tiptap/extension-table-header": "^2.0.0-beta.25", + "@tiptap/extension-table-row": "^2.0.0-beta.22", + "@tiptap/extension-task-item": "^2.0.0-beta.37", + "@tiptap/extension-task-list": "^2.0.0-beta.29", + "@tiptap/extension-text": "^2.0.0-beta.17", + "@tiptap/suggestion": "^2.0.0-beta.96", + "@tiptap/vue-2": "^2.0.0-beta.84", + "@vitejs/plugin-vue2": "^1.1.2", "apollo-upload-client": "15.0.0", "apollo3-cache-persist": "^0.14.1", "autosize": "^5.0.1", @@ -173,6 +176,7 @@ "remark-gfm": "^3.0.1", "remark-parse": "^10.0.1", "remark-rehype": "^10.1.0", + "rollup-plugin-node-polyfills": "^0.2.1", "scrollparent": "^2.0.1", "select2": "3.5.2-browserify", "sentrybrowser5": "npm:@sentry/browser@5.30.0", @@ -191,13 +195,15 @@ "url-loader": "^4.1.1", "uuid": "8.1.0", "visibilityjs": "^1.2.4", - "vue": "2.6.14", + "vue": "^2.7.10", + "vite": "^3.0.4", + "vite-plugin-ruby": "^3.1.2", + "vite-svg-loader": "^3.4.0", "vue-apollo": "^3.0.7", - "vue-loader": "15.9.6", + "vue-loader": "^15.10", "vue-observe-visibility": "^1.0.0", "vue-resize": "^1.0.1", "vue-router": "3.4.9", - "vue-template-compiler": "2.6.14", "vue-virtual-scroll-list": "^1.4.7", "vuedraggable": "^2.23.0", "vuex": "^3.6.2", @@ -276,3 +282,4 @@ "yarn": "^1.10.0" } } + diff --git a/vite.config.ts b/vite.config.ts new file mode 100644 index 00000000000000..04664abdf82721 --- /dev/null +++ b/vite.config.ts @@ -0,0 +1,86 @@ +// eslint-disable-next-line import/no-unresolved +import path from 'node:path'; +import { defineConfig } from 'vite'; +import svgLoader from 'vite-svg-loader'; +import vue from '@vitejs/plugin-vue2'; +import graphql from '@rollup/plugin-graphql'; +// eslint-disable-next-line import/no-unresolved +import RubyPlugin from 'vite-plugin-ruby'; +// @ts-ignore +import config from './config/webpack.config'; + +const aliasArr = Object.entries(config.resolve.alias).map(([find, replacement]) => ({ + find, + replacement, +})); + +const assetsPath = path.resolve(__dirname, 'app/assets'); +const javascriptsPath = path.resolve(assetsPath, 'javascripts'); +const stylesheetsPath = path.resolve(assetsPath, 'stylesheets'); +const eePath = path.resolve(__dirname, 'ee/app/assets/stylesheets/_ee'); +const jhPath = path.resolve(__dirname, 'jh/app/assets/stylesheets/_jh'); +const gitlabUI = path.resolve(__dirname, 'node_modules/@gitlab/ui/src/scss'); + +const emptyComponent = path.resolve(javascriptsPath, 'vue_shared/components/empty_component.js'); + +const [rubyPlugin, ...rest] = RubyPlugin(); + +const fixedRubyPlugin = [ + { + ...rubyPlugin, + config: (...args) => { + const originalConfig = rubyPlugin.config(...args); + return { + ...originalConfig, + resolve: undefined, + }; + }, + }, + ...rest, +]; + +export default defineConfig({ + resolve: { + alias: [ + ...aliasArr, + { + find: 'dompurify', + replacement: path.resolve(__dirname, 'app/assets/javascripts/dompurify.js'), + }, + { + find: /^ee_component\/(.*)\.vue/, + replacement: emptyComponent, + }, + { + find: /^jh_component\/(.*)\.vue/, + replacement: emptyComponent, + }, + { + find: '~/', + replacement: javascriptsPath, + }, + { + find: 'path', + replacement: 'rollup-plugin-node-polyfills/polyfills/path', + }, + ], + }, + plugins: [ + fixedRubyPlugin, + vue(/* options */), + graphql(), + svgLoader({ + defaultImport: 'raw', + }), + ], + css: { + preprocessorOptions: { + scss: { + includePaths: [stylesheetsPath, eePath, jhPath, gitlabUI], + }, + }, + }, + define: { + process: {}, + }, +}); diff --git a/yarn.lock b/yarn.lock index f97643431a5c09..668eb617ff23b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -354,6 +354,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.0.tgz#497fcafb1d5b61376959c1c338745ef0577aa02c" integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw== +"@babel/parser@^7.16.4", "@babel/parser@^7.18.4": + version "7.18.11" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9" + integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e" @@ -1905,6 +1910,32 @@ resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.4-7.tgz#ef0b83ef40f64bc6704e13ae6624236a4a91fa6f" integrity sha512-842WcLh0BErNgGE8rdqNh31VnqGQcklPQ7RXzQfA0ilQNZcU7AO+t576g1m//18Lk8m7cXZ8fIKA1YB41LKWAQ== +"@rollup/plugin-graphql@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-graphql/-/plugin-graphql-1.1.0.tgz#492f579816f65bc21ce26394f2f140d95192622d" + integrity sha512-X+H6oFlprDlnO3D0UiEytdW97AMphPXO0C7KunS7i/rBXIGQRQVDU5WKTXnBu2tfyYbjCTtfhXMSGI0i885PNg== + dependencies: + "@rollup/pluginutils" "^4.0.0" + graphql-tag "^2.2.2" + +"@rollup/pluginutils@^4.0.0": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d" + integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + +"@sentry/browser@5.30.0": + version "5.30.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz#c28f49d551db3172080caef9f18791a7fd39e3b3" + integrity sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw== + dependencies: + "@sentry/core" "5.30.0" + "@sentry/types" "5.30.0" + "@sentry/utils" "5.30.0" + tslib "^1.9.3" + "@sentry/core@5.30.0": version "5.30.0" resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.30.0.tgz#6b203664f69e75106ee8b5a2fe1d717379b331f3" @@ -2253,6 +2284,11 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== + "@types/aria-query@^4.2.0": version "4.2.0" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0" @@ -2631,6 +2667,62 @@ "@typescript-eslint/types" "5.38.0" eslint-visitor-keys "^3.3.0" +"@vue/compiler-sfc@2.7.10": + version "2.7.10" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz#3fe08e780053a3bbf41328c65ae5dfdee0385206" + integrity sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q== + dependencies: + "@babel/parser" "^7.18.4" + postcss "^8.4.14" + source-map "^0.6.1" + +"@vitejs/plugin-vue2@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue2/-/plugin-vue2-1.1.2.tgz#891f0acc5a6a2b4886a74cb8d6359d42f19f968a" + integrity sha512-y6OEA+2UdJ0xrEQHodq20v9r3SpS62IOHrgN92JPLvVpNkhcissu7yvD5PXMzMESyazj0XNWGsc8UQk8+mVrjQ== + +"@vue/compiler-core@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.37.tgz#b3c42e04c0e0f2c496ff1784e543fbefe91e215a" + integrity sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/shared" "3.2.37" + estree-walker "^2.0.2" + source-map "^0.6.1" + +"@vue/compiler-dom@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz#10d2427a789e7c707c872da9d678c82a0c6582b5" + integrity sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ== + dependencies: + "@vue/compiler-core" "3.2.37" + "@vue/shared" "3.2.37" + +"@vue/compiler-sfc@^3.2.20": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz#3103af3da2f40286edcd85ea495dcb35bc7f5ff4" + integrity sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.37" + "@vue/compiler-dom" "3.2.37" + "@vue/compiler-ssr" "3.2.37" + "@vue/reactivity-transform" "3.2.37" + "@vue/shared" "3.2.37" + estree-walker "^2.0.2" + magic-string "^0.25.7" + postcss "^8.1.10" + source-map "^0.6.1" + +"@vue/compiler-ssr@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz#4899d19f3a5fafd61524a9d1aee8eb0505313cff" + integrity sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw== + dependencies: + "@vue/compiler-dom" "3.2.37" + "@vue/shared" "3.2.37" + "@vue/component-compiler-utils@^3.1.0": version "3.3.0" resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz#f9f5fb53464b0c37b2c8d2f3fbfe44df60f61dc9" @@ -2647,6 +2739,22 @@ optionalDependencies: prettier "^1.18.2 || ^2.0.0" +"@vue/reactivity-transform@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz#0caa47c4344df4ae59f5a05dde2a8758829f8eca" + integrity sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.37" + "@vue/shared" "3.2.37" + estree-walker "^2.0.2" + magic-string "^0.25.7" + +"@vue/shared@3.2.37": + version "3.2.37" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.37.tgz#8e6adc3f2759af52f0e85863dfb0b711ecc5c702" + integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw== + "@vue/test-utils@1.3.0": version "1.3.0" resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.0.tgz#d563decdcd9c68a7bca151d4179a2bfd6d5c3e15" @@ -4357,6 +4465,17 @@ css-select@^4.1.2: domutils "^2.6.0" nth-check "^2.0.0" +css-select@^4.1.3: + version "4.3.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" + integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== + dependencies: + boolbase "^1.0.0" + css-what "^6.0.1" + domhandler "^4.3.1" + domutils "^2.8.0" + nth-check "^2.0.1" + css-selector-parser@^1.3: version "1.3.0" resolved "https://registry.yarnpkg.com/css-selector-parser/-/css-selector-parser-1.3.0.tgz#5f1ad43e2d8eefbfdc304fcd39a521664943e3eb" @@ -4367,6 +4486,14 @@ css-shorthand-properties@^1.0.0: resolved "https://registry.yarnpkg.com/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz#1c808e63553c283f289f2dd56fcee8f3337bd935" integrity sha512-Md+Juc7M3uOdbAFwOYlTrccIZ7oCFuzrhKYQjdeUEW/sE1hv17Jp/Bws+ReOPpGVBTYCBoYo+G17V5Qo8QQ75A== +css-tree@^1.1.2, css-tree@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== + dependencies: + mdn-data "2.0.14" + source-map "^0.6.1" + css-tree@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.1.0.tgz#170e27ccf94e7c5facb183765c25898be843d1d2" @@ -4389,6 +4516,11 @@ css-what@^5.0.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== +css-what@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -4404,6 +4536,18 @@ cssom@^0.5.0: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== +csso@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== + dependencies: + css-tree "^1.1.2" + +cssom@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + cssom@~0.3.6: version "0.3.8" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" @@ -5271,6 +5415,13 @@ dommatrix@^1.0.3: resolved "https://registry.yarnpkg.com/dommatrix/-/dommatrix-1.0.3.tgz#e7c18e8d6f3abdd1fef3dd4aa74c4d2e620a0525" integrity sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww== +domhandler@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" + integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== + dependencies: + domelementtype "^2.2.0" + dompurify@2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f" @@ -5290,6 +5441,15 @@ domutils@^2.5.2, domutils@^2.6.0: domelementtype "^2.2.0" domhandler "^4.2.0" +domutils@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + dropzone@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-4.2.0.tgz#fbe7acbb9918e0706489072ef663effeef8a79f3" @@ -5884,6 +6044,16 @@ estraverse@^5.1.0, estraverse@^5.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== +estree-walker@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" + integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w== + +estree-walker@^2.0.1, estree-walker@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -6627,7 +6797,7 @@ graphql-sse@^1.0.1: resolved "https://registry.yarnpkg.com/graphql-sse/-/graphql-sse-1.0.4.tgz#051598b0e06c225327aac659f19fcc18bcaa0191" integrity sha512-oB43ifRcEdElgep9jTP9qsj5cJ7Ny/1tAFyIl1W3A0hXRRg/P71tUHzMFBrRkEsJ9IA7MTp+RKSJfh52QR6PBQ== -graphql-tag@^2.11.0, graphql-tag@^2.12.3: +graphql-tag@^2.11.0, graphql-tag@^2.12.3, graphql-tag@^2.2.2: version "2.12.6" resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg== @@ -8470,6 +8640,18 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lz-string@^1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" + integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ== + +magic-string@^0.25.3, magic-string@^0.25.7: + version "0.25.9" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" + integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== + dependencies: + sourcemap-codec "^1.4.8" + make-dir@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" @@ -8720,6 +8902,11 @@ mdast-util-to-string@^3.0.0, mdast-util-to-string@^3.1.0: resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9" integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA== +mdn-data@2.0.14: + version "2.0.14" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" + integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== + mdn-data@2.0.27: version "2.0.27" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.27.tgz#1710baa7b0db8176d3b3d565ccb7915fc69525ab" @@ -10016,7 +10203,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -10145,7 +10332,7 @@ postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@8.4.14, postcss@^8.2.1, postcss@^8.4.14: +postcss@8.4.14, postcss@^8.2.1: version "8.4.14" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== @@ -10162,6 +10349,15 @@ postcss@^7.0.14, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6: picocolors "^0.2.1" source-map "^0.6.1" +postcss@^8.1.10, postcss@^8.4.14: + version "8.4.16" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" + integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -10800,7 +10996,7 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.9.0: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.9.0: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -10851,6 +11047,36 @@ robust-predicates@^3.0.0: resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.1.tgz#ecde075044f7f30118682bd9fb3f123109577f9a" integrity sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g== +rollup-plugin-inject@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz#e4233855bfba6c0c12a312fd6649dff9a13ee9f4" + integrity sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w== + dependencies: + estree-walker "^0.6.1" + magic-string "^0.25.3" + rollup-pluginutils "^2.8.1" + +rollup-plugin-node-polyfills@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz#53092a2744837164d5b8a28812ba5f3ff61109fd" + integrity sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA== + dependencies: + rollup-plugin-inject "^3.0.0" + +rollup-pluginutils@^2.8.1: + version "2.8.2" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" + integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== + dependencies: + estree-walker "^0.6.1" + +rollup@^2.75.6: + version "2.77.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.2.tgz#6b6075c55f9cc2040a5912e6e062151e42e2c4e3" + integrity sha512-m/4YzYgLcpMQbxX3NmAqDvwLATZzxt8bIegO78FZLl+lAgKJBd1DRAOeEiZcKOIOPjxE6ewHWHNgGEalFXuz1g== + optionalDependencies: + fsevents "~2.3.2" + rope-sequence@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b" @@ -11349,6 +11575,16 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +sourcemap-codec@^1.4.8: + version "1.4.8" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== + space-separated-tokens@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b" @@ -11429,6 +11665,11 @@ ssri@^8.0.0: dependencies: minipass "^3.1.1" +stable@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" + integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== + stack-utils@^2.0.3: version "2.0.5" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" @@ -11726,6 +11967,19 @@ swagger-cli@^4.0.4: dependencies: "@apidevtools/swagger-cli" "4.0.4" +svgo@^2.7.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== + dependencies: + "@trysound/sax" "0.2.0" + commander "^7.2.0" + css-select "^4.1.3" + css-tree "^1.1.3" + csso "^4.2.0" + picocolors "^1.0.0" + stable "^0.1.8" + swagger-ui-dist@4.12.0: version "4.12.0" resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-4.12.0.tgz#986d90f05e81fb9db3ca40372278a5d8ce71db3a" @@ -12475,6 +12729,34 @@ visibilityjs@^1.2.4: resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-1.2.4.tgz#bff8663da62c8c10ad4ee5ae6a1ae6fac4259d63" integrity sha1-v/hmPaYsjBCtTuWuahrm+sQlnWM= +vite-plugin-ruby@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/vite-plugin-ruby/-/vite-plugin-ruby-3.1.2.tgz#513297e64e3c9a2e2eace6c39856870f5aef0e90" + integrity sha512-Pp/NR79lV96wEOjp5MhVHuFxqUhEMNqc7L/02i+XXl1Mq1ab7s2j9kAgtiqp5QKxMd1jy8gV32PgWWVOmcd7/Q== + dependencies: + debug "^4.3.4" + fast-glob "^3.2.11" + +vite-svg-loader@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/vite-svg-loader/-/vite-svg-loader-3.4.0.tgz#4638827fe86b85ecfcea1ad61dd972c351d5befd" + integrity sha512-xD3yb1FX+f4l9/TmsYIqyki8ncpcVsZ2gEJFh/wLuNNqt55C8OJ+JlcMWOA/Z9gRA+ylV/TA1wmJLxzZkCRqlA== + dependencies: + "@vue/compiler-sfc" "^3.2.20" + svgo "^2.7.0" + +vite@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.4.tgz#c61688d6b97573e96cf5ac25f2d68597b5ce68e8" + integrity sha512-NU304nqnBeOx2MkQnskBQxVsa0pRAH5FphokTGmyy8M3oxbvw7qAXts2GORxs+h/2vKsD+osMhZ7An6yK6F1dA== + dependencies: + esbuild "^0.14.47" + postcss "^8.4.14" + resolve "^1.22.1" + rollup "^2.75.6" + optionalDependencies: + fsevents "~2.3.2" + vm-browserify@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019" -- GitLab From 6b06ff2b4ba4abb5db108a5b0a4b68ccb666d0f3 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 8 Aug 2022 10:55:02 +0400 Subject: [PATCH 02/89] Fix envs --- app/assets/javascripts/sourcegraph/index.js | 2 +- config/webpack.config.js | 4 ++++ vite.config.ts | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/sourcegraph/index.js b/app/assets/javascripts/sourcegraph/index.js index 0fde68c330a5d7..487a565b1526e7 100644 --- a/app/assets/javascripts/sourcegraph/index.js +++ b/app/assets/javascripts/sourcegraph/index.js @@ -17,7 +17,7 @@ export default function initSourcegraph() { return; } - const assetsUrl = new URL(import.meta.env.SOURCEGRAPH_PUBLIC_PATH, window.location.href); + const assetsUrl = new URL(process.env.SOURCEGRAPH_PUBLIC_PATH, window.location.href); const scriptPath = new URL('scripts/integration.bundle.js', assetsUrl).href; window.SOURCEGRAPH_ASSETS_URL = assetsUrl.href; diff --git a/config/webpack.config.js b/config/webpack.config.js index fd58e22bb996c5..592611104b90a7 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -848,3 +848,7 @@ module.exports = { setImmediate: false, }, }; + +module.exports.IS_EE = IS_EE; +module.exports.IS_JH = IS_JH; +module.exports.SOURCEGRAPH_PUBLIC_PATH = SOURCEGRAPH_PUBLIC_PATH; diff --git a/vite.config.ts b/vite.config.ts index 04664abdf82721..6b0472d8add6db 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -7,7 +7,7 @@ import graphql from '@rollup/plugin-graphql'; // eslint-disable-next-line import/no-unresolved import RubyPlugin from 'vite-plugin-ruby'; // @ts-ignore -import config from './config/webpack.config'; +import config, { IS_EE, IS_JH, SOURCEGRAPH_PUBLIC_PATH } from './config/webpack.config'; const aliasArr = Object.entries(config.resolve.alias).map(([find, replacement]) => ({ find, @@ -82,5 +82,8 @@ export default defineConfig({ }, define: { process: {}, + IS_EE: IS_EE ? 'window.gon && window.gon.ee' : JSON.stringify(false), + IS_JH: IS_JH ? 'window.gon && window.gon.jh' : JSON.stringify(false), + 'process.env.SOURCEGRAPH_PUBLIC_PATH': JSON.stringify(SOURCEGRAPH_PUBLIC_PATH), }, }); -- GitLab From 32f8ba84c4487c69c84d4821abaaa21c9308865b Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Tue, 9 Aug 2022 15:43:03 +0400 Subject: [PATCH 03/89] Move Vite under two feature flags: vite and vite_stylesheets --- .../behaviors/markdown/copy_as_gfm.js | 2 +- app/assets/javascripts/commons/vue.js | 2 +- .../extensions/source_editor_webide_ext.js | 2 +- app/assets/javascripts/ide/lib/editor.js | 2 +- app/assets/javascripts/lib/utils/poll.js | 2 +- app/assets/javascripts/main.js | 4 +- app/assets/javascripts/sentry/index.js | 2 +- .../components/lib/utils/props_utils.js | 2 +- .../vue_shared/directives/validation.js | 2 +- app/assets/javascripts/webpack.js | 7 ++- app/controllers/application_controller.rb | 5 ++ app/helpers/application_helper.rb | 6 +- app/helpers/vite_helper.rb | 58 +++++++++++++++++++ app/helpers/webpack_helper.rb | 27 +++++---- app/views/layouts/_head.html.haml | 12 ++-- app/views/layouts/_loading_hints.html.haml | 10 ++-- app/views/layouts/_mailer.html.haml | 2 +- app/views/layouts/component_preview.html.haml | 8 +-- app/views/layouts/notify.html.haml | 4 +- app/views/layouts/service_desk.html.haml | 4 +- app/views/notify/_note_email.html.haml | 2 +- app/views/notify/new_review_email.html.haml | 2 +- .../notify/repository_push_email.html.haml | 2 +- app/views/profiles/preferences/show.html.haml | 2 +- .../projects/environments/terminal.html.haml | 2 +- app/views/projects/jobs/terminal.html.haml | 2 +- config/feature_flags/development/vite.yml | 8 +++ .../development/vite_stylesheets.yml | 8 +++ .../initializers/content_security_policy.rb | 1 - 29 files changed, 140 insertions(+), 52 deletions(-) create mode 100644 app/helpers/vite_helper.rb create mode 100644 config/feature_flags/development/vite.yml create mode 100644 config/feature_flags/development/vite_stylesheets.yml diff --git a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js index 8ebd27cb10a60c..19ebab36481cc9 100644 --- a/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js +++ b/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js @@ -189,7 +189,7 @@ export class CopyAsGFM { // Export CopyAsGFM as a global for rspec to access // see /spec/features/markdown/copy_as_gfm_spec.rb -if (import.meta.env.NODE_ENV !== 'production') { +if (process.env.NODE_ENV !== 'production') { window.CopyAsGFM = CopyAsGFM; } diff --git a/app/assets/javascripts/commons/vue.js b/app/assets/javascripts/commons/vue.js index 09aeece6bfefb8..cd24a503631352 100644 --- a/app/assets/javascripts/commons/vue.js +++ b/app/assets/javascripts/commons/vue.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import GlFeatureFlagsPlugin from '~/vue_shared/gl_feature_flags_plugin'; import Translate from '~/vue_shared/translate'; -if (import.meta.env.NODE_ENV !== 'production') { +if (process.env.NODE_ENV !== 'production') { Vue.config.productionTip = false; } diff --git a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js index bfc05583d406c4..6270517b3f3ca9 100644 --- a/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js +++ b/app/assets/javascripts/editor/extensions/source_editor_webide_ext.js @@ -101,7 +101,7 @@ export class EditorWebIdeExtension { try { this.disposable.dispose(); } catch (e) { - if (import.meta.env.NODE_ENV !== 'test') { + if (process.env.NODE_ENV !== 'test') { // eslint-disable-next-line no-console console.error(e); } diff --git a/app/assets/javascripts/ide/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js index e4dd2a4ef16df2..80191f635a3aef 100644 --- a/app/assets/javascripts/ide/lib/editor.js +++ b/app/assets/javascripts/ide/lib/editor.js @@ -149,7 +149,7 @@ export default class Editor { } catch (e) { this.instance = null; - if (import.meta.env.NODE_ENV !== 'test') { + if (process.env.NODE_ENV !== 'test') { // eslint-disable-next-line no-console console.error(e); } diff --git a/app/assets/javascripts/lib/utils/poll.js b/app/assets/javascripts/lib/utils/poll.js index 30db5a075c6614..73add1e37ee69a 100644 --- a/app/assets/javascripts/lib/utils/poll.js +++ b/app/assets/javascripts/lib/utils/poll.js @@ -91,7 +91,7 @@ export default class Poll { // So we don't make our specs artificially slower this.timeoutID = setTimeout( () => this.makeRequest(), - import.meta.env.NODE_ENV !== 'test' ? delay : 1, + process.env.NODE_ENV !== 'test' ? delay : 1, ); } diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index eecefe5ef3eea3..4c715c4993ff0e 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -3,7 +3,7 @@ import jQuery from 'jquery'; // bootstrap webpack, common libs, polyfills, and behaviors -// import './webpack'; +import './webpack'; import './commons'; import './behaviors'; @@ -54,7 +54,7 @@ window.$ = jQuery; window.gl = window.gl || {}; // inject test utilities if necessary -if (import.meta.env.NODE_ENV !== 'production' && gon?.test_env) { +if (process.env.NODE_ENV !== 'production' && gon?.test_env) { import(/* webpackMode: "eager" */ './test_utils'); } diff --git a/app/assets/javascripts/sentry/index.js b/app/assets/javascripts/sentry/index.js index eb527686f04499..e8481a58a4491e 100644 --- a/app/assets/javascripts/sentry/index.js +++ b/app/assets/javascripts/sentry/index.js @@ -9,7 +9,7 @@ const index = function index() { dsn: gon.sentry_dsn, environment: gon.sentry_environment, currentUserId: gon.current_user_id, - allowUrls: + whitelistUrls: import.meta.env.NODE_ENV === 'production' ? [gon.gitlab_url] : [gon.gitlab_url, 'webpack-internal://'], diff --git a/app/assets/javascripts/vue_shared/components/lib/utils/props_utils.js b/app/assets/javascripts/vue_shared/components/lib/utils/props_utils.js index f38c24a782686a..b115b1fb34ba4f 100644 --- a/app/assets/javascripts/vue_shared/components/lib/utils/props_utils.js +++ b/app/assets/javascripts/vue_shared/components/lib/utils/props_utils.js @@ -12,7 +12,7 @@ export const propsUnion = (components) => components.reduce((acc, component) => { Object.entries(component.props ?? {}).forEach(([propName, propOptions]) => { - if (import.meta.env.NODE_ENV !== 'production') { + if (process.env.NODE_ENV !== 'production') { if (typeof propOptions !== 'object' || !('type' in propOptions)) { throw new Error( `Cannot create props union: expected verbose prop options for prop "${propName}"`, diff --git a/app/assets/javascripts/vue_shared/directives/validation.js b/app/assets/javascripts/vue_shared/directives/validation.js index 94592aecca4ad6..fc0ff78e7b4a5b 100644 --- a/app/assets/javascripts/vue_shared/directives/validation.js +++ b/app/assets/javascripts/vue_shared/directives/validation.js @@ -50,7 +50,7 @@ const createValidator = (context, feedbackMap) => ({ el, reportInvalidInput = fa const { name } = el; if (!name) { - if (import.meta.env.NODE_ENV === 'development') { + if (process.env.NODE_ENV === 'development') { // eslint-disable-next-line no-console console.warn( '[gitlab] the validation directive requires the given input to have "name" attribute', diff --git a/app/assets/javascripts/webpack.js b/app/assets/javascripts/webpack.js index f06d6b01e3dd12..ef82142289d3c8 100644 --- a/app/assets/javascripts/webpack.js +++ b/app/assets/javascripts/webpack.js @@ -7,6 +7,7 @@ * e.g. the `window` scope, because it needs to be executed in the scope of webpack. */ -// if (gon && gon.webpack_public_path) { -// __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line camelcase -// } +// eslint-disable-next-line camelcase +if (gon && gon.webpack_public_path && typeof __webpack_public_path__ !== 'undefined') { + __webpack_public_path__ = gon.webpack_public_path; // eslint-disable-line camelcase +} diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 865cde1b6411ec..19ee632a00d218 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -114,6 +114,11 @@ def self.endpoint_id_for_action(action_name) content_security_policy do |p| next if p.directives.blank? + if Gitlab.dev_or_test_env? && Feature.enabled?(:vite) + sources = p.directives['connect-src'] + # TODO: the address should be taken from the vite common config + p.connect_src(*(Array.wrap(sources) | ['ws://gdk.test:3038'])) + end next unless Gitlab::CurrentSettings.snowplow_enabled? && !Gitlab::CurrentSettings.snowplow_collector_hostname.blank? default_connect_src = p.directives['connect-src'] || p.directives['default-src'] diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 09d46f44251a89..1d645e74284c11 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -274,9 +274,9 @@ def page_filter_path(options = {}) def stylesheet_link_tag_defer(path) if startup_css_enabled? - vite_stylesheet_tag(path, media: "print", crossorigin: ActionController::Base.asset_host ? 'anonymous' : nil) + universal_stylesheet_link_tag(path, media: "print", crossorigin: ActionController::Base.asset_host ? 'anonymous' : nil) else - vite_stylesheet_tag(path, crossorigin: ActionController::Base.asset_host ? 'anonymous' : nil) + universal_stylesheet_link_tag(path, crossorigin: ActionController::Base.asset_host ? 'anonymous' : nil) end end @@ -401,7 +401,7 @@ def add_page_specific_style(path, defer: true) if defer stylesheet_link_tag_defer path else - vite_stylesheet_tag path + universal_stylesheet_link_tag path end end end diff --git a/app/helpers/vite_helper.rb b/app/helpers/vite_helper.rb new file mode 100644 index 00000000000000..09eed5bfc87fac --- /dev/null +++ b/app/helpers/vite_helper.rb @@ -0,0 +1,58 @@ +# frozen_string_literal: true + +module ViteHelper + def vite_controller_bundle_tags + chunks = [] + + action = case controller.action_name + when 'create' then 'new' + when 'update' then 'edit' + else controller.action_name + end + + route = [*controller.controller_path.split('/'), action].compact + + until chunks.any? || route.empty? + entrypoint = "javascripts/pages/#{route.join('/')}/index.js" + begin + chunks.push entrypoint + # TODO: properly handle non-existent assets, doesn't work ATM + vite_asset_path(entrypoint) ? nil : chunks.pop + rescue ViteRuby::MissingEntrypointError + chunks.pop + # no bundle exists for this path + end + route.pop + end + + vite_javascript_tag(*chunks) + end + + def universal_javascript_include_tag(*args) + return vite_javascript_tag(*args) if Feature.enabled?(:vite) + + javascript_include_tag(*args) + end + + def universal_asset_path(*args) + return vite_asset_path(*args) if Feature.enabled?(:vite) + + asset_path(*args) + end + + def universal_stylesheet_link_tag(*args) + return vite_stylesheet_tag(*args) if Feature.enabled?(:vite_stylesheets) + + stylesheet_link_tag(*args) + end + + def vite_stylesheet_tag(path, *args) + super("stylesheets/#{path}.scss", *args) + end + + def path_to_stylesheet(path, *args) + return vite_asset_url("stylesheets/#{path}.scss", *args) if Feature.enabled?(:vite_stylesheets) + + super(path, *args) + end +end diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb index 14c4998a03a64f..fdd25eec108881 100644 --- a/app/helpers/webpack_helper.rb +++ b/app/helpers/webpack_helper.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true module WebpackHelper + include ViteHelper + def prefetch_link_tag(source) href = asset_path(source) @@ -13,12 +15,12 @@ def prefetch_link_tag(source) link_tag end - def vite_stylesheet_tag(path, *args) - super("stylesheets/#{path}.scss", *args) - end - def webpack_bundle_tag(bundle) - vite_javascript_tag bundle + if Feature.enabled?(:vite) + vite_javascript_tag bundle + else + javascript_include_tag(*webpack_entrypoint_paths(bundle)) + end end def webpack_preload_asset_tag(asset, options = {}) @@ -36,6 +38,8 @@ def webpack_preload_asset_tag(asset, options = {}) end def webpack_controller_bundle_tags + return vite_controller_bundle_tags if Feature.enabled?(:vite) + chunks = [] action = case controller.action_name @@ -47,17 +51,20 @@ def webpack_controller_bundle_tags route = [*controller.controller_path.split('/'), action].compact until chunks.any? || route.empty? - entrypoint = "javascripts/pages/#{route.join('/')}/index.js" + entrypoint = "pages.#{route.join('.')}" begin - chunks.push entrypoint - vite_asset_path(entrypoint) ? nil : chunks.pop - rescue + chunks = webpack_entrypoint_paths(entrypoint, extension: 'js') + rescue Gitlab::Webpack::Manifest::AssetMissingError # no bundle exists for this path end route.pop end - vite_javascript_tag(*chunks) + if chunks.empty? + chunks = webpack_entrypoint_paths("default", extension: 'js') + end + + javascript_include_tag(*chunks) end def webpack_entrypoint_paths(source, extension: nil, exclude_duplicates: true) diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index cb7a0f7d572eb9..1df5f43785f061 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -9,7 +9,8 @@ %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge' } - = vite_client_tag + - if Feature.enabled?(:vite) + = javascript_include_tag(vite_manifest.vite_client_src, type: "module", extname: false) = render 'layouts/startup_js' @@ -36,8 +37,8 @@ = stylesheet_link_tag_defer "application" = yield :page_specific_styles = stylesheet_link_tag_defer 'application_utilities' - = vite_stylesheet_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations'] - = vite_stylesheet_tag "test_environment", media: "all" if Rails.env.test? + = universal_stylesheet_link_tag "disable_animations", media: "all" if Rails.env.test? || Gitlab.config.gitlab['disable_animations'] + = universal_stylesheet_link_tag "test_environment", media: "all" if Rails.env.test? = stylesheet_link_tag_defer "fonts" @@ -46,7 +47,7 @@ - if startup_css_enabled? = render 'layouts/startup_css_activation' - = vite_stylesheet_tag 'performance_bar' if performance_bar_enabled? + = universal_stylesheet_link_tag 'performance_bar' if performance_bar_enabled? = Gon::Base.render_data(nonce: content_security_policy_nonce) @@ -57,7 +58,8 @@ = webpack_bundle_tag 'legacy_sentry' = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? - = vite_javascript_tag "main" + - if Feature.enabled?(:vite) + = vite_javascript_tag "main" = yield :page_specific_javascripts diff --git a/app/views/layouts/_loading_hints.html.haml b/app/views/layouts/_loading_hints.html.haml index 42a32978454408..a9ce82ad38ad40 100644 --- a/app/views/layouts/_loading_hints.html.haml +++ b/app/views/layouts/_loading_hints.html.haml @@ -5,12 +5,12 @@ %link{ rel: 'dns-prefetch', href: ActionController::Base.asset_host } %link{ rel: 'preconnect', href: ActionController::Base.asset_host, crossorigin: '' } - if user_application_theme == 'gl-dark' - = preload_link_tag(vite_asset_url('stylesheets/application_utilities_dark.scss'), crossorigin: css_crossorigin, as: "style") - = preload_link_tag(vite_asset_url('stylesheets/application_dark.scss'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(path_to_stylesheet('application_utilities_dark'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(path_to_stylesheet('application_dark'), crossorigin: css_crossorigin, as: "style") - else - = preload_link_tag(vite_asset_url('stylesheets/application_utilities.scss'), crossorigin: css_crossorigin, as: "style") - = preload_link_tag(vite_asset_url('stylesheets/application.scss'), crossorigin: css_crossorigin, as: "style") - = preload_link_tag(vite_asset_url("stylesheets/highlight/themes/#{user_color_scheme}.scss"), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(path_to_stylesheet('application_utilities'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(path_to_stylesheet('application'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(path_to_stylesheet("highlight/themes/#{user_color_scheme}"), crossorigin: css_crossorigin, as: "style") - if Gitlab::Tracking.enabled? && Gitlab::Tracking.collector_hostname %link{ rel: 'preconnect', href: "https://#{Gitlab::Tracking.collector_hostname}", crossorigin: '' } -# Do not use preload_link_tag for fonts, to work around Firefox double-fetch bug. diff --git a/app/views/layouts/_mailer.html.haml b/app/views/layouts/_mailer.html.haml index f754225a9ad235..258034046eb040 100644 --- a/app/views/layouts/_mailer.html.haml +++ b/app/views/layouts/_mailer.html.haml @@ -12,7 +12,7 @@ %style{ type: 'text/css', 'data-premailer': 'ignore' } = asset_to_string('mailer_client_specific.css').html_safe - = vite_stylesheet_tag 'mailer' + = universal_stylesheet_link_tag 'mailer' %body = yield :preview_text %table#body{ border: "0", cellpadding: "0", cellspacing: "0" } diff --git a/app/views/layouts/component_preview.html.haml b/app/views/layouts/component_preview.html.haml index d9e9d9443faa23..bb157a2624476c 100644 --- a/app/views/layouts/component_preview.html.haml +++ b/app/views/layouts/component_preview.html.haml @@ -1,10 +1,10 @@ %head - if params[:lookbook][:display][:theme] == 'light' - = vite_stylesheet_tag "application" - = vite_stylesheet_tag "application_utilities" + = universal_stylesheet_link_tag "application" + = universal_stylesheet_link_tag "application_utilities" - else - = vite_stylesheet_tag "application_dark" - = vite_stylesheet_tag "application_utilities_dark" + = universal_stylesheet_link_tag "application_dark" + = universal_stylesheet_link_tag "application_utilities_dark" %body .container.gl-mt-6 - if params[:lookbook][:display][:bg_dark] diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml index a05f12c43d6c87..11068482472734 100644 --- a/app/views/layouts/notify.html.haml +++ b/app/views/layouts/notify.html.haml @@ -4,13 +4,13 @@ %title GitLab - if Feature.enabled?(:enhanced_notify_css) - = vite_stylesheet_tag 'notify_enhanced' + = universal_stylesheet_link_tag 'notify_enhanced' %style{ type: 'text/css', 'data-premailer': 'ignore' } -# The MUA automatically turns some text into links. -# Match the color of explicit links ($blue-600 from typography.scss). a { color: #1068bf; } - else - = vite_stylesheet_tag 'notify' + = universal_stylesheet_link_tag 'notify' = yield :head %body .content diff --git a/app/views/layouts/service_desk.html.haml b/app/views/layouts/service_desk.html.haml index 23c88403ea9159..e09a03ad6a0ba1 100644 --- a/app/views/layouts/service_desk.html.haml +++ b/app/views/layouts/service_desk.html.haml @@ -6,13 +6,13 @@ GitLab -# haml-lint:enable NoPlainNodes - if Feature.enabled?(:enhanced_notify_css) - = vite_stylesheet_tag 'notify_enhanced' + = universal_stylesheet_link_tag 'notify_enhanced' %style{ type: 'text/css', 'data-premailer': 'ignore' } -# The MUA automatically turns some text into links. -# Match the color of explicit links ($blue-600 from typography.scss). a { color: #1068bf; } - else - = vite_stylesheet_tag 'notify' + = universal_stylesheet_link_tag 'notify' = yield :head %body = html_header_message diff --git a/app/views/notify/_note_email.html.haml b/app/views/notify/_note_email.html.haml index bb217154c1b6be..54d04908e0805c 100644 --- a/app/views/notify/_note_email.html.haml +++ b/app/views/notify/_note_email.html.haml @@ -26,7 +26,7 @@ - if discussion&.diff_discussion? && discussion.on_text? - if include_stylesheet_link = content_for :head do - = vite_stylesheet_tag 'mailers/highlighted_diff_email' + = universal_stylesheet_link_tag 'mailers/highlighted_diff_email' %table.code.gl-mb-5 = render partial: "projects/diffs/email_line", diff --git a/app/views/notify/new_review_email.html.haml b/app/views/notify/new_review_email.html.haml index 149c3c08c04e58..09ed1633b0ed64 100644 --- a/app/views/notify/new_review_email.html.haml +++ b/app/views/notify/new_review_email.html.haml @@ -1,6 +1,6 @@ - if @include_diff_discussion_stylesheet = content_for :head do - = vite_stylesheet_tag 'mailers/highlighted_diff_email' + = universal_stylesheet_link_tag 'mailers/highlighted_diff_email' %table{ border: "0", cellpadding: "0", cellspacing: "0", style: "width:100%;margin:0 auto;border-collapse:separate;border-spacing:0;" } %tbody diff --git a/app/views/notify/repository_push_email.html.haml b/app/views/notify/repository_push_email.html.haml index adc651d0b346b0..8901af3de3c59c 100644 --- a/app/views/notify/repository_push_email.html.haml +++ b/app/views/notify/repository_push_email.html.haml @@ -1,5 +1,5 @@ = content_for :head do - = vite_stylesheet_tag 'mailers/highlighted_diff_email' + = universal_stylesheet_link_tag 'mailers/highlighted_diff_email' %h3 = s_('Notify|%{author_name} %{action_name} %{ref_type} %{ref_name} at %{project_link}').html_safe % {author_name: @message.author_name, action_name: @message.action_name, ref_type: @message.ref_type, ref_name: @message.ref_name, project_link: link_to(@message.project_name_with_namespace, strip_tags(project_url(@message.project)))} diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index be3553b5904829..3c567d25bd121e 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -8,7 +8,7 @@ - data_attributes = { themes: @themes, integration_views: integration_views.to_json, user_fields: user_fields, body_classes: Gitlab::Themes.body_classes, profile_preferences_path: profile_preferences_path } - Gitlab::Themes.each do |theme| - = vite_stylesheet_tag "themes/#{theme.css_filename}" if theme.css_filename + = universal_stylesheet_link_tag "themes/#{theme.css_filename}" if theme.css_filename = gitlab_ui_form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { id: "profile-preferences-form" } do |f| .row.gl-mt-3.js-preferences-form.js-search-settings-section diff --git a/app/views/projects/environments/terminal.html.haml b/app/views/projects/environments/terminal.html.haml index 7c837d4ded0685..7f576ed669abf3 100644 --- a/app/views/projects/environments/terminal.html.haml +++ b/app/views/projects/environments/terminal.html.haml @@ -1,7 +1,7 @@ - page_title _("Terminal for environment"), @environment.name - add_page_specific_style 'page_bundles/terminal' - content_for :page_specific_javascripts do - = stylesheet_link_tag "xterm.css" + = universal_stylesheet_link_tag "xterm.css" .top-area .row diff --git a/app/views/projects/jobs/terminal.html.haml b/app/views/projects/jobs/terminal.html.haml index 95acbcae6d9103..3ec43598b25476 100644 --- a/app/views/projects/jobs/terminal.html.haml +++ b/app/views/projects/jobs/terminal.html.haml @@ -4,7 +4,7 @@ - page_title _('Terminal'), "#{@build.name} (##{@build.id})", _('Jobs') - add_page_specific_style 'page_bundles/terminal' - content_for :page_specific_javascripts do - = stylesheet_link_tag "xterm.css" + = universal_stylesheet_link_tag "xterm.css" .terminal-container diff --git a/config/feature_flags/development/vite.yml b/config/feature_flags/development/vite.yml new file mode 100644 index 00000000000000..ab0a20e7509bc4 --- /dev/null +++ b/config/feature_flags/development/vite.yml @@ -0,0 +1,8 @@ +--- +name: vite +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94685 +rollout_issue_url: +milestone: '15.4' +type: development +group: group::foundations +default_enabled: false diff --git a/config/feature_flags/development/vite_stylesheets.yml b/config/feature_flags/development/vite_stylesheets.yml new file mode 100644 index 00000000000000..bef15ed00c4f79 --- /dev/null +++ b/config/feature_flags/development/vite_stylesheets.yml @@ -0,0 +1,8 @@ +--- +name: vite_stylesheets +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94685 +rollout_issue_url: +milestone: '15.4' +type: development +group: group::foundations +default_enabled: false diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb index 5145ffae0a780e..f7c3f4e98b55c5 100644 --- a/config/initializers/content_security_policy.rb +++ b/config/initializers/content_security_policy.rb @@ -3,7 +3,6 @@ csp_settings = Settings.gitlab.content_security_policy csp_settings['enabled'] = Gitlab::ContentSecurityPolicy::ConfigLoader.default_enabled if csp_settings['enabled'].nil? -csp_settings['enabled'] = false csp_settings['report_only'] = false if csp_settings['report_only'].nil? csp_settings['directives'] ||= {} -- GitLab From a3c524d5d4eff558669e5cadf00ea129f5fed674 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Tue, 9 Aug 2022 17:12:10 +0400 Subject: [PATCH 04/89] Fix web workers imports --- app/assets/javascripts/diffs/store/actions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index 9f90de9abde40c..58384860707859 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -52,7 +52,7 @@ import { isCollapsed } from '../utils/diff_file'; import { markFileReview, setReviewsForMergeRequest } from '../utils/file_reviews'; import { getDerivedMergeRequestInformation } from '../utils/merge_request'; import { queueRedisHllEvents } from '../utils/queue_events'; -import TreeWorker from '../workers/tree_worker?worker'; +import TreeWorker from '../workers/tree_worker.js?worker'; import * as types from './mutation_types'; import { getDiffPositionByLineCode, -- GitLab From 3d38e0e2ef7a37fb8fa95d5f9e055c1d47ac276b Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Tue, 9 Aug 2022 17:14:20 +0400 Subject: [PATCH 05/89] Fix webpack public path magic reference --- app/assets/javascripts/lib/utils/webpack.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/lib/utils/webpack.js b/app/assets/javascripts/lib/utils/webpack.js index 52409687ccb34a..2074ceabb76490 100644 --- a/app/assets/javascripts/lib/utils/webpack.js +++ b/app/assets/javascripts/lib/utils/webpack.js @@ -10,5 +10,6 @@ export function resetServiceWorkersPublicPath() { // see: https://webpack.js.org/guides/public-path/ const relativeRootPath = (gon && gon.relative_url_root) || ''; const webpackAssetPath = joinPaths(relativeRootPath, '/assets/webpack/'); - // __webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase + if (typeof __webpack_public_path__ === 'undefined') return; // eslint-disable-line camelcase + __webpack_public_path__ = webpackAssetPath; // eslint-disable-line camelcase } -- GitLab From d5683f27e30d6156608ac5753eab32c81475475e Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Wed, 10 Aug 2022 14:49:34 +0400 Subject: [PATCH 06/89] Fix webpack config --- config/webpack.config.js | 20 ++++++++++---------- config/webpack.constants.js | 20 ++++++++++++++++++++ vite.config.ts | 3 ++- 3 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 config/webpack.constants.js diff --git a/config/webpack.config.js b/config/webpack.config.js index 592611104b90a7..2a895d7f42404d 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -5,7 +5,6 @@ const fs = require('fs'); const path = require('path'); const BABEL_VERSION = require('@babel/core/package.json').version; -const SOURCEGRAPH_VERSION = require('@sourcegraph/code-host-integration/package.json').version; const GITLAB_WEB_IDE_VERSION = require('@gitlab/web-ide/package.json').version; const BABEL_LOADER_VERSION = require('babel-loader/package.json').version; @@ -25,14 +24,21 @@ const WEBPACK_VERSION = require('webpack/package.json').version; const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin'); const esbuildConfiguration = require('./esbuild.config'); +const { + IS_EE, + IS_JH, + ROOT_PATH, + WEBPACK_OUTPUT_PATH, + WEBPACK_PUBLIC_PATH, + SOURCEGRAPH_OUTPUT_PATH, + SOURCEGRAPH_PUBLIC_PATH, +} = require('./webpack.constants'); + const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler'); -const IS_EE = require('./helpers/is_ee_env'); -const IS_JH = require('./helpers/is_jh_env'); const vendorDllHash = require('./helpers/vendor_dll_hash'); const GraphqlKnownOperationsPlugin = require('./plugins/graphql_known_operations_plugin'); -const ROOT_PATH = path.resolve(__dirname, '..'); const SUPPORTED_BROWSERS = fs.readFileSync(path.join(ROOT_PATH, '.browserslistrc'), 'utf-8'); const SUPPORTED_BROWSERS_HASH = crypto .createHash('sha256') @@ -74,8 +80,6 @@ if (WEBPACK_REPORT) { NO_HASHED_CHUNKS = true; } -const WEBPACK_OUTPUT_PATH = path.join(ROOT_PATH, 'public/assets/webpack'); -const WEBPACK_PUBLIC_PATH = '/assets/webpack/'; const SOURCEGRAPH_PACKAGE = '@sourcegraph/code-host-integration'; const GITLAB_WEB_IDE_PACKAGE = '@gitlab/web-ide'; @@ -848,7 +852,3 @@ module.exports = { setImmediate: false, }, }; - -module.exports.IS_EE = IS_EE; -module.exports.IS_JH = IS_JH; -module.exports.SOURCEGRAPH_PUBLIC_PATH = SOURCEGRAPH_PUBLIC_PATH; diff --git a/config/webpack.constants.js b/config/webpack.constants.js new file mode 100644 index 00000000000000..91942181f6182f --- /dev/null +++ b/config/webpack.constants.js @@ -0,0 +1,20 @@ +const path = require('path'); + +const ROOT_PATH = path.resolve(__dirname, '..'); +const WEBPACK_OUTPUT_PATH = path.join(ROOT_PATH, 'public/assets/webpack'); +const WEBPACK_PUBLIC_PATH = '/assets/webpack/'; +const SOURCEGRAPH_VERSION = require('@sourcegraph/code-host-integration/package.json').version; + +const SOURCEGRAPH_PATH = path.join('sourcegraph', SOURCEGRAPH_VERSION, '/'); +const SOURCEGRAPH_OUTPUT_PATH = path.join(WEBPACK_OUTPUT_PATH, SOURCEGRAPH_PATH); +const SOURCEGRAPH_PUBLIC_PATH = path.join(WEBPACK_PUBLIC_PATH, SOURCEGRAPH_PATH); +const IS_EE = require('./helpers/is_ee_env'); +const IS_JH = require('./helpers/is_jh_env'); + +module.exports.IS_EE = IS_EE; +module.exports.IS_JH = IS_JH; +module.exports.ROOT_PATH = ROOT_PATH; +module.exports.WEBPACK_OUTPUT_PATH = WEBPACK_OUTPUT_PATH; +module.exports.WEBPACK_PUBLIC_PATH = WEBPACK_PUBLIC_PATH; +module.exports.SOURCEGRAPH_OUTPUT_PATH = SOURCEGRAPH_OUTPUT_PATH; +module.exports.SOURCEGRAPH_PUBLIC_PATH = SOURCEGRAPH_PUBLIC_PATH; diff --git a/vite.config.ts b/vite.config.ts index 6b0472d8add6db..37292a8e1ed335 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -7,7 +7,8 @@ import graphql from '@rollup/plugin-graphql'; // eslint-disable-next-line import/no-unresolved import RubyPlugin from 'vite-plugin-ruby'; // @ts-ignore -import config, { IS_EE, IS_JH, SOURCEGRAPH_PUBLIC_PATH } from './config/webpack.config'; +import config from './config/webpack.config'; +import { IS_EE, IS_JH, SOURCEGRAPH_PUBLIC_PATH } from './config/webpack.constants'; const aliasArr = Object.entries(config.resolve.alias).map(([find, replacement]) => ({ find, -- GitLab From 996fe649e325fe116cdfa3f60bd2aad3860d5ba9 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Wed, 10 Aug 2022 15:54:53 +0400 Subject: [PATCH 07/89] Fix terser package conflict --- package.json | 3 ++- yarn.lock | 33 +++++++++++++++++++++++---------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index ec33137e00ac65..c4bfd1aea3c1bf 100644 --- a/package.json +++ b/package.json @@ -275,7 +275,8 @@ }, "resolutions": { "chokidar": "^3.5.3", - "@types/node": "14.17.5" + "@types/node": "14.17.5", + "terser": "5.4.0" }, "engines": { "node": ">=12.22.1", diff --git a/yarn.lock b/yarn.lock index 668eb617ff23b2..11c11fb63217c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11552,10 +11552,18 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@0.5.13, source-map-support@~0.5.12: - version "0.5.13" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" - integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== +source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12: + version "0.5.20" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" + integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@~0.5.19: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -11580,6 +11588,11 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== +source-map@~0.7.2: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" @@ -12069,14 +12082,14 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.1.2: - version "4.8.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" - integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== +terser@5.4.0, terser@^4.1.2: + version "5.4.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.4.0.tgz#9815c0839072d5c894e22c6fc508fbe9f5e7d7e8" + integrity sha512-3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ== dependencies: commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" + source-map "~0.7.2" + source-map-support "~0.5.19" test-exclude@^6.0.0: version "6.0.0" -- GitLab From 2514284789e7b5246f56f0a58d13e08a0689e260 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 12:11:50 +0400 Subject: [PATCH 08/89] Apply universal image urls in styles --- app/assets/stylesheets/emoji_sprites.scss | 4 ++-- app/assets/stylesheets/framework/diffs.scss | 18 +++++++++--------- .../stylesheets/framework/dropdowns.scss | 6 +++++- .../stylesheets/framework/typography.scss | 2 +- .../lazy_bundles/select2_overrides.scss | 4 ++-- app/assets/stylesheets/pages/issues.scss | 2 +- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/emoji_sprites.scss b/app/assets/stylesheets/emoji_sprites.scss index 5a5f39a4b77b9d..10bf54b4ffb51b 100644 --- a/app/assets/stylesheets/emoji_sprites.scss +++ b/app/assets/stylesheets/emoji_sprites.scss @@ -7176,7 +7176,7 @@ } .emoji-icon { - background-image: image-url('emoji.png'); + background-image: url('emoji.png'); background-repeat: no-repeat; color: transparent; text-indent: -99em; @@ -7190,7 +7190,7 @@ only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { - background-image: image-url('emoji@2x.png'); + background-image: url('emoji@2x.png'); background-size: 860px 840px; } /* stylelint-enable media-feature-name-no-vendor-prefix */ diff --git a/app/assets/stylesheets/framework/diffs.scss b/app/assets/stylesheets/framework/diffs.scss index f7cd5d7e183792..5f7150166bd7d2 100644 --- a/app/assets/stylesheets/framework/diffs.scss +++ b/app/assets/stylesheets/framework/diffs.scss @@ -261,7 +261,7 @@ width: 15px; position: absolute; top: 0; - background: image-url('swipemode_sprites.gif') 0 3px no-repeat; + background: url('swipemode_sprites.gif') 0 3px no-repeat; } .bottom-handle { @@ -270,7 +270,7 @@ width: 15px; position: absolute; bottom: 0; - background: image-url('swipemode_sprites.gif') 0 -11px no-repeat; + background: url('swipemode_sprites.gif') 0 -11px no-repeat; } } } @@ -308,7 +308,7 @@ left: 12px; height: 10px; width: 276px; - background: image-url('onion_skin_sprites.gif') -4px -20px repeat-x; + background: url('onion_skin_sprites.gif') -4px -20px repeat-x; } .dragger { @@ -318,7 +318,7 @@ top: 0; height: 14px; width: 14px; - background: image-url('onion_skin_sprites.gif') 0 -34px repeat-x; + background: url('onion_skin_sprites.gif') 0 -34px repeat-x; cursor: pointer; } @@ -329,7 +329,7 @@ right: 0; height: 10px; width: 10px; - background: image-url('onion_skin_sprites.gif') -2px 0 no-repeat; + background: url('onion_skin_sprites.gif') -2px 0 no-repeat; } .opaque { @@ -339,7 +339,7 @@ left: 0; height: 10px; width: 10px; - background: image-url('onion_skin_sprites.gif') -2px -10px no-repeat; + background: url('onion_skin_sprites.gif') -2px -10px no-repeat; } } } @@ -816,12 +816,12 @@ table.code { .frame.click-to-comment, .btn-transparent.image-diff-overlay-add-comment { position: relative; - cursor: image-url('illustrations/image_comment_light_cursor.svg') $image-comment-cursor-left-offset $image-comment-cursor-top-offset, + cursor: url('@gitlab/svgs/dist/illustrations/image_comment_light_cursor.svg') $image-comment-cursor-left-offset $image-comment-cursor-top-offset, auto; // Retina cursor - cursor: image-set(image-url('illustrations/image_comment_light_cursor.svg') 1x, - image-url('illustrations/image_comment_light_cursor@2x.svg') 2x) $image-comment-cursor-left-offset $image-comment-cursor-top-offset, + cursor: image-set(url('@gitlab/svgs/dist/illustrations/image_comment_light_cursor.svg') 1x, + url('@gitlab/svgs/dist/illustrations/image_comment_light_cursor@2x.svg') 2x) $image-comment-cursor-left-offset $image-comment-cursor-top-offset, auto; .comment-indicator { diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 41e20d57acd7e6..887a57e297ce7a 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -545,9 +545,13 @@ left: 1rem; width: 1rem; height: 1rem; - mask-image: url('icons-stacked.svg#check'); + -webkit-mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#check'); + mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#check'); + -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; + -webkit-mask-size: cover; mask-size: cover; + -webkit-mask-position: center center; mask-position: center center; background: $black-normal; } diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 9b5897b7df917b..50ffa7c87510d0 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -494,7 +494,7 @@ outline: none; &::after { - content: image-url('icon_anchor.svg'); + content: url('icon_anchor.svg'); visibility: hidden; } } diff --git a/app/assets/stylesheets/lazy_bundles/select2_overrides.scss b/app/assets/stylesheets/lazy_bundles/select2_overrides.scss index e3cec187fabb8b..c2de6e52ac9be4 100644 --- a/app/assets/stylesheets/lazy_bundles/select2_overrides.scss +++ b/app/assets/stylesheets/lazy_bundles/select2_overrides.scss @@ -191,7 +191,7 @@ input { padding: $grid-size; - background: transparent image-url('select2.png'); + background: transparent url('select2.png'); color: var(--gl-text-color, $gl-text-color); background-clip: content-box; background-origin: content-box; @@ -208,7 +208,7 @@ &.select2-active { background-color: var(--white, $white); - background-image: image-url('select2-spinner.gif') !important; + background-image: url('select2-spinner.gif') !important; background-origin: content-box; background-repeat: no-repeat; background-position: right 6px center !important; diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index c2ac4f3248037a..1b729f85cd55b2 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -242,7 +242,7 @@ ul.related-merge-requests > li gl-emoji { outline: none; &::after { - content: image-url('icon_anchor.svg'); + content: url('icon_anchor.svg'); visibility: hidden; } } -- GitLab From cd75bf89330ab7343a483a544cedd0d346adb29b Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 13:02:41 +0400 Subject: [PATCH 09/89] Disable vite assets precompile --- config/vite.rb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/vite.rb diff --git a/config/vite.rb b/config/vite.rb new file mode 100644 index 00000000000000..b488ea9f59425d --- /dev/null +++ b/config/vite.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +ViteRuby.env['VITE_RUBY_SKIP_ASSETS_PRECOMPILE_EXTENSION'] = 'true' -- GitLab From ece531f73c1774a63cf215b1df08052ece6caac2 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 13:48:19 +0400 Subject: [PATCH 10/89] Fix styles compile --- vite.config.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vite.config.ts b/vite.config.ts index 37292a8e1ed335..88d9cddf7c65e6 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -40,6 +40,10 @@ const fixedRubyPlugin = [ ...rest, ]; +const sassGlobals = ['framework/variables.scss', '@gitlab/ui/src/scss/bootstrap.scss']; + +const additionalData = sassGlobals.map((sassPath) => `@import "${sassPath}";`).join(''); + export default defineConfig({ resolve: { alias: [ @@ -77,6 +81,7 @@ export default defineConfig({ css: { preprocessorOptions: { scss: { + additionalData, includePaths: [stylesheetsPath, eePath, jhPath, gitlabUI], }, }, -- GitLab From 13bd0a5745c68c00a66e8a31d0177fb9393ab2ce Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 13:51:21 +0400 Subject: [PATCH 11/89] Try to disable vite for assets compile once again --- lib/tasks/gitlab/assets.rake | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake index d8c0b1007e63df..f5cd77ff12412e 100644 --- a/lib/tasks/gitlab/assets.rake +++ b/lib/tasks/gitlab/assets.rake @@ -78,6 +78,7 @@ namespace :gitlab do desc 'GitLab | Assets | Compile all frontend assets' task :compile do + ENV['VITE_RUBY_SKIP_ASSETS_PRECOMPILE_EXTENSION'] = 'true' require_dependency 'gitlab/task_helpers' puts "Assets SHA256 for `master`: #{Tasks::Gitlab::Assets.master_assets_sha256.inspect}" -- GitLab From a41be96060d9a1884ace530a4ab6c5d89f82a229 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 14:42:36 +0400 Subject: [PATCH 12/89] Fix styles compilation --- config/vite.json | 15 ++++++++++++++- vite.config.ts | 10 ++++++++-- yarn.lock | 28 +++++++++++++++++++--------- 3 files changed, 41 insertions(+), 12 deletions(-) diff --git a/config/vite.json b/config/vite.json index f4ae61a770c16f..e8a27dad4b0daa 100644 --- a/config/vite.json +++ b/config/vite.json @@ -4,7 +4,20 @@ "entrypointsDir": "javascripts/entries", "additionalEntrypoints": [ "~/images/**/*", - "~/stylesheets/**/*.scss", + "~/stylesheets/application.scss", + "~/stylesheets/application_dark.scss", + "~/stylesheets/application_utilities.scss", + "~/stylesheets/application_utilities_dark.scss", + "~/stylesheets/mailer.scss", + "~/stylesheets/mailers/highlighted_diff_email.scss", + "~/stylesheets/notify.scss", + "~/stylesheets/notify_enhanced.scss", + "~/stylesheets/performance_bar.scss", + "~/stylesheets/print.scss", + "~/stylesheets/disable_animations.scss", + "~/stylesheets/test_environment.scss", + "~/stylesheets/test_environment.scss", + "~/stylesheets/page_bundles/**/*.scss", "~/javascripts/pages/**/index.js" ], "watchAdditionalPaths": [], diff --git a/vite.config.ts b/vite.config.ts index 88d9cddf7c65e6..80917c4b941a73 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -40,7 +40,13 @@ const fixedRubyPlugin = [ ...rest, ]; -const sassGlobals = ['framework/variables.scss', '@gitlab/ui/src/scss/bootstrap.scss']; +const sassGlobals = [ + '@gitlab/ui/src/scss/variables.scss', + '@gitlab/ui/src/scss/bootstrap.scss', + '@gitlab/ui/src/scss/utility-mixins/index.scss', + 'framework/variables.scss', + 'bootstrap_migration.scss', +]; const additionalData = sassGlobals.map((sassPath) => `@import "${sassPath}";`).join(''); @@ -87,7 +93,7 @@ export default defineConfig({ }, }, define: { - process: {}, + // process: {}, IS_EE: IS_EE ? 'window.gon && window.gon.ee' : JSON.stringify(false), IS_JH: IS_JH ? 'window.gon && window.gon.jh' : JSON.stringify(false), 'process.env.SOURCEGRAPH_PUBLIC_PATH': JSON.stringify(SOURCEGRAPH_PUBLIC_PATH), diff --git a/yarn.lock b/yarn.lock index 11c11fb63217c6..89be366f44a8cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1882,20 +1882,25 @@ mkdirp "^1.0.4" "@nuxt/opencollective@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.2.tgz#83cb70cdb2bac5fad6f8c93529e7b11187d49c02" - integrity sha512-XG7rUdXG9fcafu9KTDIYjJSkRO38EwjlKYIb5TQ/0WDbiTUTtUtgncMscKOYzfsY86kGs05pAuMOR+3Fi0aN3A== + version "0.3.3" + resolved "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.3.tgz#80ff0eb8f6fca1d0ed5a089b9688f41bff2dd8ab" + integrity sha512-6IKCd+gP0HliixqZT/p8nW3tucD6Sv/u/eR2A9X4rxT/6hXlMzA4GZQzq4d2qnBAwSwGpmKyzkyTjNjrhaA25A== dependencies: chalk "^4.1.0" consola "^2.15.0" - node-fetch "^2.6.1" + node-fetch "^2.6.7" "@polka/url@^1.0.0-next.9": version "1.0.0-next.12" resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.12.tgz#431ec342a7195622f86688bbda82e3166ce8cb28" integrity sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ== -"@popperjs/core@^2.11.2", "@popperjs/core@^2.9.0": +"@popperjs/core@^2.11.2": + version "2.11.6" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" + integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== + +"@popperjs/core@^2.9.0": version "2.11.5" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64" integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw== @@ -3545,11 +3550,16 @@ bootstrap-vue@2.20.1: portal-vue "^2.1.7" vue-functional-data-merge "^3.1.0" -bootstrap@4.5.3, "bootstrap@>=4.5.3 <5.0.0": +bootstrap@4.5.3: version "4.5.3" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.3.tgz#c6a72b355aaf323920be800246a6e4ef30997fe6" integrity sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ== +"bootstrap@>=4.5.3 <5.0.0": + version "4.6.2" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479" + integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -12247,7 +12257,7 @@ tr46@^3.0.0: tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== traverse@^0.6.7: version "0.6.7" @@ -12972,7 +12982,7 @@ web-vitals@^0.2.4: webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== webidl-conversions@^7.0.0: version "7.0.0" @@ -13153,7 +13163,7 @@ whatwg-url@^11.0.0: whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== dependencies: tr46 "~0.0.3" webidl-conversions "^3.0.0" -- GitLab From ca6a3fb78c60441a0478f366c0aadd5a1b2bb1a6 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 14:48:17 +0400 Subject: [PATCH 13/89] Fix worker CSP policy for vite dev --- app/controllers/application_controller.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 19ee632a00d218..843e9cc7529f04 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -114,11 +114,16 @@ def self.endpoint_id_for_action(action_name) content_security_policy do |p| next if p.directives.blank? + if Gitlab.dev_or_test_env? && Feature.enabled?(:vite) - sources = p.directives['connect-src'] + connect_sources = p.directives['connect-src'] # TODO: the address should be taken from the vite common config - p.connect_src(*(Array.wrap(sources) | ['ws://gdk.test:3038'])) + p.connect_src(*(Array.wrap(connect_sources) | ['ws://gdk.test:3038'])) + + worker_sources = p.directives['worker-src'] + p.worker_src(*(Array.wrap(worker_sources) | [Gitlab::Utils.append_path(Gitlab.config.gitlab.url, 'vite-dev/')])) end + next unless Gitlab::CurrentSettings.snowplow_enabled? && !Gitlab::CurrentSettings.snowplow_collector_hostname.blank? default_connect_src = p.directives['connect-src'] || p.directives['default-src'] -- GitLab From b1eb89b01db412b5d1ea47f7c81b83cb7e972a11 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 17:00:07 +0400 Subject: [PATCH 14/89] Fix workers --- app/assets/javascripts/diffs/store/actions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index 58384860707859..9f90de9abde40c 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -52,7 +52,7 @@ import { isCollapsed } from '../utils/diff_file'; import { markFileReview, setReviewsForMergeRequest } from '../utils/file_reviews'; import { getDerivedMergeRequestInformation } from '../utils/merge_request'; import { queueRedisHllEvents } from '../utils/queue_events'; -import TreeWorker from '../workers/tree_worker.js?worker'; +import TreeWorker from '../workers/tree_worker?worker'; import * as types from './mutation_types'; import { getDiffPositionByLineCode, -- GitLab From 97993d1ae3234945e07a48850e91f6b09973d321 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 17:10:35 +0400 Subject: [PATCH 15/89] Fix globals in workers --- package.json | 3 +-- vite.config.ts | 9 ++++++--- yarn.lock | 19 +++++++------------ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index c4bfd1aea3c1bf..ec33137e00ac65 100644 --- a/package.json +++ b/package.json @@ -275,8 +275,7 @@ }, "resolutions": { "chokidar": "^3.5.3", - "@types/node": "14.17.5", - "terser": "5.4.0" + "@types/node": "14.17.5" }, "engines": { "node": ">=12.22.1", diff --git a/vite.config.ts b/vite.config.ts index 80917c4b941a73..e26ddaad3f2f2b 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -93,9 +93,12 @@ export default defineConfig({ }, }, define: { - // process: {}, - IS_EE: IS_EE ? 'window.gon && window.gon.ee' : JSON.stringify(false), - IS_JH: IS_JH ? 'window.gon && window.gon.jh' : JSON.stringify(false), + IS_EE: IS_EE + ? 'typeof window !== "undefined" && window.gon && window.gon.ee' + : JSON.stringify(false), + IS_JH: IS_JH + ? 'typeof window !== "undefined" && window.gon && window.gon.jh' + : JSON.stringify(false), 'process.env.SOURCEGRAPH_PUBLIC_PATH': JSON.stringify(SOURCEGRAPH_PUBLIC_PATH), }, }); diff --git a/yarn.lock b/yarn.lock index 89be366f44a8cf..0f2aa83b653b78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11570,7 +11570,7 @@ source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.1 buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@~0.5.19: +source-map-support@~0.5.12: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -11598,11 +11598,6 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== -source-map@~0.7.2: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== - sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" @@ -12092,14 +12087,14 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@5.4.0, terser@^4.1.2: - version "5.4.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.4.0.tgz#9815c0839072d5c894e22c6fc508fbe9f5e7d7e8" - integrity sha512-3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ== +terser@^4.1.2: + version "4.8.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" + integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== dependencies: commander "^2.20.0" - source-map "~0.7.2" - source-map-support "~0.5.19" + source-map "~0.6.1" + source-map-support "~0.5.12" test-exclude@^6.0.0: version "6.0.0" -- GitLab From 3791896fd934bd86dfdfbab269cd9cc0bb44c6f2 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 17:21:48 +0400 Subject: [PATCH 16/89] Fix vite compile in CI --- .gitlab/ci/frontend.gitlab-ci.yml | 1 + config/vite.rb | 3 --- lib/tasks/gitlab/assets.rake | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 config/vite.rb diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index 2e0d83187cf51a..27aa656032880f 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -11,6 +11,7 @@ # https://github.com/browserslist/browserslist/blob/a287ec6/node.js#L367-L384 BROWSERSLIST_IGNORE_OLD_DATA: "true" WEBPACK_COMPILE_LOG_PATH: "tmp/webpack-output.log" + VITE_RUBY_SKIP_ASSETS_PRECOMPILE_EXTENSION: "true" stage: prepare script: - yarn_install_script diff --git a/config/vite.rb b/config/vite.rb deleted file mode 100644 index b488ea9f59425d..00000000000000 --- a/config/vite.rb +++ /dev/null @@ -1,3 +0,0 @@ -# frozen_string_literal: true - -ViteRuby.env['VITE_RUBY_SKIP_ASSETS_PRECOMPILE_EXTENSION'] = 'true' diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake index f5cd77ff12412e..d8c0b1007e63df 100644 --- a/lib/tasks/gitlab/assets.rake +++ b/lib/tasks/gitlab/assets.rake @@ -78,7 +78,6 @@ namespace :gitlab do desc 'GitLab | Assets | Compile all frontend assets' task :compile do - ENV['VITE_RUBY_SKIP_ASSETS_PRECOMPILE_EXTENSION'] = 'true' require_dependency 'gitlab/task_helpers' puts "Assets SHA256 for `master`: #{Tasks::Gitlab::Assets.master_assets_sha256.inspect}" -- GitLab From a270a28635a6b09c229666b1d66ae98f4873d0f8 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 17:36:56 +0400 Subject: [PATCH 17/89] Fix Terser error in CI --- package.json | 3 ++- yarn.lock | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index ec33137e00ac65..c4bfd1aea3c1bf 100644 --- a/package.json +++ b/package.json @@ -275,7 +275,8 @@ }, "resolutions": { "chokidar": "^3.5.3", - "@types/node": "14.17.5" + "@types/node": "14.17.5", + "terser": "5.4.0" }, "engines": { "node": ">=12.22.1", diff --git a/yarn.lock b/yarn.lock index 0f2aa83b653b78..89be366f44a8cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11570,7 +11570,7 @@ source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.1 buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@~0.5.12: +source-map-support@~0.5.19: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -11598,6 +11598,11 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== +source-map@~0.7.2: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" @@ -12087,14 +12092,14 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.1.2: - version "4.8.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" - integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== +terser@5.4.0, terser@^4.1.2: + version "5.4.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.4.0.tgz#9815c0839072d5c894e22c6fc508fbe9f5e7d7e8" + integrity sha512-3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ== dependencies: commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" + source-map "~0.7.2" + source-map-support "~0.5.19" test-exclude@^6.0.0: version "6.0.0" -- GitLab From 8da4f3dc41a3e9b7f955598638c422ed0146a3f6 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 17:59:38 +0400 Subject: [PATCH 18/89] Try fix Terser version mismatch --- package.json | 2 +- yarn.lock | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index c4bfd1aea3c1bf..911bcf4a30163e 100644 --- a/package.json +++ b/package.json @@ -276,7 +276,7 @@ "resolutions": { "chokidar": "^3.5.3", "@types/node": "14.17.5", - "terser": "5.4.0" + "terser-webpack-plugin/terser": "4.8.1" }, "engines": { "node": ">=12.22.1", diff --git a/yarn.lock b/yarn.lock index 89be366f44a8cf..b2e763d358b9ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11570,7 +11570,7 @@ source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.1 buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@~0.5.19: +source-map-support@~0.5.12: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -11598,11 +11598,6 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== -source-map@~0.7.2: - version "0.7.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" - integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== - sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" @@ -12092,14 +12087,23 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@5.4.0, terser@^4.1.2: - version "5.4.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.4.0.tgz#9815c0839072d5c894e22c6fc508fbe9f5e7d7e8" - integrity sha512-3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ== +terser@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.1.2.tgz#b2656c8a506f7ce805a3f300a2ff48db022fa391" + integrity sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + +terser@^4.1.2: + version "4.8.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" + integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== dependencies: commander "^2.20.0" - source-map "~0.7.2" - source-map-support "~0.5.19" + source-map "~0.6.1" + source-map-support "~0.5.12" test-exclude@^6.0.0: version "6.0.0" -- GitLab From 4670ace1b8ead4503b4f5cb67061e399ce865446 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 18:04:12 +0400 Subject: [PATCH 19/89] Fix linter errors --- app/assets/javascripts/entries/jira_connect_app.js | 2 +- app/assets/javascripts/entries/main.js | 2 +- app/assets/javascripts/entries/performance_bar.js | 2 +- app/assets/javascripts/entries/redirect_listbox.js | 2 +- app/assets/javascripts/entries/sandboxed_mermaid.js | 2 +- app/assets/javascripts/entries/sentry.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/entries/jira_connect_app.js b/app/assets/javascripts/entries/jira_connect_app.js index 8647dd6e5b0caf..90ad39ea487b3b 100644 --- a/app/assets/javascripts/entries/jira_connect_app.js +++ b/app/assets/javascripts/entries/jira_connect_app.js @@ -1 +1 @@ -export * from '../jira_connect/subscriptions/index.js'; +import '../jira_connect/subscriptions'; diff --git a/app/assets/javascripts/entries/main.js b/app/assets/javascripts/entries/main.js index 3b3efd44ef7f69..b627bb195a9394 100644 --- a/app/assets/javascripts/entries/main.js +++ b/app/assets/javascripts/entries/main.js @@ -1 +1 @@ -import '../main.js'; +import '../main'; diff --git a/app/assets/javascripts/entries/performance_bar.js b/app/assets/javascripts/entries/performance_bar.js index 6aa39ed0887ef9..3f6fc6272d0ae7 100644 --- a/app/assets/javascripts/entries/performance_bar.js +++ b/app/assets/javascripts/entries/performance_bar.js @@ -1 +1 @@ -export { default } from '../performance_bar/index.js'; +import '../performance_bar'; diff --git a/app/assets/javascripts/entries/redirect_listbox.js b/app/assets/javascripts/entries/redirect_listbox.js index 6a57302cb69f4c..150b818bb452f4 100644 --- a/app/assets/javascripts/entries/redirect_listbox.js +++ b/app/assets/javascripts/entries/redirect_listbox.js @@ -1 +1 @@ -import '../entrypoints/behaviors/redirect_listbox.js'; +import '../entrypoints/behaviors/redirect_listbox'; diff --git a/app/assets/javascripts/entries/sandboxed_mermaid.js b/app/assets/javascripts/entries/sandboxed_mermaid.js index 7d2520ffc01e29..d3dd144ffba6d5 100644 --- a/app/assets/javascripts/entries/sandboxed_mermaid.js +++ b/app/assets/javascripts/entries/sandboxed_mermaid.js @@ -1 +1 @@ -export { default } from '../lib/mermaid.js'; +import '../lib/mermaid'; diff --git a/app/assets/javascripts/entries/sentry.js b/app/assets/javascripts/entries/sentry.js index 179994e7497c19..debafc6fab3972 100644 --- a/app/assets/javascripts/entries/sentry.js +++ b/app/assets/javascripts/entries/sentry.js @@ -1 +1 @@ -export { default } from '../sentry/index.js'; +import '../sentry/index'; -- GitLab From cf2730efe5b436ddb9fd18e245fcf0acb28af861 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 18:07:36 +0400 Subject: [PATCH 20/89] Try fix Terser resolutions --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 911bcf4a30163e..fbe288d7ae7a09 100644 --- a/package.json +++ b/package.json @@ -276,7 +276,8 @@ "resolutions": { "chokidar": "^3.5.3", "@types/node": "14.17.5", - "terser-webpack-plugin/terser": "4.8.1" + "terser-webpack-plugin/terser": "^4.1.2", + "vite/terser": "^5.4.0" }, "engines": { "node": ">=12.22.1", -- GitLab From 71111c7653936de0812cb3c9a46c613592baeada Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 18:23:37 +0400 Subject: [PATCH 21/89] Skip prefixing CSS for now --- app/assets/stylesheets/framework/dropdowns.scss | 4 ---- app/assets/stylesheets/pages/notes.scss | 4 ---- 2 files changed, 8 deletions(-) diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 887a57e297ce7a..d41c6b82af38ed 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -545,13 +545,9 @@ left: 1rem; width: 1rem; height: 1rem; - -webkit-mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#check'); mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#check'); - -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; - -webkit-mask-size: cover; mask-size: cover; - -webkit-mask-position: center center; mask-position: center center; background: $black-normal; } diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index ca7cea3a346eb2..1b9f738c84d045 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -984,13 +984,9 @@ $system-note-svg-size: 1rem; .unified-diff-components-diff-note-button { &::before { background-color: $blue-500; - -webkit-mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#comment'); mask-image: url('@gitlab/svgs/dist/icons-stacked.svg#comment'); - -webkit-mask-repeat: no-repeat; mask-repeat: no-repeat; - -webkit-mask-size: cover; mask-size: cover; - -webkit-mask-position: center; mask-position: center; content: ''; width: 12px; -- GitLab From 488131b3c432ea76525ad0494ea15bf0beab34ee Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 18:26:16 +0400 Subject: [PATCH 22/89] Skip extensions in SASS for now --- app/assets/stylesheets/application.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f912d858332b20..5ffb84c9788883 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -13,10 +13,10 @@ @import 'page_specific_files'; // Component specific styles, will be moved to gitlab-ui -@import './components/index.sass'; +@import './components/index'; // Vendors specific styles -@import './vendors/atwho.scss'; +@import './vendors/atwho'; // Styles for JS behaviors. @import 'behaviors'; -- GitLab From fe1e7e0487f9ad54727d9979392f679521bbf00b Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 18:27:47 +0400 Subject: [PATCH 23/89] Fix eslint --- app/assets/javascripts/locale/ensure_single_line.cjs | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/locale/ensure_single_line.cjs b/app/assets/javascripts/locale/ensure_single_line.cjs index d9f732d9254eca..db1b0829cf0b5f 100644 --- a/app/assets/javascripts/locale/ensure_single_line.cjs +++ b/app/assets/javascripts/locale/ensure_single_line.cjs @@ -1,5 +1,3 @@ -/* eslint-disable import/no-commonjs */ - const SPLIT_REGEX = /\s*[\r\n]+\s*/; /** -- GitLab From e8ae3bf43cd8ab4c419153ae447a9c09b0478cdf Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 18:36:17 +0400 Subject: [PATCH 24/89] Disable Vite in feature tests --- spec/spec_helper.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2d3afb489df08a..743a02cb1a0414 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -312,6 +312,10 @@ # dashboard page to Vue. https://gitlab.com/gitlab-org/gitlab/-/issues/379025 stub_feature_flags(vue_issues_dashboard: false) + # Rely on Webpack during testing + stub_feature_flags(vite: false) + stub_feature_flags(vite_stylesheets: false) + allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged) else unstub_all_feature_flags -- GitLab From e1399beeb8f56d34dbf12ed1bc6ec1e02d807255 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 19:09:53 +0400 Subject: [PATCH 25/89] Try to fix lockfile --- yarn.lock | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/yarn.lock b/yarn.lock index b2e763d358b9ef..bdb5c06dccb12a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1812,6 +1812,14 @@ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== +"@jridgewell/source-map@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" + integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.11" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" @@ -11570,7 +11578,7 @@ source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.1 buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@~0.5.12: +source-map-support@~0.5.12, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -12087,15 +12095,6 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.1.2.tgz#b2656c8a506f7ce805a3f300a2ff48db022fa391" - integrity sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" - terser@^4.1.2: version "4.8.1" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" @@ -12105,6 +12104,16 @@ terser@^4.1.2: source-map "~0.6.1" source-map-support "~0.5.12" +terser@^5.4.0: + version "5.14.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" + integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== + dependencies: + "@jridgewell/source-map" "^0.3.2" + acorn "^8.5.0" + commander "^2.20.0" + source-map-support "~0.5.20" + test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" -- GitLab From 84215cd06f9c544ac0c24c1f3e777bb4917a54d9 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 20:04:28 +0400 Subject: [PATCH 26/89] Try forcing Terser webpack plugin version --- package.json | 3 +- yarn.lock | 362 +++++++++------------------------------------------ 2 files changed, 66 insertions(+), 299 deletions(-) diff --git a/package.json b/package.json index fbe288d7ae7a09..e2af8d1b73fd63 100644 --- a/package.json +++ b/package.json @@ -276,8 +276,7 @@ "resolutions": { "chokidar": "^3.5.3", "@types/node": "14.17.5", - "terser-webpack-plugin/terser": "^4.1.2", - "vite/terser": "^5.4.0" + "webpack/terser-webpack-plugin": "^4.2.3" }, "engines": { "node": ">=12.22.1", diff --git a/yarn.lock b/yarn.lock index bdb5c06dccb12a..9fe1bd14e30fc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3743,27 +3743,6 @@ bytes@3.1.2: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -cacache@^12.0.2: - version "12.0.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" - integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - infer-owner "^1.0.3" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - cacache@^15.0.5: version "15.0.5" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" @@ -3932,11 +3911,6 @@ cheerio@^1.0.0-rc.9: optionalDependencies: fsevents "~2.3.2" -chownr@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" - integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== - chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" @@ -4167,16 +4141,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@^1.5.0: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - condense-newlines@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f" @@ -4257,18 +4221,6 @@ cookie@0.4.2: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== -copy-concurrently@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" - integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== - dependencies: - aproba "^1.1.1" - fs-write-stream-atomic "^1.0.8" - iferr "^0.1.5" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.0" - copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" @@ -4583,11 +4535,6 @@ custom-jquery-matchers@^2.1.0: resolved "https://registry.yarnpkg.com/custom-jquery-matchers/-/custom-jquery-matchers-2.1.0.tgz#e5988fa9715c416b0986b372563f872d9e91e024" integrity sha512-f2vQrncnwqbeDne9ag/BRjrmG9BxIEKnZ9Z8TyG5l9B8wwyINWd7LvuHDlTkMPqLTd3ghcvqFoTsxjhOP371JQ== -cyclist@~0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" - integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA= - d3-array@1, "d3-array@1 - 2", d3-array@^1.1.1, d3-array@^1.2.0: version "1.2.4" resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" @@ -5483,16 +5430,6 @@ duplexer@^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" - integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== - dependencies: - end-of-stream "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.0" - stream-shift "^1.0.0" - echarts@^5.3.2: version "5.3.3" resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.3.3.tgz#df97b09c4c0e2ffcdfb44acf518d50c50e0b838e" @@ -5559,13 +5496,6 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -end-of-stream@^1.0.0, end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== - dependencies: - once "^1.4.0" - ends-with@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz#2f9da98d57a50cfda4571ce4339000500f4e6b8a" @@ -5604,7 +5534,7 @@ envinfo@^7.7.3: resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== -errno@^0.1.3, errno@~0.1.7: +errno@^0.1.3: version "0.1.7" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== @@ -6315,11 +6245,6 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -figgy-pudding@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" - integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -6365,15 +6290,6 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-cache-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" - integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== - dependencies: - commondir "^1.0.1" - make-dir "^2.0.0" - pkg-dir "^3.0.0" - find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" @@ -6388,6 +6304,13 @@ find-root@^1.1.0: resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== +find-up@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" + integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= + dependencies: + locate-path "^2.0.0" + find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -6431,14 +6354,6 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== -flush-write-stream@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" - integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== - dependencies: - inherits "^2.0.3" - readable-stream "^2.3.6" - follow-redirects@^1.0.0, follow-redirects@^1.14.4: version "1.14.8" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" @@ -6500,14 +6415,6 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= -from2@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -6529,16 +6436,6 @@ fs-monkey@1.0.3: resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== -fs-write-stream-atomic@^1.0.8: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" - integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= - dependencies: - graceful-fs "^4.1.2" - iferr "^0.1.5" - imurmurhash "^0.1.4" - readable-stream "1 || 2" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -6762,7 +6659,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -7227,11 +7124,6 @@ ieee754@^1.1.13, ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -iferr@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" - integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= - iframe-resizer@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/iframe-resizer/-/iframe-resizer-4.3.2.tgz#42dd88345d18b9e377b6044dddb98c664ab0ce6b" @@ -7293,7 +7185,7 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -infer-owner@^1.0.3, infer-owner@^1.0.4: +infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== @@ -7665,11 +7557,6 @@ is-windows@^1.0.2: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== -is-wsl@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= - is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -8150,6 +8037,20 @@ jest-watcher@^28.1.3: jest-util "^28.1.3" string-length "^4.0.1" +jest-worker@^26.5.0: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^7.0.0" + +jest-worker@^27.5.1: + version "27.5.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" + integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== + jest-worker@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98" @@ -8453,6 +8354,14 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" +locate-path@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" + integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= + dependencies: + p-locate "^2.0.0" + path-exists "^3.0.0" + locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -8644,13 +8553,6 @@ lru-cache@^4.1.2, lru-cache@^4.1.5: pseudomap "^1.0.2" yallist "^2.1.2" -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== - dependencies: - yallist "^3.0.2" - lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -8670,14 +8572,6 @@ magic-string@^0.25.3, magic-string@^0.25.7: dependencies: sourcemap-codec "^1.4.8" -make-dir@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" - integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== - dependencies: - pify "^4.0.1" - semver "^5.6.0" - make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -9504,22 +9398,6 @@ miragejs@^0.1.40: lodash.values "^4.3.0" pretender "^3.4.3" -mississippi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" - integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== - dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^3.0.0" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.0.0" - mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -9600,18 +9478,6 @@ mousetrap@1.6.5: resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9" integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA== -move-concurrently@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" - integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= - dependencies: - aproba "^1.1.1" - copy-concurrently "^1.0.0" - fs-write-stream-atomic "^1.0.8" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.3" - mri@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" @@ -9903,7 +9769,7 @@ on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -10006,6 +9872,13 @@ p-limit@3.1.0, p-limit@^3.0.2, p-limit@^3.1.0: dependencies: yocto-queue "^0.1.0" +p-limit@^1.1.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" + integrity sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng== + dependencies: + p-try "^1.0.0" + p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -10013,6 +9886,13 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" +p-locate@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" + integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + dependencies: + p-limit "^1.1.0" + p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -10064,15 +9944,6 @@ papaparse@^5.3.1: resolved "https://registry.yarnpkg.com/papaparse/-/papaparse-5.3.1.tgz#770b7a9124d821d4b2132132b7bd7dce7194b5b1" integrity sha512-Dbt2yjLJrCwH2sRqKFFJaN5XgIASO9YOFeFP8rIBRG2Ain8mqk5r1M6DkfvqEVozVcz3r3HaUGw253hA1nLIcA== -parallel-transform@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06" - integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY= - dependencies: - cyclist "~0.2.2" - inherits "^2.0.3" - readable-stream "^2.1.5" - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -10226,11 +10097,6 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatc resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pify@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" - integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== - pikaday@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/pikaday/-/pikaday-1.8.0.tgz#ce930e257042e852e6aadee1115e01554b2d71c5" @@ -10241,13 +10107,6 @@ pirates@^4.0.4: resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== -pkg-dir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" - integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== - dependencies: - find-up "^3.0.0" - pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -10618,31 +10477,6 @@ public-encrypt@^4.0.0: parse-asn1 "^5.0.0" randombytes "^2.0.1" -pump@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pumpify@^1.3.3: - version "1.5.1" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" - integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== - dependencies: - duplexify "^3.6.0" - inherits "^2.0.3" - pump "^2.0.0" - punycode@1.3.2, punycode@^1.2.4: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" @@ -10780,7 +10614,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.3.3, readable-stream@^2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -11038,7 +10872,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^2.5.4, rimraf@^2.6.3: +rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -11122,13 +10956,6 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -run-queue@^1.0.0, run-queue@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" - integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= - dependencies: - aproba "^1.1.1" - rw@1: version "1.3.3" resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" @@ -11578,7 +11405,7 @@ source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.1 buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@~0.5.12, source-map-support@~0.5.20: +source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -11677,13 +11504,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -ssri@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" - integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== - dependencies: - figgy-pudding "^3.5.1" - ssri@^8.0.0: version "8.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" @@ -11724,14 +11544,6 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" -stream-each@^1.1.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd" - integrity sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA== - dependencies: - end-of-stream "^1.1.0" - stream-shift "^1.0.0" - stream-http@^2.7.2: version "2.8.2" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.2.tgz#4126e8c6b107004465918aa2fc35549e77402c87" @@ -11743,11 +11555,6 @@ stream-http@^2.7.2: to-arraybuffer "^1.0.0" xtend "^4.0.0" -stream-shift@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" - integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= - string-env-interpolation@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152" @@ -12080,31 +11887,22 @@ terminal-link@^2.0.0: ansi-escapes "^4.2.1" supports-hyperlinks "^2.0.0" -terser-webpack-plugin@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" - integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA== +terser-webpack-plugin@^1.4.3, terser-webpack-plugin@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a" + integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ== dependencies: - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^2.1.2" + cacache "^15.0.5" + find-cache-dir "^3.3.1" + jest-worker "^26.5.0" + p-limit "^3.0.2" + schema-utils "^3.0.0" + serialize-javascript "^5.0.1" source-map "^0.6.1" - terser "^4.1.2" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" - -terser@^4.1.2: - version "4.8.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" - integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" + terser "^5.3.4" + webpack-sources "^1.4.3" -terser@^5.4.0: +terser@^5.3.4: version "5.14.2" resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== @@ -12138,14 +11936,6 @@ throttle-debounce@^2.1.0: resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz#257e648f0a56bd9e54fe0f132c4ab8611df4e1d5" integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg== -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - thunky@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" @@ -12421,11 +12211,6 @@ typed-array-length@^1.0.4: for-each "^0.3.3" is-typed-array "^1.1.9" -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - "typescript@2 - 4": version "4.1.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72" @@ -13089,7 +12874,7 @@ webpack-merge@^5.7.3: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: +webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -13233,13 +13018,6 @@ word-wrap@^1.2.3, word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -worker-farm@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" - integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== - dependencies: - errno "~0.1.7" - worker-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac" @@ -13312,7 +13090,7 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xtend@^4.0.0, xtend@~4.0.1: +xtend@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -13322,11 +13100,6 @@ xterm@3.14.5: resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.14.5.tgz#c9d14e48be6873aa46fb429f22f2165557fd2dea" integrity sha512-DVmQ8jlEtL+WbBKUZuMxHMBgK/yeIZwkXB81bH+MGaKKnJGYwA+770hzhXPfwEIokK9On9YIFPRleVp/5G7z9g== -y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== - y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -13337,11 +13110,6 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== -yallist@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" - integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== - yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" -- GitLab From 6452d8a1932e884001a83b52ebddf309834dd828 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 20:45:38 +0400 Subject: [PATCH 27/89] Revert "Try forcing Terser webpack plugin version" This reverts commit 22d2c08e5d1d7d5337a58449292426d4bd9955f1. --- package.json | 3 +- yarn.lock | 336 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 307 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index e2af8d1b73fd63..fbe288d7ae7a09 100644 --- a/package.json +++ b/package.json @@ -276,7 +276,8 @@ "resolutions": { "chokidar": "^3.5.3", "@types/node": "14.17.5", - "webpack/terser-webpack-plugin": "^4.2.3" + "terser-webpack-plugin/terser": "^4.1.2", + "vite/terser": "^5.4.0" }, "engines": { "node": ">=12.22.1", diff --git a/yarn.lock b/yarn.lock index 9fe1bd14e30fc3..a04cc487e1f543 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3743,6 +3743,27 @@ bytes@3.1.2: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== +cacache@^12.0.2: + version "12.0.3" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390" + integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw== + dependencies: + bluebird "^3.5.5" + chownr "^1.1.1" + figgy-pudding "^3.5.1" + glob "^7.1.4" + graceful-fs "^4.1.15" + infer-owner "^1.0.3" + lru-cache "^5.1.1" + mississippi "^3.0.0" + mkdirp "^0.5.1" + move-concurrently "^1.0.1" + promise-inflight "^1.0.1" + rimraf "^2.6.3" + ssri "^6.0.1" + unique-filename "^1.1.1" + y18n "^4.0.0" + cacache@^15.0.5: version "15.0.5" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" @@ -3911,6 +3932,11 @@ cheerio@^1.0.0-rc.9: optionalDependencies: fsevents "~2.3.2" +chownr@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" + integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== + chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" @@ -4141,6 +4167,16 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +concat-stream@^1.5.0: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + condense-newlines@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f" @@ -4221,6 +4257,18 @@ cookie@0.4.2: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432" integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA== +copy-concurrently@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" + integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== + dependencies: + aproba "^1.1.1" + fs-write-stream-atomic "^1.0.8" + iferr "^0.1.5" + mkdirp "^0.5.1" + rimraf "^2.5.4" + run-queue "^1.0.0" + copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" @@ -4535,6 +4583,11 @@ custom-jquery-matchers@^2.1.0: resolved "https://registry.yarnpkg.com/custom-jquery-matchers/-/custom-jquery-matchers-2.1.0.tgz#e5988fa9715c416b0986b372563f872d9e91e024" integrity sha512-f2vQrncnwqbeDne9ag/BRjrmG9BxIEKnZ9Z8TyG5l9B8wwyINWd7LvuHDlTkMPqLTd3ghcvqFoTsxjhOP371JQ== +cyclist@~0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640" + integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA= + d3-array@1, "d3-array@1 - 2", d3-array@^1.1.1, d3-array@^1.2.0: version "1.2.4" resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" @@ -5430,6 +5483,16 @@ duplexer@^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" + integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== + dependencies: + end-of-stream "^1.0.0" + inherits "^2.0.1" + readable-stream "^2.0.0" + stream-shift "^1.0.0" + echarts@^5.3.2: version "5.3.3" resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.3.3.tgz#df97b09c4c0e2ffcdfb44acf518d50c50e0b838e" @@ -5496,6 +5559,13 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +end-of-stream@^1.0.0, end-of-stream@^1.1.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" + integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== + dependencies: + once "^1.4.0" + ends-with@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/ends-with/-/ends-with-0.2.0.tgz#2f9da98d57a50cfda4571ce4339000500f4e6b8a" @@ -5534,7 +5604,7 @@ envinfo@^7.7.3: resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== -errno@^0.1.3: +errno@^0.1.3, errno@~0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg== @@ -6245,6 +6315,11 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" +figgy-pudding@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790" + integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w== + file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -6290,6 +6365,15 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" +find-cache-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" + integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== + dependencies: + commondir "^1.0.1" + make-dir "^2.0.0" + pkg-dir "^3.0.0" + find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" @@ -6354,6 +6438,14 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== +flush-write-stream@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" + integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== + dependencies: + inherits "^2.0.3" + readable-stream "^2.3.6" + follow-redirects@^1.0.0, follow-redirects@^1.14.4: version "1.14.8" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" @@ -6415,6 +6507,14 @@ fresh@0.5.2: resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= +from2@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" + integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= + dependencies: + inherits "^2.0.1" + readable-stream "^2.0.0" + fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -6436,6 +6536,16 @@ fs-monkey@1.0.3: resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== +fs-write-stream-atomic@^1.0.8: + version "1.0.10" + resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" + integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= + dependencies: + graceful-fs "^4.1.2" + iferr "^0.1.5" + imurmurhash "^0.1.4" + readable-stream "1 || 2" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -6659,7 +6769,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -7124,6 +7234,11 @@ ieee754@^1.1.13, ieee754@^1.1.4: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== +iferr@^0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" + integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= + iframe-resizer@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/iframe-resizer/-/iframe-resizer-4.3.2.tgz#42dd88345d18b9e377b6044dddb98c664ab0ce6b" @@ -7185,7 +7300,7 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -infer-owner@^1.0.4: +infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== @@ -7557,6 +7672,11 @@ is-windows@^1.0.2: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== +is-wsl@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" + integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= + is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -8037,15 +8157,6 @@ jest-watcher@^28.1.3: jest-util "^28.1.3" string-length "^4.0.1" -jest-worker@^26.5.0: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" - integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - jest-worker@^27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" @@ -8370,6 +8481,14 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -8553,6 +8672,13 @@ lru-cache@^4.1.2, lru-cache@^4.1.5: pseudomap "^1.0.2" yallist "^2.1.2" +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -8572,6 +8698,14 @@ magic-string@^0.25.3, magic-string@^0.25.7: dependencies: sourcemap-codec "^1.4.8" +make-dir@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -9398,6 +9532,22 @@ miragejs@^0.1.40: lodash.values "^4.3.0" pretender "^3.4.3" +mississippi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" + integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== + dependencies: + concat-stream "^1.5.0" + duplexify "^3.4.2" + end-of-stream "^1.1.0" + flush-write-stream "^1.0.0" + from2 "^2.1.0" + parallel-transform "^1.1.0" + pump "^3.0.0" + pumpify "^1.3.3" + stream-each "^1.1.0" + through2 "^2.0.0" + mixin-deep@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" @@ -9478,6 +9628,18 @@ mousetrap@1.6.5: resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9" integrity sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA== +move-concurrently@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" + integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= + dependencies: + aproba "^1.1.1" + copy-concurrently "^1.0.0" + fs-write-stream-atomic "^1.0.8" + mkdirp "^0.5.1" + rimraf "^2.5.4" + run-queue "^1.0.3" + mri@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" @@ -9769,7 +9931,7 @@ on-headers@~1.0.2: resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== -once@^1.3.0: +once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -9944,6 +10106,15 @@ papaparse@^5.3.1: resolved "https://registry.yarnpkg.com/papaparse/-/papaparse-5.3.1.tgz#770b7a9124d821d4b2132132b7bd7dce7194b5b1" integrity sha512-Dbt2yjLJrCwH2sRqKFFJaN5XgIASO9YOFeFP8rIBRG2Ain8mqk5r1M6DkfvqEVozVcz3r3HaUGw253hA1nLIcA== +parallel-transform@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06" + integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY= + dependencies: + cyclist "~0.2.2" + inherits "^2.0.3" + readable-stream "^2.1.5" + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -10097,6 +10268,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatc resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + pikaday@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/pikaday/-/pikaday-1.8.0.tgz#ce930e257042e852e6aadee1115e01554b2d71c5" @@ -10107,6 +10283,13 @@ pirates@^4.0.4: resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== +pkg-dir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" + integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== + dependencies: + find-up "^3.0.0" + pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -10477,6 +10660,31 @@ public-encrypt@^4.0.0: parse-asn1 "^5.0.0" randombytes "^2.0.1" +pump@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" + integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +pumpify@^1.3.3: + version "1.5.1" + resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" + integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== + dependencies: + duplexify "^3.6.0" + inherits "^2.0.3" + pump "^2.0.0" + punycode@1.3.2, punycode@^1.2.4: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" @@ -10614,7 +10822,7 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.3.3, readable-stream@^2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -10872,7 +11080,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -10956,6 +11164,13 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" +run-queue@^1.0.0, run-queue@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" + integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= + dependencies: + aproba "^1.1.1" + rw@1: version "1.3.3" resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" @@ -11405,7 +11620,7 @@ source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.1 buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@~0.5.20: +source-map-support@~0.5.12, source-map-support@~0.5.20: version "0.5.21" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== @@ -11504,6 +11719,13 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= +ssri@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== + dependencies: + figgy-pudding "^3.5.1" + ssri@^8.0.0: version "8.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" @@ -11544,6 +11766,14 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" +stream-each@^1.1.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd" + integrity sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA== + dependencies: + end-of-stream "^1.1.0" + stream-shift "^1.0.0" + stream-http@^2.7.2: version "2.8.2" resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.2.tgz#4126e8c6b107004465918aa2fc35549e77402c87" @@ -11555,6 +11785,11 @@ stream-http@^2.7.2: to-arraybuffer "^1.0.0" xtend "^4.0.0" +stream-shift@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" + integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= + string-env-interpolation@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152" @@ -11887,22 +12122,31 @@ terminal-link@^2.0.0: ansi-escapes "^4.2.1" supports-hyperlinks "^2.0.0" -terser-webpack-plugin@^1.4.3, terser-webpack-plugin@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a" - integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ== +terser-webpack-plugin@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c" + integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA== dependencies: - cacache "^15.0.5" - find-cache-dir "^3.3.1" - jest-worker "^26.5.0" - p-limit "^3.0.2" - schema-utils "^3.0.0" - serialize-javascript "^5.0.1" + cacache "^12.0.2" + find-cache-dir "^2.1.0" + is-wsl "^1.1.0" + schema-utils "^1.0.0" + serialize-javascript "^2.1.2" source-map "^0.6.1" - terser "^5.3.4" - webpack-sources "^1.4.3" + terser "^4.1.2" + webpack-sources "^1.4.0" + worker-farm "^1.7.0" -terser@^5.3.4: +terser@^4.1.2: + version "4.8.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f" + integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + +terser@^5.4.0: version "5.14.2" resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== @@ -11936,6 +12180,14 @@ throttle-debounce@^2.1.0: resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz#257e648f0a56bd9e54fe0f132c4ab8611df4e1d5" integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg== +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + thunky@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" @@ -12211,6 +12463,11 @@ typed-array-length@^1.0.4: for-each "^0.3.3" is-typed-array "^1.1.9" +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + "typescript@2 - 4": version "4.1.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72" @@ -12874,7 +13131,7 @@ webpack-merge@^5.7.3: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@^1.4.1, webpack-sources@^1.4.3: +webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -13018,6 +13275,13 @@ word-wrap@^1.2.3, word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +worker-farm@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" + integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== + dependencies: + errno "~0.1.7" + worker-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac" @@ -13090,7 +13354,7 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xtend@^4.0.0: +xtend@^4.0.0, xtend@~4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== @@ -13100,6 +13364,11 @@ xterm@3.14.5: resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.14.5.tgz#c9d14e48be6873aa46fb429f22f2165557fd2dea" integrity sha512-DVmQ8jlEtL+WbBKUZuMxHMBgK/yeIZwkXB81bH+MGaKKnJGYwA+770hzhXPfwEIokK9On9YIFPRleVp/5G7z9g== +y18n@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== + y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -13110,6 +13379,11 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== +yallist@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" + integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" -- GitLab From 425d62b733baa80133eb37fcc3a7cee169c29192 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 22:53:44 +0400 Subject: [PATCH 28/89] Move vite_rails gem into development group --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 90ad441f5e89f9..1f317bc63bb2c8 100644 --- a/Gemfile +++ b/Gemfile @@ -389,6 +389,7 @@ group :development do gem 'sprite-factory', '~> 1.7' gem "listen", "~> 3.7" + gem 'vite_rails' end group :development, :test do -- GitLab From 2d039a538c2e235b41a5918f2bb0cf3d026c69ab Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 22:57:42 +0400 Subject: [PATCH 29/89] Add compatibility for vite_ruby gem --- config/application.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/application.rb b/config/application.rb index 5358c5d5b194ca..d9a061182bdd90 100644 --- a/config/application.rb +++ b/config/application.rb @@ -18,6 +18,10 @@ module Gitlab class Application < Rails::Application config.load_defaults 6.1 + # ensure compatibility with vite_ruby gem + # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#project-structure + config.autoloader = :classic + config.active_support.hash_digest_class = ::OpenSSL::Digest::SHA256 # This section contains configuration from Rails upgrades to override the new defaults so that we -- GitLab From bfdef0fb02e3b3b1fdf55fb6438b1aca6548395c Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 23:07:12 +0400 Subject: [PATCH 30/89] Revert "Add compatibility for vite_ruby gem" This reverts commit e9964b824fdac9b76cc8a56a38978bb47ecb6b4b. --- config/application.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/application.rb b/config/application.rb index d9a061182bdd90..5358c5d5b194ca 100644 --- a/config/application.rb +++ b/config/application.rb @@ -18,10 +18,6 @@ module Gitlab class Application < Rails::Application config.load_defaults 6.1 - # ensure compatibility with vite_ruby gem - # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#project-structure - config.autoloader = :classic - config.active_support.hash_digest_class = ::OpenSSL::Digest::SHA256 # This section contains configuration from Rails upgrades to override the new defaults so that we -- GitLab From 46634874c2fa729e798e8e47d22b8349f6e77fde Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 11 Aug 2022 23:58:37 +0400 Subject: [PATCH 31/89] Fix vite_ruby compatibility with derailed_benchmarks --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2a2aad2a67a848..e8b79d5899c1fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1550,7 +1550,7 @@ GEM vite_rails (3.0.10) railties (>= 5.1, < 8) vite_ruby (~> 3.0) - vite_ruby (3.2.0) + vite_ruby (3.2.1) dry-cli (~> 0.7.0) rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) -- GitLab From bb4033e6bf5d3ef6edbae8ea35c0238ad25ef2ca Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 12 Aug 2022 00:17:43 +0400 Subject: [PATCH 32/89] Revert "Move vite_rails gem into development group" This reverts commit b71896b71bd0022a2b0cc5ee89d65997efedcb5e. --- Gemfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile b/Gemfile index 1f317bc63bb2c8..90ad441f5e89f9 100644 --- a/Gemfile +++ b/Gemfile @@ -389,7 +389,6 @@ group :development do gem 'sprite-factory', '~> 1.7' gem "listen", "~> 3.7" - gem 'vite_rails' end group :development, :test do -- GitLab From 7be54b78bd5d853cb77e976cca0af89fb5bffee4 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 12 Aug 2022 00:57:51 +0400 Subject: [PATCH 33/89] Use universal path to stylesheet --- app/helpers/vite_helper.rb | 34 +++++++++++++--------- app/views/layouts/_loading_hints.html.haml | 10 +++---- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/app/helpers/vite_helper.rb b/app/helpers/vite_helper.rb index 09eed5bfc87fac..b6cfd7a408a9cf 100644 --- a/app/helpers/vite_helper.rb +++ b/app/helpers/vite_helper.rb @@ -29,30 +29,38 @@ def vite_controller_bundle_tags end def universal_javascript_include_tag(*args) - return vite_javascript_tag(*args) if Feature.enabled?(:vite) - - javascript_include_tag(*args) + if Feature.enabled?(:vite) + vite_javascript_tag(*args) + else + javascript_include_tag(*args) + end end def universal_asset_path(*args) - return vite_asset_path(*args) if Feature.enabled?(:vite) - - asset_path(*args) + if Feature.enabled?(:vite) + vite_asset_path(*args) + else + asset_path(*args) + end end def universal_stylesheet_link_tag(*args) - return vite_stylesheet_tag(*args) if Feature.enabled?(:vite_stylesheets) - - stylesheet_link_tag(*args) + if Feature.enabled?(:vite_stylesheets) + vite_stylesheet_tag(*args) + else + stylesheet_link_tag(*args) + end end def vite_stylesheet_tag(path, *args) super("stylesheets/#{path}.scss", *args) end - def path_to_stylesheet(path, *args) - return vite_asset_url("stylesheets/#{path}.scss", *args) if Feature.enabled?(:vite_stylesheets) - - super(path, *args) + def universal_path_to_stylesheet(path, *args) + if Feature.enabled?(:vite_stylesheets) + vite_asset_url("stylesheets/#{path}.scss", *args) + else + path_to_stylesheet(path, *args) + end end end diff --git a/app/views/layouts/_loading_hints.html.haml b/app/views/layouts/_loading_hints.html.haml index a9ce82ad38ad40..428f872dc0100b 100644 --- a/app/views/layouts/_loading_hints.html.haml +++ b/app/views/layouts/_loading_hints.html.haml @@ -5,12 +5,12 @@ %link{ rel: 'dns-prefetch', href: ActionController::Base.asset_host } %link{ rel: 'preconnect', href: ActionController::Base.asset_host, crossorigin: '' } - if user_application_theme == 'gl-dark' - = preload_link_tag(path_to_stylesheet('application_utilities_dark'), crossorigin: css_crossorigin, as: "style") - = preload_link_tag(path_to_stylesheet('application_dark'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(universal_path_to_stylesheet('application_utilities_dark'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(universal_path_to_stylesheet('application_dark'), crossorigin: css_crossorigin, as: "style") - else - = preload_link_tag(path_to_stylesheet('application_utilities'), crossorigin: css_crossorigin, as: "style") - = preload_link_tag(path_to_stylesheet('application'), crossorigin: css_crossorigin, as: "style") - = preload_link_tag(path_to_stylesheet("highlight/themes/#{user_color_scheme}"), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(universal_path_to_stylesheet('application_utilities'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(universal_path_to_stylesheet('application'), crossorigin: css_crossorigin, as: "style") + = preload_link_tag(universal_path_to_stylesheet("highlight/themes/#{user_color_scheme}"), crossorigin: css_crossorigin, as: "style") - if Gitlab::Tracking.enabled? && Gitlab::Tracking.collector_hostname %link{ rel: 'preconnect', href: "https://#{Gitlab::Tracking.collector_hostname}", crossorigin: '' } -# Do not use preload_link_tag for fonts, to work around Firefox double-fetch bug. -- GitLab From 7230c780973e096160f296e4941a4daf27ed5013 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 12 Aug 2022 01:42:09 +0400 Subject: [PATCH 34/89] Properly disable vite for feature tests --- app/helpers/vite_helper.rb | 4 ++-- spec/spec_helper.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/helpers/vite_helper.rb b/app/helpers/vite_helper.rb index b6cfd7a408a9cf..7b9f93c650ae71 100644 --- a/app/helpers/vite_helper.rb +++ b/app/helpers/vite_helper.rb @@ -45,7 +45,7 @@ def universal_asset_path(*args) end def universal_stylesheet_link_tag(*args) - if Feature.enabled?(:vite_stylesheets) + if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) vite_stylesheet_tag(*args) else stylesheet_link_tag(*args) @@ -57,7 +57,7 @@ def vite_stylesheet_tag(path, *args) end def universal_path_to_stylesheet(path, *args) - if Feature.enabled?(:vite_stylesheets) + if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) vite_asset_url("stylesheets/#{path}.scss", *args) else path_to_stylesheet(path, *args) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 743a02cb1a0414..ccc24d066b2d92 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -221,6 +221,10 @@ stub_all_feature_flags stub_feature_flags(main_branch_over_master: false) + # Rely on Webpack during testing + stub_feature_flags(vite: false) + stub_feature_flags(vite_stylesheets: false) + TestEnv.seed_db end @@ -523,6 +527,10 @@ # Reset all feature flag stubs to default for testing stub_all_feature_flags + # Rely on Webpack during testing + stub_feature_flags(vite: false) + stub_feature_flags(vite_stylesheets: false) + # Re-enable query limiting in case it was disabled Gitlab::QueryLimiting.enable! end -- GitLab From de07588757a2cc344e50fdafb22329fa643947c6 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 12 Aug 2022 16:05:02 +0400 Subject: [PATCH 35/89] Add Vite support for email layouts --- app/mailers/application_mailer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index bb8d20b8301ad4..d43eb4d4e3a2fe 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -5,6 +5,7 @@ class ApplicationMailer < ActionMailer::Base helper ApplicationHelper helper MarkupHelper + helper ViteHelper attr_accessor :current_user -- GitLab From 9924b059e3fbaa5cf68081175b81517c294b5d93 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 12 Aug 2022 16:08:33 +0400 Subject: [PATCH 36/89] Fix dependencies --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index a04cc487e1f543..c111a5ab08e6c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3045,7 +3045,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0: +acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.0, acorn@^8.5.0: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== -- GitLab From cca8bdaead7119d6d13e2859d478723ac29eec88 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 12 Aug 2022 17:21:27 +0400 Subject: [PATCH 37/89] Fix EE and JH stylesheets Add autoprefixer --- app/assets/stylesheets/application.scss | 4 +- .../stylesheets/_ee/application_ee.scss | 6 +- .../assets/stylesheets/components/index.scss | 7 +++ .../assets/stylesheets/framework/index.scss | 2 + ee/app/assets/stylesheets/pages/index.scss | 19 ++++++ package.json | 1 + postcss.config.js | 5 ++ vite.config.ts | 9 ++- yarn.lock | 58 ++++++++++++++++++- 9 files changed, 103 insertions(+), 8 deletions(-) create mode 100644 ee/app/assets/stylesheets/components/index.scss create mode 100644 ee/app/assets/stylesheets/framework/index.scss create mode 100644 ee/app/assets/stylesheets/pages/index.scss create mode 100644 postcss.config.js diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5ffb84c9788883..93e52f1e223946 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -22,10 +22,10 @@ @import 'behaviors'; // EE-only stylesheets -//@import 'application_ee'; +@import 'application_ee'; // JH-only stylesheets -//@import 'application_jh'; +@import 'application_jh'; /* print styles */ @media print { diff --git a/ee/app/assets/stylesheets/_ee/application_ee.scss b/ee/app/assets/stylesheets/_ee/application_ee.scss index 13b42167d122b1..19b586357576a1 100644 --- a/ee/app/assets/stylesheets/_ee/application_ee.scss +++ b/ee/app/assets/stylesheets/_ee/application_ee.scss @@ -1,6 +1,6 @@ /* Entry point for EE specific CSS */ -@import '../components/**/*'; -@import '../framework/**/*'; -@import '../pages/**/*'; +@import '../components/index.scss'; +@import '../framework/index.scss'; +@import '../pages/index.scss'; diff --git a/ee/app/assets/stylesheets/components/index.scss b/ee/app/assets/stylesheets/components/index.scss new file mode 100644 index 00000000000000..981863953e81ca --- /dev/null +++ b/ee/app/assets/stylesheets/components/index.scss @@ -0,0 +1,7 @@ +@import "feature_flags/form"; +@import "compliance_dashboard/dashboard"; +@import "generic_vulnerability_report"; +@import "vulnerability_list"; +@import "audit_logs/logs_table"; +@import "batch_comments/draft_note"; +@import "related_items_tree"; diff --git a/ee/app/assets/stylesheets/framework/index.scss b/ee/app/assets/stylesheets/framework/index.scss new file mode 100644 index 00000000000000..bfd638acd8bf91 --- /dev/null +++ b/ee/app/assets/stylesheets/framework/index.scss @@ -0,0 +1,2 @@ +@import "badges"; +@import "diffs"; diff --git a/ee/app/assets/stylesheets/pages/index.scss b/ee/app/assets/stylesheets/pages/index.scss new file mode 100644 index 00000000000000..f654cff10baedb --- /dev/null +++ b/ee/app/assets/stylesheets/pages/index.scss @@ -0,0 +1,19 @@ +@import "geo"; +@import "security/vulnerability_report"; +@import "security/compliance_dashboard"; +@import "issuable_form"; +@import "projects"; +@import "subscriptions"; +@import "issues"; +@import "merge_request_analytics"; +@import "groups"; +@import "ee_start_trial"; +@import "contributors"; +@import "promotions"; +@import "issuable"; +@import "requirements"; +@import "issues/related_issues"; +@import "milestone"; +@import "issues_analytics"; +@import "billings"; +@import "code_review"; diff --git a/package.json b/package.json index fbe288d7ae7a09..4c765eae6a2678 100644 --- a/package.json +++ b/package.json @@ -102,6 +102,7 @@ "@vitejs/plugin-vue2": "^1.1.2", "apollo-upload-client": "15.0.0", "apollo3-cache-persist": "^0.14.1", + "autoprefixer": "^10.4.8", "autosize": "^5.0.1", "axios": "^0.24.0", "babel-loader": "^8.2.5", diff --git a/postcss.config.js b/postcss.config.js new file mode 100644 index 00000000000000..a47ef4f95284d3 --- /dev/null +++ b/postcss.config.js @@ -0,0 +1,5 @@ +module.exports = { + plugins: { + autoprefixer: {}, + }, +}; diff --git a/vite.config.ts b/vite.config.ts index e26ddaad3f2f2b..acc08cd059072c 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -18,8 +18,12 @@ const aliasArr = Object.entries(config.resolve.alias).map(([find, replacement]) const assetsPath = path.resolve(__dirname, 'app/assets'); const javascriptsPath = path.resolve(assetsPath, 'javascripts'); const stylesheetsPath = path.resolve(assetsPath, 'stylesheets'); -const eePath = path.resolve(__dirname, 'ee/app/assets/stylesheets/_ee'); -const jhPath = path.resolve(__dirname, 'jh/app/assets/stylesheets/_jh'); +const eePath = IS_EE + ? path.resolve(__dirname, 'ee/app/assets/stylesheets/_ee') + : path.join(assetsPath, 'stylesheets/_ee'); +const jhPath = IS_JH + ? path.resolve(__dirname, 'jh/app/assets/stylesheets/_jh') + : path.resolve(assetsPath, 'stylesheets/_jh'); const gitlabUI = path.resolve(__dirname, 'node_modules/@gitlab/ui/src/scss'); const emptyComponent = path.resolve(javascriptsPath, 'vue_shared/components/empty_component.js'); @@ -30,6 +34,7 @@ const fixedRubyPlugin = [ { ...rubyPlugin, config: (...args) => { + // @ts-ignore const originalConfig = rubyPlugin.config(...args); return { ...originalConfig, diff --git a/yarn.lock b/yarn.lock index c111a5ab08e6c0..f3b00fa72b4a46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3317,6 +3317,18 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +autoprefixer@^10.4.8: + version "10.4.8" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.8.tgz#92c7a0199e1cfb2ad5d9427bd585a3d75895b9e5" + integrity sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw== + dependencies: + browserslist "^4.21.3" + caniuse-lite "^1.0.30001373" + fraction.js "^4.2.0" + normalize-range "^0.1.2" + picocolors "^1.0.0" + postcss-value-parser "^4.2.0" + autosize@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/autosize/-/autosize-5.0.1.tgz#ed269b0fa9b7eb47627048a1bb3299e99e003a0f" @@ -3684,6 +3696,16 @@ browserslist@^4.20.2, browserslist@^4.20.3, browserslist@^4.21.3: node-releases "^2.0.6" update-browserslist-db "^1.0.5" +browserslist@^4.21.3: + version "4.21.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" + integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== + dependencies: + caniuse-lite "^1.0.30001370" + electron-to-chromium "^1.4.202" + node-releases "^2.0.6" + update-browserslist-db "^1.0.5" + bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -3856,6 +3878,11 @@ caniuse-lite@^1.0.30001370: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001388.tgz#88e01f4591cbd81f9f665f3f078c66b509fbe55d" integrity sha512-znVbq4OUjqgLxMxoNX2ZeeLR0d7lcDiE5uJ4eUiWdml1J1EkxbnQq6opT9jb9SMfJxB0XA16/ziHwni4u1I3GQ== +caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001373: + version "1.0.30001375" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz#8e73bc3d1a4c800beb39f3163bf0190d7e5d7672" + integrity sha512-kWIMkNzLYxSvnjy0hL8w1NOaWNr2rn39RTAVyIwcw8juu60bZDWiF1/loOYANzjtJmy6qPgNmn38ro5Pygagdw== + canvas-confetti@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/canvas-confetti/-/canvas-confetti-1.4.0.tgz#840f6db4a566f8f32abe28c00dcd82acf39c92bd" @@ -5521,6 +5548,11 @@ electron-to-chromium@^1.4.202: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.230.tgz#666909fdf5765acb1348b69752ee9955dc1664b7" integrity sha512-3pwjAK0qHSDN9+YAF4fJknsSruP7mpjdWzUSruIJD/JCH77pEh0SorEyb3xVaKkfwk2tzjOt2D8scJ0KAdfXLA== +electron-to-chromium@^1.4.202: + version "1.4.217" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.217.tgz#f1f51b319435f4c1587a850806a0dfebe9774598" + integrity sha512-iX8GbAMij7cOtJPZo02CClpaPMWjvN5meqXiJXkBgwvraNWTNH0Z7F9tkznI34JRPtWASoPM/xWamq3oNb49GA== + elliptic@^6.0.0: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" @@ -6495,6 +6527,11 @@ forwarded@0.2.0: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== +fraction.js@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" + integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== + fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -9766,6 +9803,11 @@ node-releases@^2.0.6: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== +node-releases@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" + integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== + nodemon@^2.0.19: version "2.0.19" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.19.tgz#cac175f74b9cb8b57e770d47841995eebe4488bd" @@ -9829,6 +9871,11 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== + npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" @@ -10409,7 +10456,7 @@ postcss@^7.0.14, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6: picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.1.10, postcss@^8.4.14: +postcss@^8.1.10, postcss@^8.4.14, postcss@^8.4.16: version "8.4.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== @@ -10418,6 +10465,15 @@ postcss@^8.1.10, postcss@^8.4.14: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.2.1: + version "8.4.14" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" + integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" -- GitLab From 4640ddff0ab176a09c024c65dcd56b70fd20a1ad Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 12 Aug 2022 19:05:08 +0400 Subject: [PATCH 38/89] Fix dependencies --- yarn.lock | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/yarn.lock b/yarn.lock index f3b00fa72b4a46..efbc957df5c11d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10456,7 +10456,7 @@ postcss@^7.0.14, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6: picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.1.10, postcss@^8.4.14, postcss@^8.4.16: +postcss@^8.1.10, postcss@^8.4.14: version "8.4.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== @@ -10465,15 +10465,6 @@ postcss@^8.1.10, postcss@^8.4.14, postcss@^8.4.16: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@^8.2.1: - version "8.4.14" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" - integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== - dependencies: - nanoid "^3.3.4" - picocolors "^1.0.0" - source-map-js "^1.0.2" - prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" -- GitLab From 8467186069e51ef9481751b04279a6657b33535a Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 12 Aug 2022 23:19:59 +0400 Subject: [PATCH 39/89] Fix style lint --- .../stylesheets/_ee/application_ee.scss | 6 +-- .../assets/stylesheets/components/index.scss | 14 +++---- .../assets/stylesheets/framework/index.scss | 4 +- ee/app/assets/stylesheets/pages/index.scss | 38 +++++++++---------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/ee/app/assets/stylesheets/_ee/application_ee.scss b/ee/app/assets/stylesheets/_ee/application_ee.scss index 19b586357576a1..41220784e79615 100644 --- a/ee/app/assets/stylesheets/_ee/application_ee.scss +++ b/ee/app/assets/stylesheets/_ee/application_ee.scss @@ -1,6 +1,6 @@ /* Entry point for EE specific CSS */ -@import '../components/index.scss'; -@import '../framework/index.scss'; -@import '../pages/index.scss'; +@import '../components/index'; +@import '../framework/index'; +@import '../pages/index'; diff --git a/ee/app/assets/stylesheets/components/index.scss b/ee/app/assets/stylesheets/components/index.scss index 981863953e81ca..4ec554b2771346 100644 --- a/ee/app/assets/stylesheets/components/index.scss +++ b/ee/app/assets/stylesheets/components/index.scss @@ -1,7 +1,7 @@ -@import "feature_flags/form"; -@import "compliance_dashboard/dashboard"; -@import "generic_vulnerability_report"; -@import "vulnerability_list"; -@import "audit_logs/logs_table"; -@import "batch_comments/draft_note"; -@import "related_items_tree"; +@import 'feature_flags/form'; +@import 'compliance_dashboard/dashboard'; +@import 'generic_vulnerability_report'; +@import 'vulnerability_list'; +@import 'audit_logs/logs_table'; +@import 'batch_comments/draft_note'; +@import 'related_items_tree'; diff --git a/ee/app/assets/stylesheets/framework/index.scss b/ee/app/assets/stylesheets/framework/index.scss index bfd638acd8bf91..3449a658d8c8f3 100644 --- a/ee/app/assets/stylesheets/framework/index.scss +++ b/ee/app/assets/stylesheets/framework/index.scss @@ -1,2 +1,2 @@ -@import "badges"; -@import "diffs"; +@import 'badges'; +@import 'diffs'; diff --git a/ee/app/assets/stylesheets/pages/index.scss b/ee/app/assets/stylesheets/pages/index.scss index f654cff10baedb..50b4fdee0255ee 100644 --- a/ee/app/assets/stylesheets/pages/index.scss +++ b/ee/app/assets/stylesheets/pages/index.scss @@ -1,19 +1,19 @@ -@import "geo"; -@import "security/vulnerability_report"; -@import "security/compliance_dashboard"; -@import "issuable_form"; -@import "projects"; -@import "subscriptions"; -@import "issues"; -@import "merge_request_analytics"; -@import "groups"; -@import "ee_start_trial"; -@import "contributors"; -@import "promotions"; -@import "issuable"; -@import "requirements"; -@import "issues/related_issues"; -@import "milestone"; -@import "issues_analytics"; -@import "billings"; -@import "code_review"; +@import 'geo'; +@import 'security/vulnerability_report'; +@import 'security/compliance_dashboard'; +@import 'issuable_form'; +@import 'projects'; +@import 'subscriptions'; +@import 'issues'; +@import 'merge_request_analytics'; +@import 'groups'; +@import 'ee_start_trial'; +@import 'contributors'; +@import 'promotions'; +@import 'issuable'; +@import 'requirements'; +@import 'issues/related_issues'; +@import 'milestone'; +@import 'issues_analytics'; +@import 'billings'; +@import 'code_review'; -- GitLab From a47a8d73e24bb75e0ae9f6192a53f1545a90c328 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 12 Aug 2022 23:34:00 +0400 Subject: [PATCH 40/89] Fix devise mailer tests --- app/mailers/devise_mailer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb index 7129e577cb8089..4d01549347efb2 100644 --- a/app/mailers/devise_mailer.rb +++ b/app/mailers/devise_mailer.rb @@ -8,6 +8,7 @@ class DeviseMailer < Devise::Mailer helper EmailsHelper helper ApplicationHelper + helper ViteHelper def password_change_by_admin(record, opts = {}) devise_mail(record, :password_change_by_admin, opts) -- GitLab From d5cb0eda408dde38542a3ab896d99165d230af4e Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sat, 13 Aug 2022 01:42:15 +0400 Subject: [PATCH 41/89] Remove vite feature flag stub in the after block This should fix incompatibilities with unit tests --- spec/spec_helper.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ccc24d066b2d92..ce3754dd121b85 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -527,10 +527,6 @@ # Reset all feature flag stubs to default for testing stub_all_feature_flags - # Rely on Webpack during testing - stub_feature_flags(vite: false) - stub_feature_flags(vite_stylesheets: false) - # Re-enable query limiting in case it was disabled Gitlab::QueryLimiting.enable! end -- GitLab From 6f29b42fde56c2add838e103deba8c6c5e743096 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sun, 14 Aug 2022 12:59:13 +0400 Subject: [PATCH 42/89] Completely disable Vite during testing Remove feature flag stubs from tests helper --- app/helpers/vite_helper.rb | 8 ++++---- app/helpers/webpack_helper.rb | 4 ++-- app/views/layouts/_head.html.haml | 4 ++-- spec/spec_helper.rb | 8 -------- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/app/helpers/vite_helper.rb b/app/helpers/vite_helper.rb index 7b9f93c650ae71..c652d4f7cc00bd 100644 --- a/app/helpers/vite_helper.rb +++ b/app/helpers/vite_helper.rb @@ -29,7 +29,7 @@ def vite_controller_bundle_tags end def universal_javascript_include_tag(*args) - if Feature.enabled?(:vite) + if Feature.enabled?(:vite) && !Rails.env.test? vite_javascript_tag(*args) else javascript_include_tag(*args) @@ -37,7 +37,7 @@ def universal_javascript_include_tag(*args) end def universal_asset_path(*args) - if Feature.enabled?(:vite) + if Feature.enabled?(:vite) && !Rails.env.test? vite_asset_path(*args) else asset_path(*args) @@ -45,7 +45,7 @@ def universal_asset_path(*args) end def universal_stylesheet_link_tag(*args) - if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) + if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) && !Rails.env.test? vite_stylesheet_tag(*args) else stylesheet_link_tag(*args) @@ -57,7 +57,7 @@ def vite_stylesheet_tag(path, *args) end def universal_path_to_stylesheet(path, *args) - if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) + if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) && !Rails.env.test? vite_asset_url("stylesheets/#{path}.scss", *args) else path_to_stylesheet(path, *args) diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb index fdd25eec108881..f34b0c2349967f 100644 --- a/app/helpers/webpack_helper.rb +++ b/app/helpers/webpack_helper.rb @@ -16,7 +16,7 @@ def prefetch_link_tag(source) end def webpack_bundle_tag(bundle) - if Feature.enabled?(:vite) + if Feature.enabled?(:vite) && !Rails.env.test? vite_javascript_tag bundle else javascript_include_tag(*webpack_entrypoint_paths(bundle)) @@ -38,7 +38,7 @@ def webpack_preload_asset_tag(asset, options = {}) end def webpack_controller_bundle_tags - return vite_controller_bundle_tags if Feature.enabled?(:vite) + return vite_controller_bundle_tags if Feature.enabled?(:vite) && !Rails.env.test? chunks = [] diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 1df5f43785f061..b1ff8d44cd62ed 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -9,7 +9,7 @@ %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge' } - - if Feature.enabled?(:vite) + - if Feature.enabled?(:vite) && !Rails.env.test? = javascript_include_tag(vite_manifest.vite_client_src, type: "module", extname: false) = render 'layouts/startup_js' @@ -58,7 +58,7 @@ = webpack_bundle_tag 'legacy_sentry' = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? - - if Feature.enabled?(:vite) + - if Feature.enabled?(:vite) && !Rails.env.test? = vite_javascript_tag "main" = yield :page_specific_javascripts diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ce3754dd121b85..2d3afb489df08a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -221,10 +221,6 @@ stub_all_feature_flags stub_feature_flags(main_branch_over_master: false) - # Rely on Webpack during testing - stub_feature_flags(vite: false) - stub_feature_flags(vite_stylesheets: false) - TestEnv.seed_db end @@ -316,10 +312,6 @@ # dashboard page to Vue. https://gitlab.com/gitlab-org/gitlab/-/issues/379025 stub_feature_flags(vue_issues_dashboard: false) - # Rely on Webpack during testing - stub_feature_flags(vite: false) - stub_feature_flags(vite_stylesheets: false) - allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged) else unstub_all_feature_flags -- GitLab From 71d7806c98aefebb3f73d8a9f5744d85c565ab1c Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sun, 14 Aug 2022 15:43:30 +0400 Subject: [PATCH 43/89] Add tests for ViteHelper --- spec/helpers/vite_helper_spec.rb | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 spec/helpers/vite_helper_spec.rb diff --git a/spec/helpers/vite_helper_spec.rb b/spec/helpers/vite_helper_spec.rb new file mode 100644 index 00000000000000..b69e4b3dca8f43 --- /dev/null +++ b/spec/helpers/vite_helper_spec.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe ViteHelper do + let(:source) { 'foo.js' } + let(:webpack_source) { 'webpack/foo.js' } + + before do + allow(helper).to receive(:javascript_include_tag).and_return(webpack_source) + allow(helper).to receive(:asset_path).and_return(webpack_source) + allow(helper).to receive(:stylesheet_link_tag).and_return(webpack_source) + allow(helper).to receive(:path_to_stylesheet).and_return(webpack_source) + end + + context 'when vite disabled' do + before do + stub_feature_flags(vite: false) + end + + describe '#universal_javascript_include_tag' do + it 'returns webpack javascript tag' do + expect(helper.universal_javascript_include_tag(source)).to eq(webpack_source) + end + end + + describe '#universal_asset_path' do + it 'returns ActionView asset path' do + expect(helper.universal_asset_path(source)).to eq(webpack_source) + end + end + + describe '#universal_stylesheet_link_tag' do + it 'returns ActionView asset path' do + expect(helper.universal_stylesheet_link_tag(source)).to eq(webpack_source) + end + end + + describe '#universal_path_to_stylesheet' do + it 'returns ActionView asset path' do + expect(helper.universal_path_to_stylesheet(source)).to eq(webpack_source) + end + end + end +end -- GitLab From 820f210f6564d1b29e81e95c9fbe9635674e744e Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sun, 14 Aug 2022 21:17:29 +0400 Subject: [PATCH 44/89] Fix Vite CSP only for development mode --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 843e9cc7529f04..f4c3da2545f6c3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -115,7 +115,7 @@ def self.endpoint_id_for_action(action_name) content_security_policy do |p| next if p.directives.blank? - if Gitlab.dev_or_test_env? && Feature.enabled?(:vite) + if Rails.env.development? && Feature.enabled?(:vite) connect_sources = p.directives['connect-src'] # TODO: the address should be taken from the vite common config p.connect_src(*(Array.wrap(connect_sources) | ['ws://gdk.test:3038'])) -- GitLab From ef0caae12e8b46f18521d054e8024ac2a65a8bd5 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sun, 14 Aug 2022 23:50:13 +0400 Subject: [PATCH 45/89] Fix tests that force development environment --- spec/spec_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2d3afb489df08a..98f73c7375293f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -312,6 +312,8 @@ # dashboard page to Vue. https://gitlab.com/gitlab-org/gitlab/-/issues/379025 stub_feature_flags(vue_issues_dashboard: false) + stub_feature_flags(vite: false) + allow(Gitlab::GitalyClient).to receive(:can_use_disk?).and_return(enable_rugged) else unstub_all_feature_flags -- GitLab From bd928a5425a8e177eec5ec3c0f415fcab5db17b4 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 00:13:06 +0400 Subject: [PATCH 46/89] Add more tests for vite and webpack --- spec/helpers/vite_helper_spec.rb | 65 +++++++++++++++++++++++++---- spec/helpers/webpack_helper_spec.rb | 17 ++++++++ 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/spec/helpers/vite_helper_spec.rb b/spec/helpers/vite_helper_spec.rb index b69e4b3dca8f43..f6d29aa08aa053 100644 --- a/spec/helpers/vite_helper_spec.rb +++ b/spec/helpers/vite_helper_spec.rb @@ -4,23 +4,72 @@ RSpec.describe ViteHelper do let(:source) { 'foo.js' } + let(:vite_source) { 'vite/foo.js' } + let(:vite_tag) { '' } let(:webpack_source) { 'webpack/foo.js' } + let(:webpack_tag) { '' } - before do - allow(helper).to receive(:javascript_include_tag).and_return(webpack_source) - allow(helper).to receive(:asset_path).and_return(webpack_source) - allow(helper).to receive(:stylesheet_link_tag).and_return(webpack_source) - allow(helper).to receive(:path_to_stylesheet).and_return(webpack_source) + describe '#vite_controller_bundle_tags' do + before do + allow(helper.controller).to receive(:controller_path).and_return('foo/bar') + allow(helper).to receive(:vite_asset_path).and_return(vite_source) + allow(helper).to receive(:vite_javascript_tag).and_return([vite_source]) + end + + it 'returns array of tags' do + expect(helper.vite_controller_bundle_tags).to eq([vite_source]) + end + end + + context 'when vite enabled' do + before do + stub_rails_env('development') + stub_feature_flags(vite: true) + + allow(helper).to receive(:vite_javascript_tag).and_return(vite_tag) + allow(helper).to receive(:vite_asset_path).and_return(vite_source) + allow(helper).to receive(:vite_stylesheet_tag).and_return(vite_tag) + allow(helper).to receive(:vite_asset_url).and_return(vite_source) + end + + describe '#universal_javascript_include_tag' do + it 'returns vite javascript tag' do + expect(helper.universal_javascript_include_tag(source)).to eq(vite_tag) + end + end + + describe '#universal_asset_path' do + it 'returns vite asset path' do + expect(helper.universal_asset_path(source)).to eq(vite_source) + end + end + + describe '#universal_stylesheet_link_tag' do + it 'returns vite tag' do + expect(helper.universal_stylesheet_link_tag(source)).to eq(vite_tag) + end + end + + describe '#universal_path_to_stylesheet' do + it 'returns vite asset path' do + expect(helper.universal_path_to_stylesheet(source)).to eq(vite_source) + end + end end context 'when vite disabled' do before do stub_feature_flags(vite: false) + + allow(helper).to receive(:javascript_include_tag).and_return(webpack_tag) + allow(helper).to receive(:asset_path).and_return(webpack_source) + allow(helper).to receive(:stylesheet_link_tag).and_return(webpack_tag) + allow(helper).to receive(:path_to_stylesheet).and_return(webpack_source) end describe '#universal_javascript_include_tag' do it 'returns webpack javascript tag' do - expect(helper.universal_javascript_include_tag(source)).to eq(webpack_source) + expect(helper.universal_javascript_include_tag(source)).to eq(webpack_tag) end end @@ -31,8 +80,8 @@ end describe '#universal_stylesheet_link_tag' do - it 'returns ActionView asset path' do - expect(helper.universal_stylesheet_link_tag(source)).to eq(webpack_source) + it 'returns webpack tag' do + expect(helper.universal_stylesheet_link_tag(source)).to eq(webpack_tag) end end diff --git a/spec/helpers/webpack_helper_spec.rb b/spec/helpers/webpack_helper_spec.rb index f9e2d265153b1b..e18da09ec6a8a6 100644 --- a/spec/helpers/webpack_helper_spec.rb +++ b/spec/helpers/webpack_helper_spec.rb @@ -34,4 +34,21 @@ expect(output).to eq("") end end + + context 'when vite enabled' do + let(:bundle) { 'bundle.js' } + + before do + stub_rails_env('development') + stub_feature_flags(vite: true) + + allow(helper).to receive(:vite_javascript_tag).and_return('vite') + end + + describe '#webpack_bundle_tag' do + it 'return vite javascript tag' do + expect(helper.webpack_bundle_tag(bundle)).to eq('vite') + end + end + end end -- GitLab From 5782b7e675931b90ea325b59545467cd49302743 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 00:27:54 +0400 Subject: [PATCH 47/89] Use match_array to test against an array --- spec/helpers/vite_helper_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/helpers/vite_helper_spec.rb b/spec/helpers/vite_helper_spec.rb index f6d29aa08aa053..0ae71be81e73f9 100644 --- a/spec/helpers/vite_helper_spec.rb +++ b/spec/helpers/vite_helper_spec.rb @@ -17,7 +17,7 @@ end it 'returns array of tags' do - expect(helper.vite_controller_bundle_tags).to eq([vite_source]) + expect(helper.vite_controller_bundle_tags).to match_array([vite_source]) end end -- GitLab From 1a9f130bdb90648d4f9de4bc0a6d2218cc6117fd Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 00:42:00 +0400 Subject: [PATCH 48/89] Fix typo in tests --- spec/helpers/vite_helper_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/helpers/vite_helper_spec.rb b/spec/helpers/vite_helper_spec.rb index 0ae71be81e73f9..c5e7d7da5ec22a 100644 --- a/spec/helpers/vite_helper_spec.rb +++ b/spec/helpers/vite_helper_spec.rb @@ -13,11 +13,11 @@ before do allow(helper.controller).to receive(:controller_path).and_return('foo/bar') allow(helper).to receive(:vite_asset_path).and_return(vite_source) - allow(helper).to receive(:vite_javascript_tag).and_return([vite_source]) + allow(helper).to receive(:vite_javascript_tag).and_return([vite_tag]) end it 'returns array of tags' do - expect(helper.vite_controller_bundle_tags).to match_array([vite_source]) + expect(helper.vite_controller_bundle_tags).to match_array([vite_tag]) end end -- GitLab From f9be6514aaa481114654d1fa3921d6094699173d Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 01:28:09 +0400 Subject: [PATCH 49/89] Try fix commonjs interop in ensure_single_line --- app/assets/javascripts/locale/ensure_single_line.cjs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/assets/javascripts/locale/ensure_single_line.cjs b/app/assets/javascripts/locale/ensure_single_line.cjs index db1b0829cf0b5f..620cdbcca39520 100644 --- a/app/assets/javascripts/locale/ensure_single_line.cjs +++ b/app/assets/javascripts/locale/ensure_single_line.cjs @@ -11,7 +11,7 @@ const SPLIT_REGEX = /\s*[\r\n]+\s*/; * @param {String} str * @returns {String} */ -function ensureSingleLine(str) { +module.exports = function ensureSingleLine(str) { // This guard makes the function significantly faster if (str.includes('\n') || str.includes('\r')) { return str @@ -21,5 +21,3 @@ function ensureSingleLine(str) { } return str; } - -export default ensureSingleLine; -- GitLab From b82c84667881223560c5e67d21a46c9661378196 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 01:39:20 +0400 Subject: [PATCH 50/89] Fix dompurify reexport --- app/assets/javascripts/dompurify.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/dompurify.js b/app/assets/javascripts/dompurify.js index 7a26e5d14d6374..cd421b76acd170 100644 --- a/app/assets/javascripts/dompurify.js +++ b/app/assets/javascripts/dompurify.js @@ -1,6 +1,6 @@ // eslint-disable-next-line import DOMPurify from '../../../node_modules/dompurify/dist/purify.es.js'; -const { sanitize, addHook } = DOMPurify; +const { sanitize, addHook, isValidAttribute } = DOMPurify; -export { sanitize, addHook }; +export { sanitize, addHook, isValidAttribute }; -- GitLab From e478ca256d1aa6f62231951a6c68be9c1ac1d573 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 01:51:28 +0400 Subject: [PATCH 51/89] Fix ensure_single_line interop for commonjs and ESM --- .../locale/{ensure_single_line.cjs => ensure_single_line.js} | 4 +++- app/assets/javascripts/locale/index.js | 2 +- package.json | 1 + scripts/frontend/extract_gettext_all.js | 2 +- spec/frontend/locale/ensure_single_line_spec.js | 2 +- vite.config.ts | 4 ++++ 6 files changed, 11 insertions(+), 4 deletions(-) rename app/assets/javascripts/locale/{ensure_single_line.cjs => ensure_single_line.js} (91%) diff --git a/app/assets/javascripts/locale/ensure_single_line.cjs b/app/assets/javascripts/locale/ensure_single_line.js similarity index 91% rename from app/assets/javascripts/locale/ensure_single_line.cjs rename to app/assets/javascripts/locale/ensure_single_line.js index 620cdbcca39520..c2c637770016d7 100644 --- a/app/assets/javascripts/locale/ensure_single_line.cjs +++ b/app/assets/javascripts/locale/ensure_single_line.js @@ -1,3 +1,5 @@ +/* eslint-disable import/no-commonjs */ + const SPLIT_REGEX = /\s*[\r\n]+\s*/; /** @@ -20,4 +22,4 @@ module.exports = function ensureSingleLine(str) { .join(' '); } return str; -} +}; diff --git a/app/assets/javascripts/locale/index.js b/app/assets/javascripts/locale/index.js index c1afabf1e35287..ad01da2eb1724f 100644 --- a/app/assets/javascripts/locale/index.js +++ b/app/assets/javascripts/locale/index.js @@ -1,5 +1,5 @@ import Jed from 'jed'; -import ensureSingleLine from './ensure_single_line.cjs'; +import ensureSingleLine from './ensure_single_line'; import sprintf from './sprintf'; const GITLAB_FALLBACK_LANGUAGE = 'en'; diff --git a/package.json b/package.json index 4c765eae6a2678..c1a9b7452216a4 100644 --- a/package.json +++ b/package.json @@ -221,6 +221,7 @@ "@gitlab/eslint-plugin": "18.1.0", "@gitlab/stylelint-config": "4.1.0", "@graphql-eslint/eslint-plugin": "3.12.0", + "@originjs/vite-plugin-commonjs": "^1.0.3", "@testing-library/dom": "^7.16.2", "@types/jest": "^28.1.3", "@vue/test-utils": "1.3.0", diff --git a/scripts/frontend/extract_gettext_all.js b/scripts/frontend/extract_gettext_all.js index 922aa85241fd7c..0a5e2b06971cfd 100644 --- a/scripts/frontend/extract_gettext_all.js +++ b/scripts/frontend/extract_gettext_all.js @@ -6,7 +6,7 @@ const { decorateExtractorWithHelpers, } = require('gettext-extractor-vue'); const vue2TemplateCompiler = require('vue-template-compiler'); -const ensureSingleLine = require('../../app/assets/javascripts/locale/ensure_single_line.cjs'); +const ensureSingleLine = require('../../app/assets/javascripts/locale/ensure_single_line'); const args = argumentsParser .option('-f, --file ', 'Extract message from one single file') diff --git a/spec/frontend/locale/ensure_single_line_spec.js b/spec/frontend/locale/ensure_single_line_spec.js index ca3d57015af231..20b04cab9c82e8 100644 --- a/spec/frontend/locale/ensure_single_line_spec.js +++ b/spec/frontend/locale/ensure_single_line_spec.js @@ -1,4 +1,4 @@ -import ensureSingleLine from '~/locale/ensure_single_line.cjs'; +import ensureSingleLine from '~/locale/ensure_single_line'; describe('locale', () => { describe('ensureSingleLine', () => { diff --git a/vite.config.ts b/vite.config.ts index acc08cd059072c..973bf030c42fd3 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -9,6 +9,7 @@ import RubyPlugin from 'vite-plugin-ruby'; // @ts-ignore import config from './config/webpack.config'; import { IS_EE, IS_JH, SOURCEGRAPH_PUBLIC_PATH } from './config/webpack.constants'; +import { viteCommonjs } from '@originjs/vite-plugin-commonjs'; const aliasArr = Object.entries(config.resolve.alias).map(([find, replacement]) => ({ find, @@ -88,6 +89,9 @@ export default defineConfig({ svgLoader({ defaultImport: 'raw', }), + viteCommonjs({ + include: [path.resolve(javascriptsPath, 'locale/ensure_single_line.js')], + }), ], css: { preprocessorOptions: { -- GitLab From 59e2fdad42160074afa1cf9348b804558f4725d9 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 02:40:29 +0400 Subject: [PATCH 52/89] Support loading EE and JH page JS --- app/assets/javascripts/entries/main_ee.js | 14 ++++++++++++++ app/assets/javascripts/entries/main_jh.js | 14 ++++++++++++++ app/helpers/vite_helper.rb | 18 ++++++++++-------- app/views/layouts/_head.html.haml | 4 ++++ 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 app/assets/javascripts/entries/main_ee.js create mode 100644 app/assets/javascripts/entries/main_jh.js diff --git a/app/assets/javascripts/entries/main_ee.js b/app/assets/javascripts/entries/main_ee.js new file mode 100644 index 00000000000000..39041a5cfbf2ca --- /dev/null +++ b/app/assets/javascripts/entries/main_ee.js @@ -0,0 +1,14 @@ +const modules = import.meta.glob('../../../../ee/app/assets/javascripts/pages/**/*.js'); + +const paths = window.location.pathname + .substring(1) + .split('/') + .map((part, index, arr) => { + return `../../../../ee/app/assets/javascripts/pages/${[...arr.slice(0, index), part].join( + '/', + )}/index.js`; + }); + +paths.forEach((path) => { + modules[path]?.(); +}); diff --git a/app/assets/javascripts/entries/main_jh.js b/app/assets/javascripts/entries/main_jh.js new file mode 100644 index 00000000000000..6a2e98d606c5d8 --- /dev/null +++ b/app/assets/javascripts/entries/main_jh.js @@ -0,0 +1,14 @@ +const modules = import.meta.glob('../../../../jh/app/assets/javascripts/pages/**/*.js'); + +const paths = window.location.pathname + .substring(1) + .split('/') + .map((part, index, arr) => { + return `../../../../jh/app/assets/javascripts/pages/${[...arr.slice(0, index), part].join( + '/', + )}/index.js`; + }); + +paths.forEach((path) => { + modules[path]?.(); +}); diff --git a/app/helpers/vite_helper.rb b/app/helpers/vite_helper.rb index c652d4f7cc00bd..57632fe1514c36 100644 --- a/app/helpers/vite_helper.rb +++ b/app/helpers/vite_helper.rb @@ -14,14 +14,7 @@ def vite_controller_bundle_tags until chunks.any? || route.empty? entrypoint = "javascripts/pages/#{route.join('/')}/index.js" - begin - chunks.push entrypoint - # TODO: properly handle non-existent assets, doesn't work ATM - vite_asset_path(entrypoint) ? nil : chunks.pop - rescue ViteRuby::MissingEntrypointError - chunks.pop - # no bundle exists for this path - end + chunks.push(entrypoint) if entrypoint_exists?(entrypoint) route.pop end @@ -63,4 +56,13 @@ def universal_path_to_stylesheet(path, *args) path_to_stylesheet(path, *args) end end + + private + + def entrypoint_exists?(entrypoint) + ViteRuby::Manifest.new(ViteRuby.instance).path_for(entrypoint) + true + rescue ViteRuby::MissingEntrypointError + false + end end diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index b1ff8d44cd62ed..f585102b035526 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -60,6 +60,10 @@ - if Feature.enabled?(:vite) && !Rails.env.test? = vite_javascript_tag "main" + - if Gitlab.ee? + = vite_javascript_tag "main_ee" + - if Gitlab.jh? + = vite_javascript_tag "main_jh" = yield :page_specific_javascripts -- GitLab From b35553f672e14138544c4f3c454f26c9f42f15f8 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 12:17:42 +0400 Subject: [PATCH 53/89] Mock ViteHelper internal method in tests --- spec/helpers/vite_helper_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/helpers/vite_helper_spec.rb b/spec/helpers/vite_helper_spec.rb index c5e7d7da5ec22a..4acb457eeaa0a4 100644 --- a/spec/helpers/vite_helper_spec.rb +++ b/spec/helpers/vite_helper_spec.rb @@ -9,6 +9,10 @@ let(:webpack_source) { 'webpack/foo.js' } let(:webpack_tag) { '' } + before do + allow(helper).to receive(:entrypoint_exists?).and_return(true) + end + describe '#vite_controller_bundle_tags' do before do allow(helper.controller).to receive(:controller_path).and_return('foo/bar') -- GitLab From 60c447c9eb444601afe2417970f74a7b6237ace4 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 12:26:23 +0400 Subject: [PATCH 54/89] Use controller path to load EE and JH entrypoints --- app/assets/javascripts/entries/main_ee.js | 6 +++--- app/assets/javascripts/entries/main_jh.js | 6 +++--- app/views/layouts/_head.html.haml | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/entries/main_ee.js b/app/assets/javascripts/entries/main_ee.js index 39041a5cfbf2ca..b9147e03d29d28 100644 --- a/app/assets/javascripts/entries/main_ee.js +++ b/app/assets/javascripts/entries/main_ee.js @@ -1,8 +1,8 @@ const modules = import.meta.glob('../../../../ee/app/assets/javascripts/pages/**/*.js'); -const paths = window.location.pathname - .substring(1) - .split('/') +const paths = document + .querySelector('meta[name="controller-path"]') + .content.split('/') .map((part, index, arr) => { return `../../../../ee/app/assets/javascripts/pages/${[...arr.slice(0, index), part].join( '/', diff --git a/app/assets/javascripts/entries/main_jh.js b/app/assets/javascripts/entries/main_jh.js index 6a2e98d606c5d8..adc7265c93263c 100644 --- a/app/assets/javascripts/entries/main_jh.js +++ b/app/assets/javascripts/entries/main_jh.js @@ -1,8 +1,8 @@ const modules = import.meta.glob('../../../../jh/app/assets/javascripts/pages/**/*.js'); -const paths = window.location.pathname - .substring(1) - .split('/') +const paths = document + .querySelector('meta[name="controller-path"]') + .content.split('/') .map((part, index, arr) => { return `../../../../jh/app/assets/javascripts/pages/${[...arr.slice(0, index), part].join( '/', diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index f585102b035526..f0e61c03e50283 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -59,6 +59,7 @@ = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? - if Feature.enabled?(:vite) && !Rails.env.test? + %meta{ name: 'controller-path', content: controller.controller_path } = vite_javascript_tag "main" - if Gitlab.ee? = vite_javascript_tag "main_ee" -- GitLab From 78404ae0d78e948572ac2eb35cc054ef2226ae00 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 13:43:42 +0400 Subject: [PATCH 55/89] Switch to client-based approach to load page-specific JS --- app/assets/javascripts/entries/main.js | 13 ++++++++++++ app/helpers/vite_helper.rb | 29 -------------------------- app/helpers/webpack_helper.rb | 2 +- config/vite.json | 3 +-- spec/helpers/vite_helper_spec.rb | 16 -------------- 5 files changed, 15 insertions(+), 48 deletions(-) diff --git a/app/assets/javascripts/entries/main.js b/app/assets/javascripts/entries/main.js index b627bb195a9394..e4372f2f344c3a 100644 --- a/app/assets/javascripts/entries/main.js +++ b/app/assets/javascripts/entries/main.js @@ -1 +1,14 @@ import '../main'; + +const modules = import.meta.glob('../pages/**/*.js'); + +const paths = document + .querySelector('meta[name="controller-path"]') + .content.split('/') + .map((part, index, arr) => { + return `../pages/${[...arr.slice(0, index), part].join('/')}/index.js`; + }); + +paths.forEach((path) => { + modules[path]?.(); +}); diff --git a/app/helpers/vite_helper.rb b/app/helpers/vite_helper.rb index 57632fe1514c36..183e08f64735b7 100644 --- a/app/helpers/vite_helper.rb +++ b/app/helpers/vite_helper.rb @@ -1,26 +1,6 @@ # frozen_string_literal: true module ViteHelper - def vite_controller_bundle_tags - chunks = [] - - action = case controller.action_name - when 'create' then 'new' - when 'update' then 'edit' - else controller.action_name - end - - route = [*controller.controller_path.split('/'), action].compact - - until chunks.any? || route.empty? - entrypoint = "javascripts/pages/#{route.join('/')}/index.js" - chunks.push(entrypoint) if entrypoint_exists?(entrypoint) - route.pop - end - - vite_javascript_tag(*chunks) - end - def universal_javascript_include_tag(*args) if Feature.enabled?(:vite) && !Rails.env.test? vite_javascript_tag(*args) @@ -56,13 +36,4 @@ def universal_path_to_stylesheet(path, *args) path_to_stylesheet(path, *args) end end - - private - - def entrypoint_exists?(entrypoint) - ViteRuby::Manifest.new(ViteRuby.instance).path_for(entrypoint) - true - rescue ViteRuby::MissingEntrypointError - false - end end diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb index f34b0c2349967f..3f172682648c3d 100644 --- a/app/helpers/webpack_helper.rb +++ b/app/helpers/webpack_helper.rb @@ -38,7 +38,7 @@ def webpack_preload_asset_tag(asset, options = {}) end def webpack_controller_bundle_tags - return vite_controller_bundle_tags if Feature.enabled?(:vite) && !Rails.env.test? + return nil if Feature.enabled?(:vite) && !Rails.env.test? chunks = [] diff --git a/config/vite.json b/config/vite.json index e8a27dad4b0daa..0f63864b4a2312 100644 --- a/config/vite.json +++ b/config/vite.json @@ -17,8 +17,7 @@ "~/stylesheets/disable_animations.scss", "~/stylesheets/test_environment.scss", "~/stylesheets/test_environment.scss", - "~/stylesheets/page_bundles/**/*.scss", - "~/javascripts/pages/**/index.js" + "~/stylesheets/page_bundles/**/*.scss" ], "watchAdditionalPaths": [], "devServerConnectTimeout": 1 diff --git a/spec/helpers/vite_helper_spec.rb b/spec/helpers/vite_helper_spec.rb index 4acb457eeaa0a4..9dea46b3c7d511 100644 --- a/spec/helpers/vite_helper_spec.rb +++ b/spec/helpers/vite_helper_spec.rb @@ -9,22 +9,6 @@ let(:webpack_source) { 'webpack/foo.js' } let(:webpack_tag) { '' } - before do - allow(helper).to receive(:entrypoint_exists?).and_return(true) - end - - describe '#vite_controller_bundle_tags' do - before do - allow(helper.controller).to receive(:controller_path).and_return('foo/bar') - allow(helper).to receive(:vite_asset_path).and_return(vite_source) - allow(helper).to receive(:vite_javascript_tag).and_return([vite_tag]) - end - - it 'returns array of tags' do - expect(helper.vite_controller_bundle_tags).to match_array([vite_tag]) - end - end - context 'when vite enabled' do before do stub_rails_env('development') -- GitLab From 977d54f9865c422d05357fc3a3865949da0d72b7 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 17:54:51 +0400 Subject: [PATCH 56/89] Explicitly define a katex stylesheet path from node_modules --- app/assets/javascripts/notebook/cells/markdown.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/notebook/cells/markdown.vue b/app/assets/javascripts/notebook/cells/markdown.vue index 2caa93c3c93563..f374df30844584 100644 --- a/app/assets/javascripts/notebook/cells/markdown.vue +++ b/app/assets/javascripts/notebook/cells/markdown.vue @@ -181,7 +181,7 @@ export default { is that the katex stylesheet depends on many fonts that are in node_module subfolders - moving all these fonts would make updating katex difficult. */ -@import '~katex/dist/katex.min.css'; +@import '../../../../../node_modules/katex/dist/katex.min.css'; .markdown .katex { display: block; -- GitLab From 45d2488b508f842120d81ed8595c54b5023bd8a2 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 17:55:58 +0400 Subject: [PATCH 57/89] Add a build config for Vite --- vite.config.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/vite.config.ts b/vite.config.ts index 973bf030c42fd3..d4906510e93f07 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,15 +1,16 @@ -// eslint-disable-next-line import/no-unresolved -import path from 'node:path'; +// @ts-ignore +import path from 'path'; import { defineConfig } from 'vite'; import svgLoader from 'vite-svg-loader'; import vue from '@vitejs/plugin-vue2'; import graphql from '@rollup/plugin-graphql'; // eslint-disable-next-line import/no-unresolved import RubyPlugin from 'vite-plugin-ruby'; +// eslint-disable-next-line import/no-extraneous-dependencies +import { viteCommonjs } from '@originjs/vite-plugin-commonjs'; // @ts-ignore import config from './config/webpack.config'; import { IS_EE, IS_JH, SOURCEGRAPH_PUBLIC_PATH } from './config/webpack.constants'; -import { viteCommonjs } from '@originjs/vite-plugin-commonjs'; const aliasArr = Object.entries(config.resolve.alias).map(([find, replacement]) => ({ find, @@ -84,7 +85,7 @@ export default defineConfig({ }, plugins: [ fixedRubyPlugin, - vue(/* options */), + vue(), graphql(), svgLoader({ defaultImport: 'raw', @@ -110,4 +111,7 @@ export default defineConfig({ : JSON.stringify(false), 'process.env.SOURCEGRAPH_PUBLIC_PATH': JSON.stringify(SOURCEGRAPH_PUBLIC_PATH), }, + build: { + target: 'es2015', + }, }); -- GitLab From 4c982dbe2cd877ad79ee75d0837810e6f0ce0e1d Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 17:57:28 +0400 Subject: [PATCH 58/89] Move from Typescript to Javascript-based config --- vite.config.ts => vite.config.js | 3 --- 1 file changed, 3 deletions(-) rename vite.config.ts => vite.config.js (97%) diff --git a/vite.config.ts b/vite.config.js similarity index 97% rename from vite.config.ts rename to vite.config.js index d4906510e93f07..466b6b08cbd5f6 100644 --- a/vite.config.ts +++ b/vite.config.js @@ -1,4 +1,3 @@ -// @ts-ignore import path from 'path'; import { defineConfig } from 'vite'; import svgLoader from 'vite-svg-loader'; @@ -6,9 +5,7 @@ import vue from '@vitejs/plugin-vue2'; import graphql from '@rollup/plugin-graphql'; // eslint-disable-next-line import/no-unresolved import RubyPlugin from 'vite-plugin-ruby'; -// eslint-disable-next-line import/no-extraneous-dependencies import { viteCommonjs } from '@originjs/vite-plugin-commonjs'; -// @ts-ignore import config from './config/webpack.config'; import { IS_EE, IS_JH, SOURCEGRAPH_PUBLIC_PATH } from './config/webpack.constants'; -- GitLab From bb9c5fa4cdb56c836895bb8c9b932330c78d4578 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 18:11:36 +0400 Subject: [PATCH 59/89] Fix controller path for Vite --- app/helpers/application_helper.rb | 9 +++++++++ app/views/layouts/_head.html.haml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1d645e74284c11..3f153c75a935ab 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -460,6 +460,15 @@ def gitlab_ui_form_with(**args, &block) form_with(**args.merge({ builder: ::Gitlab::FormBuilders::GitlabUiFormBuilder }), &block) end + def controller_full_path + action = case controller.action_name + when 'create' then 'new' + when 'update' then 'edit' + else controller.action_name + end + controller.controller_path + "/" + action + end + private def browser_id diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index f0e61c03e50283..b8126407cab0a4 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -59,7 +59,7 @@ = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? - if Feature.enabled?(:vite) && !Rails.env.test? - %meta{ name: 'controller-path', content: controller.controller_path } + %meta{ name: 'controller-path', content: controller_full_path } = vite_javascript_tag "main" - if Gitlab.ee? = vite_javascript_tag "main_ee" -- GitLab From 937252a041d6d9a906ba7a187e9ed895b7578c0d Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 18:29:49 +0400 Subject: [PATCH 60/89] Fix ruby codestyle --- app/helpers/webpack_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb index 3f172682648c3d..9cc55ba7f1a10f 100644 --- a/app/helpers/webpack_helper.rb +++ b/app/helpers/webpack_helper.rb @@ -38,7 +38,7 @@ def webpack_preload_asset_tag(asset, options = {}) end def webpack_controller_bundle_tags - return nil if Feature.enabled?(:vite) && !Rails.env.test? + return if Feature.enabled?(:vite) && !Rails.env.test? chunks = [] -- GitLab From 4a95645248e629bd32a3fc8efda770cb7113b7b7 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 18:49:28 +0400 Subject: [PATCH 61/89] Another attempt to fix shared commonjs and ESM import --- .../locale/{ensure_single_line.js => ensure_single_line.cjs} | 0 app/assets/javascripts/locale/index.js | 2 +- scripts/frontend/extract_gettext_all.js | 2 +- spec/frontend/locale/ensure_single_line_spec.js | 2 +- vite.config.js | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename app/assets/javascripts/locale/{ensure_single_line.js => ensure_single_line.cjs} (100%) diff --git a/app/assets/javascripts/locale/ensure_single_line.js b/app/assets/javascripts/locale/ensure_single_line.cjs similarity index 100% rename from app/assets/javascripts/locale/ensure_single_line.js rename to app/assets/javascripts/locale/ensure_single_line.cjs diff --git a/app/assets/javascripts/locale/index.js b/app/assets/javascripts/locale/index.js index ad01da2eb1724f..c1afabf1e35287 100644 --- a/app/assets/javascripts/locale/index.js +++ b/app/assets/javascripts/locale/index.js @@ -1,5 +1,5 @@ import Jed from 'jed'; -import ensureSingleLine from './ensure_single_line'; +import ensureSingleLine from './ensure_single_line.cjs'; import sprintf from './sprintf'; const GITLAB_FALLBACK_LANGUAGE = 'en'; diff --git a/scripts/frontend/extract_gettext_all.js b/scripts/frontend/extract_gettext_all.js index 0a5e2b06971cfd..922aa85241fd7c 100644 --- a/scripts/frontend/extract_gettext_all.js +++ b/scripts/frontend/extract_gettext_all.js @@ -6,7 +6,7 @@ const { decorateExtractorWithHelpers, } = require('gettext-extractor-vue'); const vue2TemplateCompiler = require('vue-template-compiler'); -const ensureSingleLine = require('../../app/assets/javascripts/locale/ensure_single_line'); +const ensureSingleLine = require('../../app/assets/javascripts/locale/ensure_single_line.cjs'); const args = argumentsParser .option('-f, --file ', 'Extract message from one single file') diff --git a/spec/frontend/locale/ensure_single_line_spec.js b/spec/frontend/locale/ensure_single_line_spec.js index 20b04cab9c82e8..ca3d57015af231 100644 --- a/spec/frontend/locale/ensure_single_line_spec.js +++ b/spec/frontend/locale/ensure_single_line_spec.js @@ -1,4 +1,4 @@ -import ensureSingleLine from '~/locale/ensure_single_line'; +import ensureSingleLine from '~/locale/ensure_single_line.cjs'; describe('locale', () => { describe('ensureSingleLine', () => { diff --git a/vite.config.js b/vite.config.js index 466b6b08cbd5f6..3d288cf6655ccb 100644 --- a/vite.config.js +++ b/vite.config.js @@ -88,7 +88,7 @@ export default defineConfig({ defaultImport: 'raw', }), viteCommonjs({ - include: [path.resolve(javascriptsPath, 'locale/ensure_single_line.js')], + include: [path.resolve(javascriptsPath, 'locale/ensure_single_line.cjs')], }), ], css: { -- GitLab From 907221d4078d214abf022eed17f778d8372c1804 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 15 Aug 2022 22:59:28 +0400 Subject: [PATCH 62/89] Remove duplicate entrypoint --- config/vite.json | 1 - 1 file changed, 1 deletion(-) diff --git a/config/vite.json b/config/vite.json index 0f63864b4a2312..1cb777107d6eab 100644 --- a/config/vite.json +++ b/config/vite.json @@ -16,7 +16,6 @@ "~/stylesheets/print.scss", "~/stylesheets/disable_animations.scss", "~/stylesheets/test_environment.scss", - "~/stylesheets/test_environment.scss", "~/stylesheets/page_bundles/**/*.scss" ], "watchAdditionalPaths": [], -- GitLab From 7d69cd03db628775adb40a0cdd30ecf112a9e119 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sun, 21 Aug 2022 23:56:04 +0400 Subject: [PATCH 63/89] Add tests for controller_full_path Remove vite_stylesheet_tag override --- app/helpers/vite_helper.rb | 10 ++--- config/webpack.config.js | 6 +-- spec/helpers/application_helper_spec.rb | 58 +++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 12 deletions(-) diff --git a/app/helpers/vite_helper.rb b/app/helpers/vite_helper.rb index 183e08f64735b7..1cb83d86998968 100644 --- a/app/helpers/vite_helper.rb +++ b/app/helpers/vite_helper.rb @@ -17,18 +17,14 @@ def universal_asset_path(*args) end end - def universal_stylesheet_link_tag(*args) + def universal_stylesheet_link_tag(path, *args) if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) && !Rails.env.test? - vite_stylesheet_tag(*args) + vite_stylesheet_tag("stylesheets/#{path}.scss", *args) else - stylesheet_link_tag(*args) + stylesheet_link_tag(path, *args) end end - def vite_stylesheet_tag(path, *args) - super("stylesheets/#{path}.scss", *args) - end - def universal_path_to_stylesheet(path, *args) if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) && !Rails.env.test? vite_asset_url("stylesheets/#{path}.scss", *args) diff --git a/config/webpack.config.js b/config/webpack.config.js index 2a895d7f42404d..2ab306e08b833b 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -30,8 +30,8 @@ const { ROOT_PATH, WEBPACK_OUTPUT_PATH, WEBPACK_PUBLIC_PATH, - SOURCEGRAPH_OUTPUT_PATH, SOURCEGRAPH_PUBLIC_PATH, + SOURCEGRAPH_OUTPUT_PATH, } = require('./webpack.constants'); const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler'); @@ -83,10 +83,6 @@ if (WEBPACK_REPORT) { const SOURCEGRAPH_PACKAGE = '@sourcegraph/code-host-integration'; const GITLAB_WEB_IDE_PACKAGE = '@gitlab/web-ide'; -const SOURCEGRAPH_PATH = path.join('sourcegraph', SOURCEGRAPH_VERSION, '/'); -const SOURCEGRAPH_OUTPUT_PATH = path.join(WEBPACK_OUTPUT_PATH, SOURCEGRAPH_PATH); -const SOURCEGRAPH_PUBLIC_PATH = path.join(WEBPACK_PUBLIC_PATH, SOURCEGRAPH_PATH); - const GITLAB_WEB_IDE_PATH = path.join('gitlab-vscode', GITLAB_WEB_IDE_VERSION, '/'); const GITLAB_WEB_IDE_OUTPUT_PATH = path.join(WEBPACK_OUTPUT_PATH, GITLAB_WEB_IDE_PATH); const GITLAB_WEB_IDE_PUBLIC_PATH = path.join(WEBPACK_PUBLIC_PATH, GITLAB_WEB_IDE_PATH); diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index bb1a4d57cc0f4c..96aba3856bdc7c 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -706,4 +706,62 @@ def stub_controller_method(method_name, value) expect(helper.stylesheet_link_tag_defer('test')).to eq( '') end end + + describe '#use_new_fonts?' do + subject { helper.use_new_fonts? } + + it { is_expected.to eq true } + + context 'when the feature flag is disabled' do + before do + stub_feature_flags(new_fonts: false) + end + + it { is_expected.to eq false } + + context 'with special request param' do + let(:request) { instance_double(ActionController::TestRequest, params: { new_fonts: true }) } + + before do + allow(helper).to receive(:request).and_return(request) + end + + it { is_expected.to eq true } + end + end + end + + describe '#controller_full_path' do + let(:path) { 'some_path' } + let(:action) { 'show' } + + before do + allow(helper.controller).to receive(:controller_path).and_return(path) + allow(helper.controller).to receive(:action_name).and_return(action) + end + + context 'when is create action' do + let(:action) { 'create' } + + it 'transforms to "new" path' do + expect(helper.controller_full_path).to eq("#{path}/new") + end + end + + context 'when is update action' do + let(:action) { 'update' } + + it 'transforms to "edit" path' do + expect(helper.controller_full_path).to eq("#{path}/edit") + end + end + + context 'when is show action' do + let(:action) { 'show' } + + it 'passes through' do + expect(helper.controller_full_path).to eq("#{path}/#{action}") + end + end + end end -- GitLab From f27cff862fa58d0ef909289a1e44e73d55343cb3 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 22 Aug 2022 23:37:24 +0400 Subject: [PATCH 64/89] Limit the scope of page-specific entrypoints for vite --- app/assets/javascripts/entries/main.js | 2 +- app/assets/javascripts/entries/main_ee.js | 2 +- app/assets/javascripts/entries/main_jh.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/entries/main.js b/app/assets/javascripts/entries/main.js index e4372f2f344c3a..6d2d4f345ba50f 100644 --- a/app/assets/javascripts/entries/main.js +++ b/app/assets/javascripts/entries/main.js @@ -1,6 +1,6 @@ import '../main'; -const modules = import.meta.glob('../pages/**/*.js'); +const modules = import.meta.glob('../pages/**/index.js'); const paths = document .querySelector('meta[name="controller-path"]') diff --git a/app/assets/javascripts/entries/main_ee.js b/app/assets/javascripts/entries/main_ee.js index b9147e03d29d28..0469659944beb6 100644 --- a/app/assets/javascripts/entries/main_ee.js +++ b/app/assets/javascripts/entries/main_ee.js @@ -1,4 +1,4 @@ -const modules = import.meta.glob('../../../../ee/app/assets/javascripts/pages/**/*.js'); +const modules = import.meta.glob('../../../../ee/app/assets/javascripts/pages/**/index.js'); const paths = document .querySelector('meta[name="controller-path"]') diff --git a/app/assets/javascripts/entries/main_jh.js b/app/assets/javascripts/entries/main_jh.js index adc7265c93263c..99d7f31ef92541 100644 --- a/app/assets/javascripts/entries/main_jh.js +++ b/app/assets/javascripts/entries/main_jh.js @@ -1,4 +1,4 @@ -const modules = import.meta.glob('../../../../jh/app/assets/javascripts/pages/**/*.js'); +const modules = import.meta.glob('../../../../jh/app/assets/javascripts/pages/**/index.js'); const paths = document .querySelector('meta[name="controller-path"]') -- GitLab From e02e7bf4e2ef8e33f3524db6559b312ceb7c049a Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Wed, 24 Aug 2022 19:01:59 +0400 Subject: [PATCH 65/89] Specify minimal Gitlab UI compatible version --- yarn.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index efbc957df5c11d..53f2f8e76ae055 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2680,15 +2680,6 @@ "@typescript-eslint/types" "5.38.0" eslint-visitor-keys "^3.3.0" -"@vue/compiler-sfc@2.7.10": - version "2.7.10" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz#3fe08e780053a3bbf41328c65ae5dfdee0385206" - integrity sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q== - dependencies: - "@babel/parser" "^7.18.4" - postcss "^8.4.14" - source-map "^0.6.1" - "@vitejs/plugin-vue2@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue2/-/plugin-vue2-1.1.2.tgz#891f0acc5a6a2b4886a74cb8d6359d42f19f968a" @@ -2712,6 +2703,15 @@ "@vue/compiler-core" "3.2.37" "@vue/shared" "3.2.37" +"@vue/compiler-sfc@2.7.10": + version "2.7.10" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz#3fe08e780053a3bbf41328c65ae5dfdee0385206" + integrity sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q== + dependencies: + "@babel/parser" "^7.18.4" + postcss "^8.4.14" + source-map "^0.6.1" + "@vue/compiler-sfc@^3.2.20": version "3.2.37" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz#3103af3da2f40286edcd85ea495dcb35bc7f5ff4" -- GitLab From 0fc949c4df47c9bf2a0adb63d86ef43eec390a1f Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Wed, 24 Aug 2022 23:16:38 +0400 Subject: [PATCH 66/89] Add tests for CSP --- spec/requests/content_security_policy_spec.rb | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb index 3f0665f1ce572d..299cec873fffa5 100644 --- a/spec/requests/content_security_policy_spec.rb +++ b/spec/requests/content_security_policy_spec.rb @@ -46,5 +46,34 @@ it_behaves_like 'snowplow is not in the CSP' end + + context 'when vite enabled during development' do + before do + stub_rails_env('development') + stub_feature_flags(vite: true) + + get explore_root_url + end + + # This test requires vite running in the background + # Enable it after GDK is updated to run vite + skip 'adds vite web socket' do + expect(response).to have_gitlab_http_status(:ok) + expect(response.headers['Content-Security-Policy']).to include('ws://gdk.test:3038') + end + end + + context 'when vite disabled' do + before do + stub_feature_flags(vite: false) + + get explore_root_url + end + + it "doesn't add vite web socket" do + expect(response).to have_gitlab_http_status(:ok) + expect(response.headers['Content-Security-Policy']).not_to include('ws://gdk.test:3038') + end + end end end -- GitLab From ff9cf0bd299bfc091389884c3c75948f9f14e490 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Wed, 24 Aug 2022 23:33:17 +0400 Subject: [PATCH 67/89] Move Vite feature flags into experiment folder This will ensure Vite is not enabled during QA stage in CI --- config/feature_flags/{development => experiment}/vite.yml | 2 +- .../{development => experiment}/vite_stylesheets.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename config/feature_flags/{development => experiment}/vite.yml (90%) rename config/feature_flags/{development => experiment}/vite_stylesheets.yml (91%) diff --git a/config/feature_flags/development/vite.yml b/config/feature_flags/experiment/vite.yml similarity index 90% rename from config/feature_flags/development/vite.yml rename to config/feature_flags/experiment/vite.yml index ab0a20e7509bc4..35f642b6cf631c 100644 --- a/config/feature_flags/development/vite.yml +++ b/config/feature_flags/experiment/vite.yml @@ -3,6 +3,6 @@ name: vite introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94685 rollout_issue_url: milestone: '15.4' -type: development +type: experiment group: group::foundations default_enabled: false diff --git a/config/feature_flags/development/vite_stylesheets.yml b/config/feature_flags/experiment/vite_stylesheets.yml similarity index 91% rename from config/feature_flags/development/vite_stylesheets.yml rename to config/feature_flags/experiment/vite_stylesheets.yml index bef15ed00c4f79..24958abbd10c3d 100644 --- a/config/feature_flags/development/vite_stylesheets.yml +++ b/config/feature_flags/experiment/vite_stylesheets.yml @@ -3,6 +3,6 @@ name: vite_stylesheets introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94685 rollout_issue_url: milestone: '15.4' -type: development +type: experiment group: group::foundations default_enabled: false -- GitLab From c51b6373a0ba440f8f5bc3ffa4463944302ebca2 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 25 Aug 2022 01:18:08 +0400 Subject: [PATCH 68/89] Revert "Move Vite feature flags into experiment folder" This reverts commit 51fb33b20c80064c89f09b780abf37821cb57217. --- config/feature_flags/{experiment => development}/vite.yml | 2 +- .../{experiment => development}/vite_stylesheets.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename config/feature_flags/{experiment => development}/vite.yml (90%) rename config/feature_flags/{experiment => development}/vite_stylesheets.yml (91%) diff --git a/config/feature_flags/experiment/vite.yml b/config/feature_flags/development/vite.yml similarity index 90% rename from config/feature_flags/experiment/vite.yml rename to config/feature_flags/development/vite.yml index 35f642b6cf631c..ab0a20e7509bc4 100644 --- a/config/feature_flags/experiment/vite.yml +++ b/config/feature_flags/development/vite.yml @@ -3,6 +3,6 @@ name: vite introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94685 rollout_issue_url: milestone: '15.4' -type: experiment +type: development group: group::foundations default_enabled: false diff --git a/config/feature_flags/experiment/vite_stylesheets.yml b/config/feature_flags/development/vite_stylesheets.yml similarity index 91% rename from config/feature_flags/experiment/vite_stylesheets.yml rename to config/feature_flags/development/vite_stylesheets.yml index 24958abbd10c3d..bef15ed00c4f79 100644 --- a/config/feature_flags/experiment/vite_stylesheets.yml +++ b/config/feature_flags/development/vite_stylesheets.yml @@ -3,6 +3,6 @@ name: vite_stylesheets introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/94685 rollout_issue_url: milestone: '15.4' -type: experiment +type: development group: group::foundations default_enabled: false -- GitLab From 1697c328bac2d07c12f86ae54311008f80a695d4 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 25 Aug 2022 01:41:16 +0400 Subject: [PATCH 69/89] Only render vite tags when it's running Fixes Vite errors in QA stage --- app/helpers/vite_helper.rb | 22 ++++++++++++++++++---- app/views/layouts/_head.html.haml | 5 +++-- spec/helpers/vite_helper_spec.rb | 1 + 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/helpers/vite_helper.rb b/app/helpers/vite_helper.rb index 1cb83d86998968..d599462c97d011 100644 --- a/app/helpers/vite_helper.rb +++ b/app/helpers/vite_helper.rb @@ -2,7 +2,7 @@ module ViteHelper def universal_javascript_include_tag(*args) - if Feature.enabled?(:vite) && !Rails.env.test? + if vite_enabled vite_javascript_tag(*args) else javascript_include_tag(*args) @@ -10,7 +10,7 @@ def universal_javascript_include_tag(*args) end def universal_asset_path(*args) - if Feature.enabled?(:vite) && !Rails.env.test? + if vite_enabled vite_asset_path(*args) else asset_path(*args) @@ -18,7 +18,7 @@ def universal_asset_path(*args) end def universal_stylesheet_link_tag(path, *args) - if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) && !Rails.env.test? + if vite_stylesheets_enabled vite_stylesheet_tag("stylesheets/#{path}.scss", *args) else stylesheet_link_tag(path, *args) @@ -26,10 +26,24 @@ def universal_stylesheet_link_tag(path, *args) end def universal_path_to_stylesheet(path, *args) - if Feature.enabled?(:vite) && Feature.enabled?(:vite_stylesheets) && !Rails.env.test? + if vite_stylesheets_enabled vite_asset_url("stylesheets/#{path}.scss", *args) else path_to_stylesheet(path, *args) end end + + private + + def vite_enabled + Feature.enabled?(:vite) && !Rails.env.test? && vite_running + end + + def vite_stylesheets_enabled + Feature.enabled?(:vite_stylesheets) && vite_enabled + end + + def vite_running + ViteRuby.instance.dev_server_running? + end end diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index b8126407cab0a4..7e80be598f1d1f 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -1,5 +1,6 @@ - page_description brand_title unless page_description - site_name = _('GitLab') +- vite_enabled = Feature.enabled?(:vite) && !Rails.env.test? && ViteRuby.instance.dev_server_running? %head{ prefix: "og: http://ogp.me/ns#" } %meta{ charset: "utf-8" } @@ -9,7 +10,7 @@ %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge' } - - if Feature.enabled?(:vite) && !Rails.env.test? + - if vite_enabled && Rails.env.development? = javascript_include_tag(vite_manifest.vite_client_src, type: "module", extname: false) = render 'layouts/startup_js' @@ -58,7 +59,7 @@ = webpack_bundle_tag 'legacy_sentry' = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? - - if Feature.enabled?(:vite) && !Rails.env.test? + - if vite_enabled %meta{ name: 'controller-path', content: controller_full_path } = vite_javascript_tag "main" - if Gitlab.ee? diff --git a/spec/helpers/vite_helper_spec.rb b/spec/helpers/vite_helper_spec.rb index 9dea46b3c7d511..535e11917b0989 100644 --- a/spec/helpers/vite_helper_spec.rb +++ b/spec/helpers/vite_helper_spec.rb @@ -18,6 +18,7 @@ allow(helper).to receive(:vite_asset_path).and_return(vite_source) allow(helper).to receive(:vite_stylesheet_tag).and_return(vite_tag) allow(helper).to receive(:vite_asset_url).and_return(vite_source) + allow(helper).to receive(:vite_running).and_return(true) end describe '#universal_javascript_include_tag' do -- GitLab From 8a727f410506d789725b60c000e4c7e516aee706 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 26 Aug 2022 04:30:56 +0400 Subject: [PATCH 70/89] Fix webpack_bundle_tag with vite not running Enable Vite CSP request tests --- app/helpers/webpack_helper.rb | 2 +- spec/requests/content_security_policy_spec.rb | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/helpers/webpack_helper.rb b/app/helpers/webpack_helper.rb index 9cc55ba7f1a10f..928741687980a2 100644 --- a/app/helpers/webpack_helper.rb +++ b/app/helpers/webpack_helper.rb @@ -16,7 +16,7 @@ def prefetch_link_tag(source) end def webpack_bundle_tag(bundle) - if Feature.enabled?(:vite) && !Rails.env.test? + if vite_running vite_javascript_tag bundle else javascript_include_tag(*webpack_entrypoint_paths(bundle)) diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb index 299cec873fffa5..75718489001a88 100644 --- a/spec/requests/content_security_policy_spec.rb +++ b/spec/requests/content_security_policy_spec.rb @@ -55,12 +55,15 @@ get explore_root_url end - # This test requires vite running in the background - # Enable it after GDK is updated to run vite - skip 'adds vite web socket' do + it 'adds vite web socket' do expect(response).to have_gitlab_http_status(:ok) expect(response.headers['Content-Security-Policy']).to include('ws://gdk.test:3038') end + + it 'adds vite web worker' do + expect(response).to have_gitlab_http_status(:ok) + expect(response.headers['Content-Security-Policy']).to include('vite-dev/') + end end context 'when vite disabled' do @@ -74,6 +77,11 @@ expect(response).to have_gitlab_http_status(:ok) expect(response.headers['Content-Security-Policy']).not_to include('ws://gdk.test:3038') end + + it "doesn't add vite web worker" do + expect(response).to have_gitlab_http_status(:ok) + expect(response.headers['Content-Security-Policy']).not_to include('vite-dev/') + end end end end -- GitLab From b72a86c85579ec231e0028d74dffed62b2e080cf Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 26 Aug 2022 05:20:32 +0400 Subject: [PATCH 71/89] Support Vite host on a separate origin during development --- app/controllers/application_controller.rb | 13 ++++++++++--- config/vite.json | 4 ++-- spec/requests/content_security_policy_spec.rb | 19 +++++-------------- vite.config.js | 6 ++++++ 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index f4c3da2545f6c3..d553e35bb650e8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -116,12 +116,19 @@ def self.endpoint_id_for_action(action_name) next if p.directives.blank? if Rails.env.development? && Feature.enabled?(:vite) + vite_host = ViteRuby.instance.config.host + vite_port = ViteRuby.instance.config.port + vite_origin = "#{vite_host}:#{vite_port}" + http_origin = "http://#{vite_origin}" + ws_origin = "ws://#{vite_origin}" + gitlab_ws_origin = Gitlab::Utils.append_path(Gitlab.config.gitlab.url, 'vite-dev/') + dev_path = Gitlab::Utils.append_path(http_origin, 'vite-dev/') + connect_sources = p.directives['connect-src'] - # TODO: the address should be taken from the vite common config - p.connect_src(*(Array.wrap(connect_sources) | ['ws://gdk.test:3038'])) + p.connect_src(*(Array.wrap(connect_sources) | [ws_origin, dev_path])) worker_sources = p.directives['worker-src'] - p.worker_src(*(Array.wrap(worker_sources) | [Gitlab::Utils.append_path(Gitlab.config.gitlab.url, 'vite-dev/')])) + p.worker_src(*(Array.wrap(worker_sources) | [gitlab_ws_origin, dev_path])) end next unless Gitlab::CurrentSettings.snowplow_enabled? && !Gitlab::CurrentSettings.snowplow_collector_hostname.blank? diff --git a/config/vite.json b/config/vite.json index 1cb777107d6eab..2bcab051e874a1 100644 --- a/config/vite.json +++ b/config/vite.json @@ -19,12 +19,12 @@ "~/stylesheets/page_bundles/**/*.scss" ], "watchAdditionalPaths": [], - "devServerConnectTimeout": 1 + "devServerConnectTimeout": 3 }, "development": { "autoBuild": true, "publicOutputDir": "vite-dev", - "host": "172.16.123.1", + "host": "localhost", "port": 3038 }, "test": { diff --git a/spec/requests/content_security_policy_spec.rb b/spec/requests/content_security_policy_spec.rb index 75718489001a88..dcd55b1eeee89e 100644 --- a/spec/requests/content_security_policy_spec.rb +++ b/spec/requests/content_security_policy_spec.rb @@ -7,6 +7,7 @@ # of testing in application_controller_spec. RSpec.describe 'Content Security Policy', feature_category: :application_instrumentation do let(:snowplow_host) { 'snowplow.example.com' } + let(:vite_origin) { "#{ViteRuby.instance.config.host}:#{ViteRuby.instance.config.port}" } shared_examples 'snowplow is not in the CSP' do it 'does not add the snowplow collector hostname to the CSP' do @@ -55,14 +56,9 @@ get explore_root_url end - it 'adds vite web socket' do + it 'adds vite csp' do expect(response).to have_gitlab_http_status(:ok) - expect(response.headers['Content-Security-Policy']).to include('ws://gdk.test:3038') - end - - it 'adds vite web worker' do - expect(response).to have_gitlab_http_status(:ok) - expect(response.headers['Content-Security-Policy']).to include('vite-dev/') + expect(response.headers['Content-Security-Policy']).to include(vite_origin) end end @@ -73,14 +69,9 @@ get explore_root_url end - it "doesn't add vite web socket" do - expect(response).to have_gitlab_http_status(:ok) - expect(response.headers['Content-Security-Policy']).not_to include('ws://gdk.test:3038') - end - - it "doesn't add vite web worker" do + it "doesn't add vite csp" do expect(response).to have_gitlab_http_status(:ok) - expect(response.headers['Content-Security-Policy']).not_to include('vite-dev/') + expect(response.headers['Content-Security-Policy']).not_to include(vite_origin) end end end diff --git a/vite.config.js b/vite.config.js index 3d288cf6655ccb..91694a073b867e 100644 --- a/vite.config.js +++ b/vite.config.js @@ -111,4 +111,10 @@ export default defineConfig({ build: { target: 'es2015', }, + server: { + hmr: { + // should always match host in config/vite.json + host: 'localhost', + }, + }, }); -- GitLab From b1f2df6c34ea6d079ddb3bbd70f2d34d606ab365 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 26 Aug 2022 06:06:33 +0400 Subject: [PATCH 72/89] Properly stub Vite in Webpack helper test --- spec/helpers/webpack_helper_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/helpers/webpack_helper_spec.rb b/spec/helpers/webpack_helper_spec.rb index e18da09ec6a8a6..23585c4723998a 100644 --- a/spec/helpers/webpack_helper_spec.rb +++ b/spec/helpers/webpack_helper_spec.rb @@ -43,6 +43,7 @@ stub_feature_flags(vite: true) allow(helper).to receive(:vite_javascript_tag).and_return('vite') + allow(helper).to receive(:vite_running).and_return(true) end describe '#webpack_bundle_tag' do -- GitLab From 60460ca52a87feff0019acedf1d3e0018f8cc5c4 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Fri, 26 Aug 2022 23:30:47 +0400 Subject: [PATCH 73/89] Fix lockfile --- yarn.lock | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/yarn.lock b/yarn.lock index 53f2f8e76ae055..c4e55d8b0d98ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -349,12 +349,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.8", "@babel/parser@^7.18.10", "@babel/parser@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.0.tgz#497fcafb1d5b61376959c1c338745ef0577aa02c" - integrity sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw== - -"@babel/parser@^7.16.4", "@babel/parser@^7.18.4": +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.16.7", "@babel/parser@^7.16.8", "@babel/parser@^7.18.4", "@babel/parser@^7.18.5": version "7.18.11" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9" integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ== @@ -4605,6 +4600,11 @@ cssstyle@^2.3.0: dependencies: cssom "~0.3.6" +csstype@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2" + integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA== + custom-jquery-matchers@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/custom-jquery-matchers/-/custom-jquery-matchers-2.1.0.tgz#e5988fa9715c416b0986b372563f872d9e91e024" @@ -7077,11 +7077,6 @@ hastscript@^7.0.0: property-information "^6.0.0" space-separated-tokens "^2.0.0" -he@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - highlight.js@^11.5.1, highlight.js@~11.5.0: version "11.5.1" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.5.1.tgz#027c24e4509e2f4dcd00b4a6dda542ce0a1f7aea" @@ -12934,10 +12929,10 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== -vue-loader@15.9.6: - version "15.9.6" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz#f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b" - integrity sha512-j0cqiLzwbeImIC6nVIby2o/ABAWhlppyL/m5oJ67R5MloP0hj/DtFgb0Zmq3J9CG7AJ+AXIvHVnJAPBvrLyuDg== +vue-loader@^15.10: + version "15.10.0" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.10.0.tgz#2a12695c421a2a2cc2138f05a949d04ed086e38b" + integrity sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg== dependencies: "@vue/component-compiler-utils" "^3.1.0" hash-sum "^1.0.2" @@ -12975,14 +12970,6 @@ vue-style-loader@^4.1.0: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@2.6.14: - version "2.6.14" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763" - integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g== - dependencies: - de-indent "^1.0.2" - he "^1.1.0" - vue-template-es2015-compiler@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" @@ -12993,10 +12980,13 @@ vue-virtual-scroll-list@^1.4.7: resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.4.7.tgz#12ee26833885f5bb4d37dc058085ccf3ce5b5a74" integrity sha512-R8bk+k7WMGGoFQ9xF0krGCAlZhQjbJOkDUX+YZD2J+sHQWTzDtmTLS6kiIJToOHK1d/8QPGiD8fd9w0lDP4arg== -vue@2.6.14: - version "2.6.14" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235" - integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ== +vue@^2.7.10: + version "2.7.10" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.10.tgz#ae516cc6c88e1c424754468844218fdd5e280f40" + integrity sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg== + dependencies: + "@vue/compiler-sfc" "2.7.10" + csstype "^3.1.0" vuedraggable@^2.23.0: version "2.23.0" -- GitLab From f7c705ae5906b0a4f239a8a2dbdf92066494f666 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sat, 27 Aug 2022 02:35:10 +0400 Subject: [PATCH 74/89] Fix packages --- package.json | 3 ++- yarn.lock | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c1a9b7452216a4..3d55bbee93baea 100644 --- a/package.json +++ b/package.json @@ -196,15 +196,16 @@ "url-loader": "^4.1.1", "uuid": "8.1.0", "visibilityjs": "^1.2.4", - "vue": "^2.7.10", "vite": "^3.0.4", "vite-plugin-ruby": "^3.1.2", "vite-svg-loader": "^3.4.0", + "vue": "^2.7.10", "vue-apollo": "^3.0.7", "vue-loader": "^15.10", "vue-observe-visibility": "^1.0.0", "vue-resize": "^1.0.1", "vue-router": "3.4.9", + "vue-template-compiler": "^2.7.10", "vue-virtual-scroll-list": "^1.4.7", "vuedraggable": "^2.23.0", "vuex": "^3.6.2", diff --git a/yarn.lock b/yarn.lock index c4e55d8b0d98ec..ffb5cfa91ede94 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7077,6 +7077,11 @@ hastscript@^7.0.0: property-information "^6.0.0" space-separated-tokens "^2.0.0" +he@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== + highlight.js@^11.5.1, highlight.js@~11.5.0: version "11.5.1" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.5.1.tgz#027c24e4509e2f4dcd00b4a6dda542ce0a1f7aea" @@ -12970,6 +12975,14 @@ vue-style-loader@^4.1.0: hash-sum "^1.0.2" loader-utils "^1.0.2" +vue-template-compiler@^2.7.10: + version "2.7.10" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz#9e20f35b2fdccacacf732dd7dedb49bf65f4556b" + integrity sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ== + dependencies: + de-indent "^1.0.2" + he "^1.2.0" + vue-template-es2015-compiler@^1.9.0: version "1.9.1" resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" -- GitLab From d8b6a1732cdf6c46758f03522bcab1b87d2b5782 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sat, 27 Aug 2022 05:56:35 +0400 Subject: [PATCH 75/89] Add more environment variables Refactor HMR development host --- config/webpack.config.js | 7 ++----- config/webpack.constants.js | 9 +++++++++ vite.config.js | 13 ++++++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/config/webpack.config.js b/config/webpack.config.js index 2ab306e08b833b..e01f34db17ac2f 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -5,7 +5,6 @@ const fs = require('fs'); const path = require('path'); const BABEL_VERSION = require('@babel/core/package.json').version; -const GITLAB_WEB_IDE_VERSION = require('@gitlab/web-ide/package.json').version; const BABEL_LOADER_VERSION = require('babel-loader/package.json').version; const CompressionPlugin = require('compression-webpack-plugin'); @@ -32,6 +31,8 @@ const { WEBPACK_PUBLIC_PATH, SOURCEGRAPH_PUBLIC_PATH, SOURCEGRAPH_OUTPUT_PATH, + GITLAB_WEB_IDE_OUTPUT_PATH, + GITLAB_WEB_IDE_PUBLIC_PATH, } = require('./webpack.constants'); const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler'); @@ -83,10 +84,6 @@ if (WEBPACK_REPORT) { const SOURCEGRAPH_PACKAGE = '@sourcegraph/code-host-integration'; const GITLAB_WEB_IDE_PACKAGE = '@gitlab/web-ide'; -const GITLAB_WEB_IDE_PATH = path.join('gitlab-vscode', GITLAB_WEB_IDE_VERSION, '/'); -const GITLAB_WEB_IDE_OUTPUT_PATH = path.join(WEBPACK_OUTPUT_PATH, GITLAB_WEB_IDE_PATH); -const GITLAB_WEB_IDE_PUBLIC_PATH = path.join(WEBPACK_PUBLIC_PATH, GITLAB_WEB_IDE_PATH); - const devtool = IS_PRODUCTION ? 'source-map' : 'cheap-module-eval-source-map'; let autoEntriesCount = 0; diff --git a/config/webpack.constants.js b/config/webpack.constants.js index 91942181f6182f..17816b66db9023 100644 --- a/config/webpack.constants.js +++ b/config/webpack.constants.js @@ -8,6 +8,13 @@ const SOURCEGRAPH_VERSION = require('@sourcegraph/code-host-integration/package. const SOURCEGRAPH_PATH = path.join('sourcegraph', SOURCEGRAPH_VERSION, '/'); const SOURCEGRAPH_OUTPUT_PATH = path.join(WEBPACK_OUTPUT_PATH, SOURCEGRAPH_PATH); const SOURCEGRAPH_PUBLIC_PATH = path.join(WEBPACK_PUBLIC_PATH, SOURCEGRAPH_PATH); + +const GITLAB_WEB_IDE_VERSION = require('@gitlab/web-ide/package.json').version; + +const GITLAB_WEB_IDE_PATH = path.join('gitlab-vscode', GITLAB_WEB_IDE_VERSION, '/'); +const GITLAB_WEB_IDE_OUTPUT_PATH = path.join(WEBPACK_OUTPUT_PATH, GITLAB_WEB_IDE_PATH); +const GITLAB_WEB_IDE_PUBLIC_PATH = path.join(WEBPACK_PUBLIC_PATH, GITLAB_WEB_IDE_PATH); + const IS_EE = require('./helpers/is_ee_env'); const IS_JH = require('./helpers/is_jh_env'); @@ -18,3 +25,5 @@ module.exports.WEBPACK_OUTPUT_PATH = WEBPACK_OUTPUT_PATH; module.exports.WEBPACK_PUBLIC_PATH = WEBPACK_PUBLIC_PATH; module.exports.SOURCEGRAPH_OUTPUT_PATH = SOURCEGRAPH_OUTPUT_PATH; module.exports.SOURCEGRAPH_PUBLIC_PATH = SOURCEGRAPH_PUBLIC_PATH; +module.exports.GITLAB_WEB_IDE_OUTPUT_PATH = GITLAB_WEB_IDE_OUTPUT_PATH; +module.exports.GITLAB_WEB_IDE_PUBLIC_PATH = GITLAB_WEB_IDE_PUBLIC_PATH; diff --git a/vite.config.js b/vite.config.js index 91694a073b867e..8aeb3d4dd190f3 100644 --- a/vite.config.js +++ b/vite.config.js @@ -7,7 +7,13 @@ import graphql from '@rollup/plugin-graphql'; import RubyPlugin from 'vite-plugin-ruby'; import { viteCommonjs } from '@originjs/vite-plugin-commonjs'; import config from './config/webpack.config'; -import { IS_EE, IS_JH, SOURCEGRAPH_PUBLIC_PATH } from './config/webpack.constants'; +import { + IS_EE, + IS_JH, + SOURCEGRAPH_PUBLIC_PATH, + GITLAB_WEB_IDE_PUBLIC_PATH, +} from './config/webpack.constants'; +import viteSharedConfig from './config/vite.json'; const aliasArr = Object.entries(config.resolve.alias).map(([find, replacement]) => ({ find, @@ -106,15 +112,16 @@ export default defineConfig({ IS_JH: IS_JH ? 'typeof window !== "undefined" && window.gon && window.gon.jh' : JSON.stringify(false), + 'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV), 'process.env.SOURCEGRAPH_PUBLIC_PATH': JSON.stringify(SOURCEGRAPH_PUBLIC_PATH), + 'process.env.GITLAB_WEB_IDE_PUBLIC_PATH': JSON.stringify(GITLAB_WEB_IDE_PUBLIC_PATH), }, build: { target: 'es2015', }, server: { hmr: { - // should always match host in config/vite.json - host: 'localhost', + host: viteSharedConfig?.development?.host || 'localhost', }, }, }); -- GitLab From 70033fe5d91cebc955b8824721c5c34c89ac2096 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Sun, 28 Aug 2022 23:20:37 +0400 Subject: [PATCH 76/89] Fix production build Add production build script entry --- package.json | 3 ++- vite.config.js | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 3d55bbee93baea..5b0f8946b1c3e6 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ "swagger:validate": "swagger-cli validate", "webpack": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.config.js", "webpack-vendor": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.vendor.config.js", - "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js" + "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js", + "vite-prod": "NODE_OPTIONS=\"--max-old-space-size=8192\" NODE_ENV=production node_modules/.bin/vite build" }, "dependencies": { "@_ueberdosis/prosemirror-tables": "^1.1.3", diff --git a/vite.config.js b/vite.config.js index 8aeb3d4dd190f3..adcdeb1e469170 100644 --- a/vite.config.js +++ b/vite.config.js @@ -30,6 +30,7 @@ const jhPath = IS_JH ? path.resolve(__dirname, 'jh/app/assets/stylesheets/_jh') : path.resolve(assetsPath, 'stylesheets/_jh'); const gitlabUI = path.resolve(__dirname, 'node_modules/@gitlab/ui/src/scss'); +const threeJsModule = path.resolve(__dirname, 'node_modules/three/build/three.module.js'); const emptyComponent = path.resolve(javascriptsPath, 'vue_shared/components/empty_component.js'); @@ -84,6 +85,10 @@ export default defineConfig({ find: 'path', replacement: 'rollup-plugin-node-polyfills/polyfills/path', }, + { + find: 'three/build/three.module', + replacement: threeJsModule, + }, ], }, plugins: [ -- GitLab From 2527539d50d9747a9655a1187ed77ef78f3f345e Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 29 Aug 2022 00:00:08 +0400 Subject: [PATCH 77/89] Add manual chunks compat from webpack Increase production build memory limit --- package.json | 2 +- vite.config.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5b0f8946b1c3e6..7f806ec1a3ce9c 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "webpack": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.config.js", "webpack-vendor": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.vendor.config.js", "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js", - "vite-prod": "NODE_OPTIONS=\"--max-old-space-size=8192\" NODE_ENV=production node_modules/.bin/vite build" + "vite-prod": "NODE_OPTIONS=\"--max-old-space-size=10240\" NODE_ENV=production node_modules/.bin/vite build" }, "dependencies": { "@_ueberdosis/prosemirror-tables": "^1.1.3", diff --git a/vite.config.js b/vite.config.js index adcdeb1e469170..80e43008b96971 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,6 +15,17 @@ import { } from './config/webpack.constants'; import viteSharedConfig from './config/vite.json'; +const { cacheGroups } = config.optimization.splitChunks; + +const getCacheGroup = (id) => { + const groupName = Object.keys(cacheGroups).find((key) => { + return cacheGroups[key]?.test?.test(id); + }); + const group = cacheGroups[groupName]; + if (group && !group.name) group.name = groupName; + return group; +}; + const aliasArr = Object.entries(config.resolve.alias).map(([find, replacement]) => ({ find, replacement, @@ -123,6 +134,13 @@ export default defineConfig({ }, build: { target: 'es2015', + rollupOptions: { + output: { + manualChunks(id) { + return getCacheGroup(id)?.name; + }, + }, + }, }, server: { hmr: { -- GitLab From 6723f7ee94e33f2f5f4a2db685a9a6183f928cba Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 29 Aug 2022 00:17:35 +0400 Subject: [PATCH 78/89] Revert "Add manual chunks compat from webpack" This reverts commit 0503bf93f0724cce63b278443de4fb71fb287919. --- package.json | 2 +- vite.config.js | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/package.json b/package.json index 7f806ec1a3ce9c..5b0f8946b1c3e6 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "webpack": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.config.js", "webpack-vendor": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.vendor.config.js", "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js", - "vite-prod": "NODE_OPTIONS=\"--max-old-space-size=10240\" NODE_ENV=production node_modules/.bin/vite build" + "vite-prod": "NODE_OPTIONS=\"--max-old-space-size=8192\" NODE_ENV=production node_modules/.bin/vite build" }, "dependencies": { "@_ueberdosis/prosemirror-tables": "^1.1.3", diff --git a/vite.config.js b/vite.config.js index 80e43008b96971..adcdeb1e469170 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,17 +15,6 @@ import { } from './config/webpack.constants'; import viteSharedConfig from './config/vite.json'; -const { cacheGroups } = config.optimization.splitChunks; - -const getCacheGroup = (id) => { - const groupName = Object.keys(cacheGroups).find((key) => { - return cacheGroups[key]?.test?.test(id); - }); - const group = cacheGroups[groupName]; - if (group && !group.name) group.name = groupName; - return group; -}; - const aliasArr = Object.entries(config.resolve.alias).map(([find, replacement]) => ({ find, replacement, @@ -134,13 +123,6 @@ export default defineConfig({ }, build: { target: 'es2015', - rollupOptions: { - output: { - manualChunks(id) { - return getCacheGroup(id)?.name; - }, - }, - }, }, server: { hmr: { -- GitLab From 42da9b3c34f5603e53693e78cc356273d938e550 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Tue, 4 Oct 2022 14:39:10 +0400 Subject: [PATCH 79/89] Update lock file after rebase --- yarn.lock | 289 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 254 insertions(+), 35 deletions(-) diff --git a/yarn.lock b/yarn.lock index ffb5cfa91ede94..0094a66b30ddcb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1195,6 +1195,16 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.4.tgz#defaff6db9a60f08936fc0c59e0eabfb1055968a" integrity sha512-lOD9p2dmjZcNiTU+sGe9Nn6G3aYw3k0HBJies1PU0j5IGfp6tdKOQ6mzfACRFCqXjnBuTqK7eTYpwx09O5LLfg== +"@esbuild/linux-loong64@0.14.54": + version "0.14.54" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" + integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw== + +"@esbuild/linux-loong64@0.15.9": + version "0.15.9" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.9.tgz#b658a97babf1f40783354af7039b84c3fdfc3fc3" + integrity sha512-O+NfmkfRrb3uSsTa4jE3WApidSe3N5++fyOVGP1SmMZi4A3BZELkhUUvj5hwmMuNdlpzAZ8iAPz2vmcR7DCFQA== + "@esbuild/linux-riscv64@0.16.17": version "0.16.17" resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz#c351e433d009bf256e798ad048152c8d76da2fc9" @@ -1893,6 +1903,13 @@ consola "^2.15.0" node-fetch "^2.6.7" +"@originjs/vite-plugin-commonjs@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@originjs/vite-plugin-commonjs/-/vite-plugin-commonjs-1.0.3.tgz#2e3fb11ec78847da9422b79c103953f94d667f09" + integrity sha512-KuEXeGPptM2lyxdIEJ4R11+5ztipHoE7hy8ClZt3PYaOVQ/pyngd2alaSrPnwyFeOW1UagRBaQ752aA1dTMdOQ== + dependencies: + esbuild "^0.14.14" + "@polka/url@^1.0.0-next.9": version "1.0.0-next.12" resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.12.tgz#431ec342a7195622f86688bbda82e3166ce8cb28" @@ -3691,16 +3708,6 @@ browserslist@^4.20.2, browserslist@^4.20.3, browserslist@^4.21.3: node-releases "^2.0.6" update-browserslist-db "^1.0.5" -browserslist@^4.21.3: - version "4.21.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a" - integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ== - dependencies: - caniuse-lite "^1.0.30001370" - electron-to-chromium "^1.4.202" - node-releases "^2.0.6" - update-browserslist-db "^1.0.5" - bser@2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" @@ -3868,11 +3875,6 @@ camelcase@^6.2.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001370: - version "1.0.30001388" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001388.tgz#88e01f4591cbd81f9f665f3f078c66b509fbe55d" - integrity sha512-znVbq4OUjqgLxMxoNX2ZeeLR0d7lcDiE5uJ4eUiWdml1J1EkxbnQq6opT9jb9SMfJxB0XA16/ziHwni4u1I3GQ== - caniuse-lite@^1.0.30001370, caniuse-lite@^1.0.30001373: version "1.0.30001375" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz#8e73bc3d1a4c800beb39f3163bf0190d7e5d7672" @@ -5543,11 +5545,6 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.4.202: - version "1.4.230" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.230.tgz#666909fdf5765acb1348b69752ee9955dc1664b7" - integrity sha512-3pwjAK0qHSDN9+YAF4fJknsSruP7mpjdWzUSruIJD/JCH77pEh0SorEyb3xVaKkfwk2tzjOt2D8scJ0KAdfXLA== - electron-to-chromium@^1.4.202: version "1.4.217" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.217.tgz#f1f51b319435f4c1587a850806a0dfebe9774598" @@ -5714,22 +5711,222 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-loader@^2.21.0: - version "2.21.0" - resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.21.0.tgz#2698a3e565b0db2bb19a3dd91c2b6c9aad526c80" - integrity sha512-k7ijTkCT43YBSZ6+fBCW1Gin7s46RrJ0VQaM8qA7lq7W+OLsGgtLyFV8470FzYi/4TeDexniTBTPTwZUnXXR5g== +esbuild-android-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be" + integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ== + +esbuild-android-64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.9.tgz#4a7eb320ca8d3a305f14792061fd9614ccebb7c0" + integrity sha512-HQCX7FJn9T4kxZQkhPjNZC7tBWZqJvhlLHPU2SFzrQB/7nDXjmTIFpFTjt7Bd1uFpeXmuwf5h5fZm+x/hLnhbw== + +esbuild-android-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771" + integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg== + +esbuild-android-arm64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.9.tgz#c948e5686df20857ad361ec67e070d40d7cab985" + integrity sha512-E6zbLfqbFVCNEKircSHnPiSTsm3fCRxeIMPfrkS33tFjIAoXtwegQfVZqMGR0FlsvVxp2NEDOUz+WW48COCjSg== + +esbuild-darwin-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25" + integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug== + +esbuild-darwin-64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.9.tgz#25f564fa4b39c1cec84dc46bce5634fdbce1d5e4" + integrity sha512-gI7dClcDN/HHVacZhTmGjl0/TWZcGuKJ0I7/xDGJwRQQn7aafZGtvagOFNmuOq+OBFPhlPv1T6JElOXb0unkSQ== + +esbuild-darwin-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73" + integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw== + +esbuild-darwin-arm64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.9.tgz#60faea3ed95d15239536aa88d06bb82b29278a86" + integrity sha512-VZIMlcRN29yg/sv7DsDwN+OeufCcoTNaTl3Vnav7dL/nvsApD7uvhVRbgyMzv0zU/PP0xRhhIpTyc7lxEzHGSw== + +esbuild-freebsd-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d" + integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg== + +esbuild-freebsd-64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.9.tgz#0339ef1c90a919175e7816788224517896657a0e" + integrity sha512-uM4z5bTvuAXqPxrI204txhlsPIolQPWRMLenvGuCPZTnnGlCMF2QLs0Plcm26gcskhxewYo9LkkmYSS5Czrb5A== + +esbuild-freebsd-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48" + integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q== + +esbuild-freebsd-arm64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.9.tgz#32abfc0be3ae3dd38e5a86a9beadbbcf592f1b57" + integrity sha512-HHDjT3O5gWzicGdgJ5yokZVN9K9KG05SnERwl9nBYZaCjcCgj/sX8Ps1jvoFSfNCO04JSsHSOWo4qvxFuj8FoA== + +esbuild-linux-32@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5" + integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw== + +esbuild-linux-32@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.9.tgz#93581348a4da7ed2b29bc5539f2605ad7fcee77b" + integrity sha512-AQIdE8FugGt1DkcekKi5ycI46QZpGJ/wqcMr7w6YUmOmp2ohQ8eO4sKUsOxNOvYL7hGEVwkndSyszR6HpVHLFg== + +esbuild-linux-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652" + integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg== + +esbuild-linux-64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.9.tgz#0d171e7946c95d0d3ed4826026af2c5632d7dcc4" + integrity sha512-4RXjae7g6Qs7StZyiYyXTZXBlfODhb1aBVAjd+ANuPmMhWthQilWo7rFHwJwL7DQu1Fjej2sODAVwLbcIVsAYQ== + +esbuild-linux-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b" + integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig== + +esbuild-linux-arm64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.9.tgz#9838795a3720cbe736d3bc20621bd366eac22f24" + integrity sha512-a+bTtxJmYmk9d+s2W4/R1SYKDDAldOKmWjWP0BnrWtDbvUBNOm++du0ysPju4mZVoEFgS1yLNW+VXnG/4FNwdQ== + +esbuild-linux-arm@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59" + integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw== + +esbuild-linux-arm@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.9.tgz#dce96cd817bc7376f6af3967649c4ab1f2f79506" + integrity sha512-3Zf2GVGUOI7XwChH3qrnTOSqfV1V4CAc/7zLVm4lO6JT6wbJrTgEYCCiNSzziSju+J9Jhf9YGWk/26quWPC6yQ== + +esbuild-linux-mips64le@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34" + integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw== + +esbuild-linux-mips64le@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.9.tgz#0335a0739e61aa97cb9b4a018e3facfcca9cdcfd" + integrity sha512-Zn9HSylDp89y+TRREMDoGrc3Z4Hs5u56ozZLQCiZAUx2+HdbbXbWdjmw3FdTJ/i7t5Cew6/Q+6kfO3KCcFGlyw== + +esbuild-linux-ppc64le@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e" + integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ== + +esbuild-linux-ppc64le@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.9.tgz#18482afb95b8a705e2da0a59d7131bff221281f9" + integrity sha512-OEiOxNAMH9ENFYqRsWUj3CWyN3V8P3ZXyfNAtX5rlCEC/ERXrCEFCJji/1F6POzsXAzxvUJrTSTCy7G6BhA6Fw== + +esbuild-linux-riscv64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8" + integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg== + +esbuild-linux-riscv64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.9.tgz#03b6f9708272c117006b9ce1c9ae8aab91b5a5b6" + integrity sha512-ukm4KsC3QRausEFjzTsOZ/qqazw0YvJsKmfoZZm9QW27OHjk2XKSQGGvx8gIEswft/Sadp03/VZvAaqv5AIwNA== + +esbuild-linux-s390x@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6" + integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA== + +esbuild-linux-s390x@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.9.tgz#65fb645623d575780f155f0ee52935e62f9cca4f" + integrity sha512-uDOQEH55wQ6ahcIKzQr3VyjGc6Po/xblLGLoUk3fVL1qjlZAibtQr6XRfy5wPJLu/M2o0vQKLq4lyJ2r1tWKcw== + +esbuild-loader@^2.20.0: + version "2.20.0" + resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.20.0.tgz#28fcff0142fa7bd227512d69f31e9a6e202bb88f" + integrity sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA== dependencies: esbuild "^0.16.17" joycon "^3.0.1" json5 "^2.2.0" loader-utils "^2.0.0" tapable "^2.2.0" - webpack-sources "^1.4.3" - -esbuild@0.17.4: - version "0.17.4" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.4.tgz#af4f8f78604c67f8e6afbdee36a3f4211ecfc859" - integrity sha512-zBn9MeCwT7W5F1a3lXClD61ip6vQM+H8Msb0w8zMT4ZKBpDg+rFAraNyWCDelB/2L6M3g6AXHPnsyvjMFnxtFw== + webpack-sources "^2.2.0" + +esbuild-netbsd-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81" + integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w== + +esbuild-netbsd-64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.9.tgz#7894297bb9e11f3d2f6f31efecd1be4e181f0d54" + integrity sha512-yWgxaYTQz+TqX80wXRq6xAtb7GSBAp6gqLKfOdANg9qEmAI1Bxn04IrQr0Mzm4AhxvGKoHzjHjMgXbCCSSDxcw== + +esbuild-openbsd-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b" + integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw== + +esbuild-openbsd-64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.9.tgz#0f9d4c6b6772ae50d491d68ad4cc028300dda7c0" + integrity sha512-JmS18acQl4iSAjrEha1MfEmUMN4FcnnrtTaJ7Qg0tDCOcgpPPQRLGsZqhes0vmx8VA6IqRyScqXvaL7+Q0Uf3A== + +esbuild-sunos-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da" + integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw== + +esbuild-sunos-64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.9.tgz#c32b7ce574b08f814de810ce7c1e34b843768126" + integrity sha512-UKynGSWpzkPmXW3D2UMOD9BZPIuRaSqphxSCwScfEE05Be3KAmvjsBhht1fLzKpiFVJb0BYMd4jEbWMyJ/z1hQ== + +esbuild-windows-32@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31" + integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w== + +esbuild-windows-32@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.9.tgz#37a8f7cfccdb2177cd46613a1a1e1fcb419d36df" + integrity sha512-aqXvu4/W9XyTVqO/hw3rNxKE1TcZiEYHPsXM9LwYmKSX9/hjvfIJzXwQBlPcJ/QOxedfoMVH0YnhhQ9Ffb0RGA== + +esbuild-windows-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4" + integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ== + +esbuild-windows-64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.9.tgz#5fe1e76fc13dd7f520febecaea110b6f1649c7b2" + integrity sha512-zm7h91WUmlS4idMtjvCrEeNhlH7+TNOmqw5dJPJZrgFaxoFyqYG6CKDpdFCQXdyKpD5yvzaQBOMVTCBVKGZDEg== + +esbuild-windows-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982" + integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg== + +esbuild-windows-arm64@0.15.9: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.9.tgz#98504428f7ba7d2cfc11940be68ee1139173fdce" + integrity sha512-yQEVIv27oauAtvtuhJVfSNMztJJX47ismRS6Sv2QMVV9RM+6xjbMWuuwM2nxr5A2/gj/mu2z9YlQxiwoFRCfZA== + +esbuild@0.15.9, esbuild@^0.15.6: + version "0.15.9" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.9.tgz#33fb18b67b85004b6f7616bec955ca4b3e58935d" + integrity sha512-OnYr1rkMVxtmMHIAKZLMcEUlJmqcbxBz9QoBU8G9v455na0fuzlT/GLu6l+SRghrk0Mm2fSSciMmzV43Q8e0Gg== optionalDependencies: "@esbuild/android-arm" "0.17.4" "@esbuild/android-arm64" "0.17.4" @@ -5782,6 +5979,33 @@ esbuild@^0.16.17: "@esbuild/win32-ia32" "0.16.17" "@esbuild/win32-x64" "0.16.17" +esbuild@^0.14.14, esbuild@^0.14.47: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2" + integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA== + optionalDependencies: + "@esbuild/linux-loong64" "0.14.54" + esbuild-android-64 "0.14.54" + esbuild-android-arm64 "0.14.54" + esbuild-darwin-64 "0.14.54" + esbuild-darwin-arm64 "0.14.54" + esbuild-freebsd-64 "0.14.54" + esbuild-freebsd-arm64 "0.14.54" + esbuild-linux-32 "0.14.54" + esbuild-linux-64 "0.14.54" + esbuild-linux-arm "0.14.54" + esbuild-linux-arm64 "0.14.54" + esbuild-linux-mips64le "0.14.54" + esbuild-linux-ppc64le "0.14.54" + esbuild-linux-riscv64 "0.14.54" + esbuild-linux-s390x "0.14.54" + esbuild-netbsd-64 "0.14.54" + esbuild-openbsd-64 "0.14.54" + esbuild-sunos-64 "0.14.54" + esbuild-windows-32 "0.14.54" + esbuild-windows-64 "0.14.54" + esbuild-windows-arm64 "0.14.54" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -9803,11 +10027,6 @@ node-releases@^2.0.6: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== -node-releases@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" - integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== - nodemon@^2.0.19: version "2.0.19" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.19.tgz#cac175f74b9cb8b57e770d47841995eebe4488bd" -- GitLab From 30bf87aaecc442fedb0d07993d39bb675a931f70 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Wed, 5 Oct 2022 19:04:52 +0400 Subject: [PATCH 80/89] Update gemfile checksum after rebase --- Gemfile.checksum | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile.checksum b/Gemfile.checksum index 19ed2a937b244f..2d789059a3740d 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -116,6 +116,7 @@ {"name":"doorkeeper","version":"5.5.4","platform":"ruby","checksum":"7fe233a96f93bf0d5496e2284abf431f38ab465fd65d1972b90cbec7c45b1ea1"}, {"name":"doorkeeper-openid_connect","version":"1.8.3","platform":"ruby","checksum":"0df2e714508f1f43fdb4669e97b38b90d365a072908427416da943a1a8e00b6e"}, {"name":"dotenv","version":"2.7.6","platform":"ruby","checksum":"2451ed5e8e43776d7a787e51d6f8903b98e446146c7ad143d5678cc2c409d547"}, +{"name":"dry-cli","version":"0.7.0","platform":"ruby","checksum":"7aa4d4808cdfb39de2f5fc770e34e216ac4ee5e5e77b42757701068b42bbcdb9"}, {"name":"dry-configurable","version":"0.12.0","platform":"ruby","checksum":"87a9579a04dfbae73e401d694282800d64bbdb8631cb3e987bfb79b673df7c67"}, {"name":"dry-container","version":"0.7.2","platform":"ruby","checksum":"a071824ba3451048b23500210f96a2b9facd6e46ac687f65e49c75d18786f6da"}, {"name":"dry-core","version":"0.5.0","platform":"ruby","checksum":"3af9777320a7c930766e2fe638df970c62145100f673caf7aae25ecc3a2c4493"}, @@ -643,6 +644,8 @@ {"name":"version_gem","version":"1.1.0","platform":"ruby","checksum":"6b009518020db57f51ec7b410213fae2bf692baea9f1b51770db97fbc93d9a80"}, {"name":"version_sorter","version":"2.3.0","platform":"ruby","checksum":"2147f2a1a3804fbb8f60d268b7d7c1ec717e6dd727ffe2c165b4e05e82efe1da"}, {"name":"view_component","version":"2.74.1","platform":"ruby","checksum":"0bbd47a9c11455a45043dc01aa604db708654718a4d8755c911425482e8392c0"}, +{"name":"vite_rails","version":"3.0.10","platform":"ruby","checksum":"d0da61fad05563860480729dbcbfc68bcc354ea1cf86dd37168a86674c537b4c"}, +{"name":"vite_ruby","version":"3.2.1","platform":"ruby","checksum":"9740b18b302ea1d8c2148d347b36e1e016d3c00461cceae449b78bbda8e384d5"}, {"name":"vmstat","version":"2.3.0","platform":"ruby","checksum":"ab5446a3e3bd0a9cdb9d9ac69a0bbd119c4f161d945a0846a519dd7018af656d"}, {"name":"warden","version":"1.2.9","platform":"ruby","checksum":"46684f885d35a69dbb883deabf85a222c8e427a957804719e143005df7a1efd0"}, {"name":"warning","version":"1.3.0","platform":"ruby","checksum":"23695a5d8e50bd5c46068931b529bee0b28e4982cbcefbe77d867800dde8069e"}, -- GitLab From 921dda2a8f6f97575da336fadb300f1d10ad939c Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 6 Oct 2022 00:08:31 +0400 Subject: [PATCH 81/89] Fix outdated import --- app/assets/stylesheets/components/index.sass | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/components/index.sass b/app/assets/stylesheets/components/index.sass index bba9ac16374e2a..3cae4847aa25fd 100644 --- a/app/assets/stylesheets/components/index.sass +++ b/app/assets/stylesheets/components/index.sass @@ -4,7 +4,6 @@ @import './dashboard_skeleton' @import './date_time_picker' @import './deployment_instance' -@import './feature_highlight' @import './milestone_combobox' @import './ref_selector' @import './related_items_list' -- GitLab From 611902794c91b9674a61e7b3508fe251eaaae4c8 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 6 Oct 2022 01:17:58 +0400 Subject: [PATCH 82/89] Fix removed file after rebase --- app/helpers/javascript_helper.rb | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/helpers/javascript_helper.rb diff --git a/app/helpers/javascript_helper.rb b/app/helpers/javascript_helper.rb deleted file mode 100644 index e69de29bb2d1d6..00000000000000 -- GitLab From 7f19de0f5675d1493567ea218da322ae9128e7a2 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Thu, 6 Oct 2022 02:41:17 +0400 Subject: [PATCH 83/89] Fix outdated style imports --- ee/app/assets/stylesheets/pages/index.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ee/app/assets/stylesheets/pages/index.scss b/ee/app/assets/stylesheets/pages/index.scss index 50b4fdee0255ee..bc9853c0bcf8f8 100644 --- a/ee/app/assets/stylesheets/pages/index.scss +++ b/ee/app/assets/stylesheets/pages/index.scss @@ -1,19 +1,11 @@ -@import 'geo'; @import 'security/vulnerability_report'; @import 'security/compliance_dashboard'; @import 'issuable_form'; @import 'projects'; @import 'subscriptions'; @import 'issues'; -@import 'merge_request_analytics'; @import 'groups'; @import 'ee_start_trial'; -@import 'contributors'; @import 'promotions'; @import 'issuable'; -@import 'requirements'; @import 'issues/related_issues'; -@import 'milestone'; -@import 'issues_analytics'; -@import 'billings'; -@import 'code_review'; -- GitLab From 2b5e28f84cab55dee8cdc3517b1d52d6104a53bf Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 5 Dec 2022 13:11:40 +0400 Subject: [PATCH 84/89] Fix dependencies --- package.json | 8 ++--- yarn.lock | 88 ++++++++++++++++++---------------------------------- 2 files changed, 34 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index 5b0f8946b1c3e6..d483cdf74eb008 100644 --- a/package.json +++ b/package.json @@ -64,9 +64,8 @@ "@rails/actioncable": "6.1.4-7", "@rails/ujs": "6.1.4-7", "@rollup/plugin-graphql": "^1.1.0", - "@sourcegraph/code-host-integration": "0.0.84", "@sentry/browser": "5.30.0", - "@sourcegraph/code-host-integration": "0.0.82", + "@sourcegraph/code-host-integration": "0.0.84", "@tiptap/core": "^2.0.0-beta.182", "@tiptap/extension-blockquote": "^2.0.0-beta.29", "@tiptap/extension-bold": "^2.0.0-beta.28", @@ -79,7 +78,7 @@ "@tiptap/extension-gapcursor": "^2.0.0-beta.38", "@tiptap/extension-hard-break": "^2.0.0-beta.33", "@tiptap/extension-heading": "^2.0.0-beta.29", - "@tiptap/extension-highlight": "^2.0.0-beta.35", + "@tiptap/extension-highlight": "2.0.0-beta.35", "@tiptap/extension-history": "^2.0.0-beta.25", "@tiptap/extension-horizontal-rule": "^2.0.0-beta.36", "@tiptap/extension-image": "^2.0.0-beta.30", @@ -215,7 +214,7 @@ "webpack-bundle-analyzer": "^4.6.1", "webpack-cli": "^4.10.0", "webpack-stats-plugin": "^0.3.1", - "worker-loader": "^2.0.0", + "worker-loader": "3.0.8", "xterm": "3.14.5", "yaml": "^2.0.0-10" }, @@ -288,4 +287,3 @@ "yarn": "^1.10.0" } } - diff --git a/yarn.lock b/yarn.lock index 0094a66b30ddcb..f4c4674023e411 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1951,7 +1951,7 @@ estree-walker "^2.0.1" picomatch "^2.2.2" -"@sentry/browser@5.30.0": +"@sentry/browser@5.30.0", "sentrybrowser5@npm:@sentry/browser@5.30.0": version "5.30.0" resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz#c28f49d551db3172080caef9f18791a7fd39e3b3" integrity sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw== @@ -2158,10 +2158,10 @@ resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.202.tgz#da12041c626825f8a3f3173ac922e11f2df55cbf" integrity sha512-sF271jSWHgtoJLDNFLS7eyUcUStl7mBDQNJIENWVI+lFu2Ax8GmO7AoB74Q6L5Zaw4h73L6TAvaafHIXurz7tA== -"@tiptap/extension-highlight@^2.0.0-beta.209": - version "2.0.0-beta.209" - resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-2.0.0-beta.209.tgz#f373884097c17daf92ce3aecdc6c3781a4904c31" - integrity sha512-uy0Zu1dU2VcozvqpECb7+mxiazxstlb6w7jQQx8n4PAwIfN2LGv1UIil+VKRkc9amjBVwz+knm9psXEeJfjiBw== +"@tiptap/extension-highlight@2.0.0-beta.35": + version "2.0.0-beta.35" + resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-2.0.0-beta.35.tgz#0738102b23f69f9c8ddada4f05ccb580d1d50133" + integrity sha512-xvEKOyuTj4mhQ8GIOItaSymJhGkWt2gGuCvmFWnTVZAaJJQOlgUTdkmayLCtwoDDP7biiuDhRJokTukGGmhUZw== "@tiptap/extension-history@^2.0.0-beta.202": version "2.0.0-beta.202" @@ -2289,6 +2289,11 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== + "@tsconfig/node10@^1.0.7": version "1.0.9" resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" @@ -2309,11 +2314,6 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== -"@trysound/sax@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" - integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== - "@types/aria-query@^4.2.0": version "4.2.0" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0" @@ -3057,7 +3057,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.0, acorn@^8.5.0: +acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== @@ -5457,11 +5457,6 @@ domhandler@^4.0.0, domhandler@^4.2.0: dependencies: domelementtype "^2.2.0" -dommatrix@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/dommatrix/-/dommatrix-1.0.3.tgz#e7c18e8d6f3abdd1fef3dd4aa74c4d2e620a0525" - integrity sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww== - domhandler@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" @@ -5469,6 +5464,11 @@ domhandler@^4.3.1: dependencies: domelementtype "^2.2.0" +dommatrix@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/dommatrix/-/dommatrix-1.0.3.tgz#e7c18e8d6f3abdd1fef3dd4aa74c4d2e620a0525" + integrity sha512-l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww== + dompurify@2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f" @@ -8708,7 +8708,7 @@ loader-runner@^2.4.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== -loader-utils@^1.0.0, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: +loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== @@ -11503,14 +11503,6 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -schema-utils@^0.4.0: - version "0.4.7" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" - integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ== - dependencies: - ajv "^6.1.0" - ajv-keywords "^3.1.0" - schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" @@ -11616,16 +11608,6 @@ send@0.17.2: range-parser "~1.2.1" statuses "~1.5.0" -"sentrybrowser5@npm:@sentry/browser@5.30.0": - version "5.30.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.30.0.tgz#c28f49d551db3172080caef9f18791a7fd39e3b3" - integrity sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw== - dependencies: - "@sentry/core" "5.30.0" - "@sentry/types" "5.30.0" - "@sentry/utils" "5.30.0" - tslib "^1.9.3" - "sentrybrowser7@npm:@sentry/browser@^7.21.1": version "7.21.1" resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.21.1.tgz#bffa3ea19050c06400107d2297b9802f9719f98b" @@ -11878,7 +11860,7 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12: +source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20: version "0.5.20" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== @@ -11886,14 +11868,6 @@ source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.1 buffer-from "^1.0.0" source-map "^0.6.0" -source-map-support@~0.5.12, source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - source-map-url@^0.4.0: version "0.4.1" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" @@ -12294,13 +12268,6 @@ svg-tags@^1.0.0: resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= -swagger-cli@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/swagger-cli/-/swagger-cli-4.0.4.tgz#c3f0b94277073c776b9bcc3ae7507b372f3ff414" - integrity sha512-Cp8YYuLny3RJFQ4CvOBTaqmOOgYsem52dPx1xM5S4EUWFblIh2Q8atppMZvXKUr1e9xH5RwipYpmdUzdPcxWcA== - dependencies: - "@apidevtools/swagger-cli" "4.0.4" - svgo@^2.7.0: version "2.8.0" resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" @@ -12314,6 +12281,13 @@ svgo@^2.7.0: picocolors "^1.0.0" stable "^0.1.8" +swagger-cli@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/swagger-cli/-/swagger-cli-4.0.4.tgz#c3f0b94277073c776b9bcc3ae7507b372f3ff414" + integrity sha512-Cp8YYuLny3RJFQ4CvOBTaqmOOgYsem52dPx1xM5S4EUWFblIh2Q8atppMZvXKUr1e9xH5RwipYpmdUzdPcxWcA== + dependencies: + "@apidevtools/swagger-cli" "4.0.4" + swagger-ui-dist@4.12.0: version "4.12.0" resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-4.12.0.tgz#986d90f05e81fb9db3ca40372278a5d8ce71db3a" @@ -13551,13 +13525,13 @@ worker-farm@^1.7.0: dependencies: errno "~0.1.7" -worker-loader@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz#45fda3ef76aca815771a89107399ee4119b430ac" - integrity sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw== +worker-loader@3.0.8: + version "3.0.8" + resolved "https://registry.yarnpkg.com/worker-loader/-/worker-loader-3.0.8.tgz#5fc5cda4a3d3163d9c274a4e3a811ce8b60dbb37" + integrity sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g== dependencies: - loader-utils "^1.0.0" - schema-utils "^0.4.0" + loader-utils "^2.0.0" + schema-utils "^3.0.0" wrap-ansi@^6.2.0: version "6.2.0" -- GitLab From 2b7093c934d78376d380fedcc2a2da09b784087e Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 5 Dec 2022 13:29:18 +0400 Subject: [PATCH 85/89] Fix stylesheets --- app/assets/stylesheets/components/index.sass | 13 +++---------- ee/app/assets/stylesheets/pages/index.scss | 11 +++++------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/components/index.sass b/app/assets/stylesheets/components/index.sass index 3cae4847aa25fd..24b6a25b4860f3 100644 --- a/app/assets/stylesheets/components/index.sass +++ b/app/assets/stylesheets/components/index.sass @@ -1,17 +1,10 @@ +@import './severity/icons' +@import './upload_dropzone/upload_dropzone' @import './avatar' @import './collapsible_card' @import './content_editor' -@import './dashboard_skeleton' -@import './date_time_picker' @import './deployment_instance' -@import './milestone_combobox' @import './ref_selector' @import './related_items_list' -@import './release_block' -@import './release_block_milestone_info' +@import './shortcuts_help' @import './whats_new' -@import './batch_comments/review_bar' -@import './design_management/design' -@import './design_management/design_list_item' -@import './severity/icons' -@import './upload_dropzone/upload_dropzone' diff --git a/ee/app/assets/stylesheets/pages/index.scss b/ee/app/assets/stylesheets/pages/index.scss index bc9853c0bcf8f8..5787810627279e 100644 --- a/ee/app/assets/stylesheets/pages/index.scss +++ b/ee/app/assets/stylesheets/pages/index.scss @@ -1,11 +1,10 @@ @import 'security/vulnerability_report'; @import 'security/compliance_dashboard'; +@import 'ee_start_trial'; +@import 'groups'; +@import 'issuable'; @import 'issuable_form'; -@import 'projects'; -@import 'subscriptions'; @import 'issues'; -@import 'groups'; -@import 'ee_start_trial'; +@import 'projects'; @import 'promotions'; -@import 'issuable'; -@import 'issues/related_issues'; +@import 'subscriptions'; -- GitLab From b26ce0d7f9104987520614a771b0a6d75e4a6fe6 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 5 Dec 2022 13:29:42 +0400 Subject: [PATCH 86/89] Remove dompurify hack --- app/assets/javascripts/dompurify.js | 6 ------ vite.config.js | 4 ---- 2 files changed, 10 deletions(-) delete mode 100644 app/assets/javascripts/dompurify.js diff --git a/app/assets/javascripts/dompurify.js b/app/assets/javascripts/dompurify.js deleted file mode 100644 index cd421b76acd170..00000000000000 --- a/app/assets/javascripts/dompurify.js +++ /dev/null @@ -1,6 +0,0 @@ -// eslint-disable-next-line -import DOMPurify from '../../../node_modules/dompurify/dist/purify.es.js'; - -const { sanitize, addHook, isValidAttribute } = DOMPurify; - -export { sanitize, addHook, isValidAttribute }; diff --git a/vite.config.js b/vite.config.js index adcdeb1e469170..78c98076d83576 100644 --- a/vite.config.js +++ b/vite.config.js @@ -65,10 +65,6 @@ export default defineConfig({ resolve: { alias: [ ...aliasArr, - { - find: 'dompurify', - replacement: path.resolve(__dirname, 'app/assets/javascripts/dompurify.js'), - }, { find: /^ee_component\/(.*)\.vue/, replacement: emptyComponent, -- GitLab From 3a4f343ab4e8903484ee2529aaa9c138d0778c58 Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 5 Dec 2022 13:37:02 +0400 Subject: [PATCH 87/89] Fix Vite support for GDK with HTTPS enabled --- app/controllers/application_controller.rb | 7 ++++--- vite.config.js | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d553e35bb650e8..c597e1656159c8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -121,14 +121,15 @@ def self.endpoint_id_for_action(action_name) vite_origin = "#{vite_host}:#{vite_port}" http_origin = "http://#{vite_origin}" ws_origin = "ws://#{vite_origin}" + wss_origin = "wss://#{vite_origin}" gitlab_ws_origin = Gitlab::Utils.append_path(Gitlab.config.gitlab.url, 'vite-dev/') - dev_path = Gitlab::Utils.append_path(http_origin, 'vite-dev/') + http_path = Gitlab::Utils.append_path(http_origin, 'vite-dev/') connect_sources = p.directives['connect-src'] - p.connect_src(*(Array.wrap(connect_sources) | [ws_origin, dev_path])) + p.connect_src(*(Array.wrap(connect_sources) | [ws_origin, wss_origin, http_path])) worker_sources = p.directives['worker-src'] - p.worker_src(*(Array.wrap(worker_sources) | [gitlab_ws_origin, dev_path])) + p.worker_src(*(Array.wrap(worker_sources) | [gitlab_ws_origin, http_path])) end next unless Gitlab::CurrentSettings.snowplow_enabled? && !Gitlab::CurrentSettings.snowplow_collector_hostname.blank? diff --git a/vite.config.js b/vite.config.js index 78c98076d83576..02d8e2ba63cbc7 100644 --- a/vite.config.js +++ b/vite.config.js @@ -123,6 +123,9 @@ export default defineConfig({ server: { hmr: { host: viteSharedConfig?.development?.host || 'localhost', + // ensure we stay compatible with HTTPS enabled for GDK + protocol: 'ws', }, + https: false, }, }); -- GitLab From aaae91526e43f1a4cdf7f935174b6827da14bdbc Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Mon, 5 Dec 2022 13:57:04 +0400 Subject: [PATCH 88/89] Bump dependencies --- Gemfile.lock | 6 +- yarn.lock | 311 ++++++++++++++++++++++++++++----------------------- 2 files changed, 173 insertions(+), 144 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e8b79d5899c1fc..05799f2d43b07e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1547,10 +1547,10 @@ GEM activesupport (>= 5.0.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) - vite_rails (3.0.10) + vite_rails (3.0.13) railties (>= 5.1, < 8) - vite_ruby (~> 3.0) - vite_ruby (3.2.1) + vite_ruby (~> 3.0, >= 3.2.2) + vite_ruby (3.2.12) dry-cli (~> 0.7.0) rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) diff --git a/yarn.lock b/yarn.lock index f4c4674023e411..df85ca7a7fd7a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1065,141 +1065,26 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f" integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA== -"@esbuild/android-arm64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23" - integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg== - -"@esbuild/android-arm64@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.4.tgz#0a900a7e448cc038ae5a751255257fc67163ed32" - integrity sha512-91VwDrl4EpxBCiG6h2LZZEkuNvVZYJkv2T9gyLG/mhGG1qrM7i5SwUcg/hlSPnL/4hDT0TFcF35/XMGSn0bemg== - -"@esbuild/android-arm@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2" - integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw== - -"@esbuild/android-arm@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.4.tgz#fe32ce82eb6064d3dc13c0d8ca0e440bbc776c93" - integrity sha512-R9GCe2xl2XDSc2XbQB63mFiFXHIVkOP+ltIxICKXqUPrFX97z6Z7vONCLQM1pSOLGqfLrGi3B7nbhxmFY/fomg== - -"@esbuild/android-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e" - integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ== - -"@esbuild/android-x64@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.4.tgz#6ae1056f6ecf1963c1d076cf5f0109b52d8049f6" - integrity sha512-mGSqhEPL7029XL7QHNPxPs15JVa02hvZvysUcyMP9UXdGFwncl2WU0bqx+Ysgzd+WAbv8rfNa73QveOxAnAM2w== - -"@esbuild/darwin-arm64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220" - integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w== - -"@esbuild/darwin-arm64@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.4.tgz#5064d81ee5b8d646a5b7cc3e53c98cb983c4af55" - integrity sha512-tTyJRM9dHvlMPt1KrBFVB5OW1kXOsRNvAPtbzoKazd5RhD5/wKlXk1qR2MpaZRYwf4WDMadt0Pv0GwxB41CVow== - -"@esbuild/darwin-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4" - integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg== - -"@esbuild/darwin-x64@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.4.tgz#67f0213b3333248b32a97a7fc3fee880c2157674" - integrity sha512-phQuC2Imrb3TjOJwLN8EO50nb2FHe8Ew0OwgZDH1SV6asIPGudnwTQtighDF2EAYlXChLoMJwqjAp4vAaACq6w== - -"@esbuild/freebsd-arm64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27" - integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw== - -"@esbuild/freebsd-arm64@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.4.tgz#8eaaa126d9ff24822c730f06a71ac2d1091dc1c2" - integrity sha512-oH6JUZkocgmjzzYaP5juERLpJQSwazdjZrTPgLRmAU2bzJ688x0vfMB/WTv4r58RiecdHvXOPC46VtsMy/mepg== - -"@esbuild/freebsd-x64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72" - integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug== - -"@esbuild/freebsd-x64@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.4.tgz#314eff900a71abf64d4e5bea31e430d8ebd78d79" - integrity sha512-U4iWGn/9TrAfpAdfd56eO0pRxIgb0a8Wj9jClrhT8hvZnOnS4dfMPW7o4fn15D/KqoiVYHRm43jjBaTt3g/2KA== - -"@esbuild/linux-arm64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca" - integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g== - -"@esbuild/linux-arm64@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.4.tgz#5bed6bb8eb1d331644f8b31c87b8df57f204e84e" - integrity sha512-UkGfQvYlwOaeYJzZG4cLV0hCASzQZnKNktRXUo3/BMZvdau40AOz9GzmGA063n1piq6VrFFh43apRDQx8hMP2w== - -"@esbuild/linux-arm@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196" - integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ== - -"@esbuild/linux-arm@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.4.tgz#6eaa41f37e231d113da715a1d9cc820e5523aeb6" - integrity sha512-S2s9xWTGMTa/fG5EyMGDeL0wrWVgOSQcNddJWgu6rG1NCSXJHs76ZP9AsxjB3f2nZow9fWOyApklIgiTGZKhiw== - -"@esbuild/linux-ia32@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54" - integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg== - -"@esbuild/linux-ia32@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.4.tgz#3fc352bb54e0959fda273cd2253b1c72ca41b8c2" - integrity sha512-3lqFi4VFo/Vwvn77FZXeLd0ctolIJH/uXkH3yNgEk89Eh6D3XXAC9/iTPEzeEpsNE5IqGIsFa5Z0iPeOh25IyA== - -"@esbuild/linux-loong64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8" - integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ== - -"@esbuild/linux-loong64@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.4.tgz#86d54f690be53669cd2a38a5333ecf2608c11189" - integrity sha512-HqpWZkVslDHIwdQ9D+gk7NuAulgQvRxF9no54ut/M55KEb3mi7sQS3GwpPJzSyzzP0UkjQVN7/tbk88/CaX4EQ== - -"@esbuild/linux-mips64el@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726" - integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw== +"@esbuild/android-arm@0.15.18": + version "0.15.18" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.18.tgz#266d40b8fdcf87962df8af05b76219bc786b4f80" + integrity sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw== -"@esbuild/linux-mips64el@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.4.tgz#3dbd897bd8f047fef35e69bd253b8f07ca7fe483" - integrity sha512-d/nMCKKh/SVDbqR9ju+b78vOr0tNXtfBjcp5vfHONCCOAL9ad8gN9dC/u+UnH939pz7wO+0u/x9y1MaZcb/lKA== - -"@esbuild/linux-ppc64@0.16.17": - version "0.16.17" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8" - integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g== - -"@esbuild/linux-ppc64@0.17.4": - version "0.17.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.4.tgz#defaff6db9a60f08936fc0c59e0eabfb1055968a" - integrity sha512-lOD9p2dmjZcNiTU+sGe9Nn6G3aYw3k0HBJies1PU0j5IGfp6tdKOQ6mzfACRFCqXjnBuTqK7eTYpwx09O5LLfg== +"@esbuild/android-arm@0.15.9": + version "0.15.9" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.9.tgz#7e1221604ab88ed5021ead74fa8cca4405e1e431" + integrity sha512-VZPy/ETF3fBG5PiinIkA0W/tlsvlEgJccyN2DzWZEl0DlVKRbu91PvY2D6Lxgluj4w9QtYHjOWjAT44C+oQ+EQ== "@esbuild/linux-loong64@0.14.54": version "0.14.54" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw== +"@esbuild/linux-loong64@0.15.18": + version "0.15.18" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz#128b76ecb9be48b60cf5cfc1c63a4f00691a3239" + integrity sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ== + "@esbuild/linux-loong64@0.15.9": version "0.15.9" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.9.tgz#b658a97babf1f40783354af7039b84c3fdfc3fc3" @@ -5716,6 +5601,11 @@ esbuild-android-64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be" integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ== +esbuild-android-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz#20a7ae1416c8eaade917fb2453c1259302c637a5" + integrity sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA== + esbuild-android-64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.9.tgz#4a7eb320ca8d3a305f14792061fd9614ccebb7c0" @@ -5726,6 +5616,11 @@ esbuild-android-arm64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771" integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg== +esbuild-android-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz#9cc0ec60581d6ad267568f29cf4895ffdd9f2f04" + integrity sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ== + esbuild-android-arm64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.9.tgz#c948e5686df20857ad361ec67e070d40d7cab985" @@ -5736,6 +5631,11 @@ esbuild-darwin-64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25" integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug== +esbuild-darwin-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz#428e1730ea819d500808f220fbc5207aea6d4410" + integrity sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg== + esbuild-darwin-64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.9.tgz#25f564fa4b39c1cec84dc46bce5634fdbce1d5e4" @@ -5746,6 +5646,11 @@ esbuild-darwin-arm64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73" integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw== +esbuild-darwin-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz#b6dfc7799115a2917f35970bfbc93ae50256b337" + integrity sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA== + esbuild-darwin-arm64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.9.tgz#60faea3ed95d15239536aa88d06bb82b29278a86" @@ -5756,6 +5661,11 @@ esbuild-freebsd-64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d" integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg== +esbuild-freebsd-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz#4e190d9c2d1e67164619ae30a438be87d5eedaf2" + integrity sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA== + esbuild-freebsd-64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.9.tgz#0339ef1c90a919175e7816788224517896657a0e" @@ -5766,6 +5676,11 @@ esbuild-freebsd-arm64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48" integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q== +esbuild-freebsd-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz#18a4c0344ee23bd5a6d06d18c76e2fd6d3f91635" + integrity sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA== + esbuild-freebsd-arm64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.9.tgz#32abfc0be3ae3dd38e5a86a9beadbbcf592f1b57" @@ -5776,6 +5691,11 @@ esbuild-linux-32@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5" integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw== +esbuild-linux-32@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz#9a329731ee079b12262b793fb84eea762e82e0ce" + integrity sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg== + esbuild-linux-32@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.9.tgz#93581348a4da7ed2b29bc5539f2605ad7fcee77b" @@ -5786,6 +5706,11 @@ esbuild-linux-64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652" integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg== +esbuild-linux-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz#532738075397b994467b514e524aeb520c191b6c" + integrity sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw== + esbuild-linux-64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.9.tgz#0d171e7946c95d0d3ed4826026af2c5632d7dcc4" @@ -5796,6 +5721,11 @@ esbuild-linux-arm64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b" integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig== +esbuild-linux-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz#5372e7993ac2da8f06b2ba313710d722b7a86e5d" + integrity sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug== + esbuild-linux-arm64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.9.tgz#9838795a3720cbe736d3bc20621bd366eac22f24" @@ -5806,6 +5736,11 @@ esbuild-linux-arm@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59" integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw== +esbuild-linux-arm@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz#e734aaf259a2e3d109d4886c9e81ec0f2fd9a9cc" + integrity sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA== + esbuild-linux-arm@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.9.tgz#dce96cd817bc7376f6af3967649c4ab1f2f79506" @@ -5816,6 +5751,11 @@ esbuild-linux-mips64le@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34" integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw== +esbuild-linux-mips64le@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz#c0487c14a9371a84eb08fab0e1d7b045a77105eb" + integrity sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ== + esbuild-linux-mips64le@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.9.tgz#0335a0739e61aa97cb9b4a018e3facfcca9cdcfd" @@ -5826,6 +5766,11 @@ esbuild-linux-ppc64le@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e" integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ== +esbuild-linux-ppc64le@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz#af048ad94eed0ce32f6d5a873f7abe9115012507" + integrity sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w== + esbuild-linux-ppc64le@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.9.tgz#18482afb95b8a705e2da0a59d7131bff221281f9" @@ -5836,6 +5781,11 @@ esbuild-linux-riscv64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8" integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg== +esbuild-linux-riscv64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz#423ed4e5927bd77f842bd566972178f424d455e6" + integrity sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg== + esbuild-linux-riscv64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.9.tgz#03b6f9708272c117006b9ce1c9ae8aab91b5a5b6" @@ -5846,6 +5796,11 @@ esbuild-linux-s390x@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6" integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA== +esbuild-linux-s390x@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz#21d21eaa962a183bfb76312e5a01cc5ae48ce8eb" + integrity sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ== + esbuild-linux-s390x@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.9.tgz#65fb645623d575780f155f0ee52935e62f9cca4f" @@ -5868,6 +5823,11 @@ esbuild-netbsd-64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81" integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w== +esbuild-netbsd-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz#ae75682f60d08560b1fe9482bfe0173e5110b998" + integrity sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg== + esbuild-netbsd-64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.9.tgz#7894297bb9e11f3d2f6f31efecd1be4e181f0d54" @@ -5878,6 +5838,11 @@ esbuild-openbsd-64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b" integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw== +esbuild-openbsd-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz#79591a90aa3b03e4863f93beec0d2bab2853d0a8" + integrity sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ== + esbuild-openbsd-64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.9.tgz#0f9d4c6b6772ae50d491d68ad4cc028300dda7c0" @@ -5888,6 +5853,11 @@ esbuild-sunos-64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da" integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw== +esbuild-sunos-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz#fd528aa5da5374b7e1e93d36ef9b07c3dfed2971" + integrity sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw== + esbuild-sunos-64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.9.tgz#c32b7ce574b08f814de810ce7c1e34b843768126" @@ -5898,6 +5868,11 @@ esbuild-windows-32@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31" integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w== +esbuild-windows-32@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz#0e92b66ecdf5435a76813c4bc5ccda0696f4efc3" + integrity sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ== + esbuild-windows-32@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.9.tgz#37a8f7cfccdb2177cd46613a1a1e1fcb419d36df" @@ -5908,6 +5883,11 @@ esbuild-windows-64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4" integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ== +esbuild-windows-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz#0fc761d785414284fc408e7914226d33f82420d0" + integrity sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw== + esbuild-windows-64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.9.tgz#5fe1e76fc13dd7f520febecaea110b6f1649c7b2" @@ -5918,6 +5898,11 @@ esbuild-windows-arm64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982" integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg== +esbuild-windows-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz#5b5bdc56d341d0922ee94965c89ee120a6a86eb7" + integrity sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ== + esbuild-windows-arm64@0.15.9: version "0.15.9" resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.9.tgz#98504428f7ba7d2cfc11940be68ee1139173fdce" @@ -5979,7 +5964,7 @@ esbuild@^0.16.17: "@esbuild/win32-ia32" "0.16.17" "@esbuild/win32-x64" "0.16.17" -esbuild@^0.14.14, esbuild@^0.14.47: +esbuild@^0.14.14: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2" integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA== @@ -6006,6 +5991,34 @@ esbuild@^0.14.14, esbuild@^0.14.47: esbuild-windows-64 "0.14.54" esbuild-windows-arm64 "0.14.54" +esbuild@^0.15.9: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.18.tgz#ea894adaf3fbc036d32320a00d4d6e4978a2f36d" + integrity sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q== + optionalDependencies: + "@esbuild/android-arm" "0.15.18" + "@esbuild/linux-loong64" "0.15.18" + esbuild-android-64 "0.15.18" + esbuild-android-arm64 "0.15.18" + esbuild-darwin-64 "0.15.18" + esbuild-darwin-arm64 "0.15.18" + esbuild-freebsd-64 "0.15.18" + esbuild-freebsd-arm64 "0.15.18" + esbuild-linux-32 "0.15.18" + esbuild-linux-64 "0.15.18" + esbuild-linux-arm "0.15.18" + esbuild-linux-arm64 "0.15.18" + esbuild-linux-mips64le "0.15.18" + esbuild-linux-ppc64le "0.15.18" + esbuild-linux-riscv64 "0.15.18" + esbuild-linux-s390x "0.15.18" + esbuild-netbsd-64 "0.15.18" + esbuild-openbsd-64 "0.15.18" + esbuild-sunos-64 "0.15.18" + esbuild-windows-32 "0.15.18" + esbuild-windows-64 "0.15.18" + esbuild-windows-arm64 "0.15.18" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -7722,7 +7735,14 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.7.0, is-core-module@^2.9.0: +is-core-module@^2.5.0, is-core-module@^2.7.0, is-core-module@^2.8.1: + version "2.9.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" + integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== + dependencies: + has "^1.0.3" + +is-core-module@^2.9.0: version "2.11.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== @@ -10675,7 +10695,7 @@ postcss@^7.0.14, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6: picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.1.10, postcss@^8.4.14: +postcss@^8.1.10: version "8.4.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== @@ -10684,6 +10704,15 @@ postcss@^8.1.10, postcss@^8.4.14: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.14, postcss@^8.4.18: + version "8.4.19" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc" + integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -11396,10 +11425,10 @@ rollup-pluginutils@^2.8.1: dependencies: estree-walker "^0.6.1" -rollup@^2.75.6: - version "2.77.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.2.tgz#6b6075c55f9cc2040a5912e6e062151e42e2c4e3" - integrity sha512-m/4YzYgLcpMQbxX3NmAqDvwLATZzxt8bIegO78FZLl+lAgKJBd1DRAOeEiZcKOIOPjxE6ewHWHNgGEalFXuz1g== +rollup@^2.79.1: + version "2.79.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" + integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== optionalDependencies: fsevents "~2.3.2" @@ -13064,14 +13093,14 @@ vite-svg-loader@^3.4.0: svgo "^2.7.0" vite@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.4.tgz#c61688d6b97573e96cf5ac25f2d68597b5ce68e8" - integrity sha512-NU304nqnBeOx2MkQnskBQxVsa0pRAH5FphokTGmyy8M3oxbvw7qAXts2GORxs+h/2vKsD+osMhZ7An6yK6F1dA== + version "3.2.5" + resolved "https://registry.yarnpkg.com/vite/-/vite-3.2.5.tgz#dee5678172a8a0ab3e547ad4148c3d547f90e86a" + integrity sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ== dependencies: - esbuild "^0.14.47" - postcss "^8.4.14" + esbuild "^0.15.9" + postcss "^8.4.18" resolve "^1.22.1" - rollup "^2.75.6" + rollup "^2.79.1" optionalDependencies: fsevents "~2.3.2" -- GitLab From 19ef2802633b0b5ebe636e4a33c1e40303ba32eb Mon Sep 17 00:00:00 2001 From: Stanislav Lashmanov Date: Tue, 7 Feb 2023 05:02:15 +0400 Subject: [PATCH 89/89] Update dependencies --- Gemfile.lock | 8 +- .../assets/stylesheets/components/index.scss | 5 +- ee/app/assets/stylesheets/pages/index.scss | 1 - package.json | 70 +- yarn.lock | 1139 +++++++++-------- 5 files changed, 622 insertions(+), 601 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 05799f2d43b07e..25bbd179bf18a0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -380,7 +380,7 @@ GEM doorkeeper (>= 5.5, < 5.7) json-jwt (>= 1.15.0) dotenv (2.7.6) - dry-cli (0.7.0) + dry-cli (1.0.0) dry-configurable (0.12.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5.0) @@ -1509,7 +1509,7 @@ GEM tty-screen (0.8.1) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) u2f (0.2.1) uber (0.1.0) @@ -1550,8 +1550,8 @@ GEM vite_rails (3.0.13) railties (>= 5.1, < 8) vite_ruby (~> 3.0, >= 3.2.2) - vite_ruby (3.2.12) - dry-cli (~> 0.7.0) + vite_ruby (3.2.14) + dry-cli (>= 0.7, < 2) rack-proxy (~> 0.6, >= 0.6.1) zeitwerk (~> 2.2) vmstat (2.3.0) diff --git a/ee/app/assets/stylesheets/components/index.scss b/ee/app/assets/stylesheets/components/index.scss index 4ec554b2771346..f6afc55eb0b0a4 100644 --- a/ee/app/assets/stylesheets/components/index.scss +++ b/ee/app/assets/stylesheets/components/index.scss @@ -1,7 +1,6 @@ -@import 'feature_flags/form'; +@import 'audit_logs/logs_table'; +@import 'batch_comments/draft_note'; @import 'compliance_dashboard/dashboard'; @import 'generic_vulnerability_report'; @import 'vulnerability_list'; -@import 'audit_logs/logs_table'; -@import 'batch_comments/draft_note'; @import 'related_items_tree'; diff --git a/ee/app/assets/stylesheets/pages/index.scss b/ee/app/assets/stylesheets/pages/index.scss index 5787810627279e..643da475907215 100644 --- a/ee/app/assets/stylesheets/pages/index.scss +++ b/ee/app/assets/stylesheets/pages/index.scss @@ -6,5 +6,4 @@ @import 'issuable_form'; @import 'issues'; @import 'projects'; -@import 'promotions'; @import 'subscriptions'; diff --git a/package.json b/package.json index d483cdf74eb008..369085ff2dafbb 100644 --- a/package.json +++ b/package.json @@ -66,39 +66,41 @@ "@rollup/plugin-graphql": "^1.1.0", "@sentry/browser": "5.30.0", "@sourcegraph/code-host-integration": "0.0.84", - "@tiptap/core": "^2.0.0-beta.182", - "@tiptap/extension-blockquote": "^2.0.0-beta.29", - "@tiptap/extension-bold": "^2.0.0-beta.28", - "@tiptap/extension-bubble-menu": "^2.0.0-beta.61", - "@tiptap/extension-bullet-list": "^2.0.0-beta.29", - "@tiptap/extension-code": "^2.0.0-beta.28", - "@tiptap/extension-code-block-lowlight": "2.0.0-beta.73", - "@tiptap/extension-document": "^2.0.0-beta.17", - "@tiptap/extension-dropcursor": "^2.0.0-beta.28", - "@tiptap/extension-gapcursor": "^2.0.0-beta.38", - "@tiptap/extension-hard-break": "^2.0.0-beta.33", - "@tiptap/extension-heading": "^2.0.0-beta.29", - "@tiptap/extension-highlight": "2.0.0-beta.35", - "@tiptap/extension-history": "^2.0.0-beta.25", - "@tiptap/extension-horizontal-rule": "^2.0.0-beta.36", - "@tiptap/extension-image": "^2.0.0-beta.30", - "@tiptap/extension-italic": "^2.0.0-beta.28", - "@tiptap/extension-link": "^2.0.0-beta.43", - "@tiptap/extension-list-item": "^2.0.0-beta.23", - "@tiptap/extension-ordered-list": "^2.0.0-beta.30", - "@tiptap/extension-paragraph": "^2.0.0-beta.26", - "@tiptap/extension-strike": "^2.0.0-beta.29", - "@tiptap/extension-subscript": "^2.0.0-beta.13", - "@tiptap/extension-superscript": "^2.0.0-beta.13", - "@tiptap/extension-table": "^2.0.0-beta.54", - "@tiptap/extension-table-cell": "^2.0.0-beta.23", - "@tiptap/extension-table-header": "^2.0.0-beta.25", - "@tiptap/extension-table-row": "^2.0.0-beta.22", - "@tiptap/extension-task-item": "^2.0.0-beta.37", - "@tiptap/extension-task-list": "^2.0.0-beta.29", - "@tiptap/extension-text": "^2.0.0-beta.17", - "@tiptap/suggestion": "^2.0.0-beta.96", - "@tiptap/vue-2": "^2.0.0-beta.84", + "@tiptap/core": "^2.0.0-beta.210", + "@tiptap/extension-blockquote": "^2.0.0-beta.210", + "@tiptap/extension-bold": "^2.0.0-beta.210", + "@tiptap/extension-bubble-menu": "2.0.0-beta.200", + "@tiptap/extension-bullet-list": "^2.0.0-beta.210", + "@tiptap/extension-code": "^2.0.0-beta.210", + "@tiptap/extension-code-block": "^2.0.0-beta.210", + "@tiptap/extension-code-block-lowlight": "2.0.0-beta.202", + "@tiptap/extension-document": "^2.0.0-beta.210", + "@tiptap/extension-dropcursor": "^2.0.0-beta.210", + "@tiptap/extension-gapcursor": "^2.0.0-beta.210", + "@tiptap/extension-hard-break": "^2.0.0-beta.210", + "@tiptap/extension-heading": "^2.0.0-beta.210", + "@tiptap/extension-highlight": "^2.0.0-beta.209", + "@tiptap/extension-history": "^2.0.0-beta.210", + "@tiptap/extension-horizontal-rule": "^2.0.0-beta.210", + "@tiptap/extension-image": "^2.0.0-beta.210", + "@tiptap/extension-italic": "^2.0.0-beta.210", + "@tiptap/extension-link": "^2.0.0-beta.210", + "@tiptap/extension-list-item": "^2.0.0-beta.210", + "@tiptap/extension-ordered-list": "^2.0.0-beta.210", + "@tiptap/extension-paragraph": "^2.0.0-beta.210", + "@tiptap/extension-strike": "^2.0.0-beta.210", + "@tiptap/extension-subscript": "^2.0.0-beta.210", + "@tiptap/extension-superscript": "^2.0.0-beta.210", + "@tiptap/extension-table": "^2.0.0-beta.210", + "@tiptap/extension-table-cell": "^2.0.0-beta.210", + "@tiptap/extension-table-header": "^2.0.0-beta.210", + "@tiptap/extension-table-row": "^2.0.0-beta.210", + "@tiptap/extension-task-item": "^2.0.0-beta.210", + "@tiptap/extension-task-list": "^2.0.0-beta.210", + "@tiptap/extension-text": "^2.0.0-beta.210", + "@tiptap/pm": "^2.0.0-beta.212", + "@tiptap/suggestion": "^2.0.0-beta.210", + "@tiptap/vue-2": "2.0.0-beta.200", "@vitejs/plugin-vue2": "^1.1.2", "apollo-upload-client": "15.0.0", "apollo3-cache-persist": "^0.14.1", @@ -196,7 +198,7 @@ "url-loader": "^4.1.1", "uuid": "8.1.0", "visibilityjs": "^1.2.4", - "vite": "^3.0.4", + "vite": "^4.0.0", "vite-plugin-ruby": "^3.1.2", "vite-svg-loader": "^3.4.0", "vue": "^2.7.10", diff --git a/yarn.lock b/yarn.lock index df85ca7a7fd7a1..4b25bf1044099e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@_ueberdosis/prosemirror-tables@1.1.3", "@_ueberdosis/prosemirror-tables@^1.1.3": +"@_ueberdosis/prosemirror-tables@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@_ueberdosis/prosemirror-tables/-/prosemirror-tables-1.1.3.tgz#56fdbc8b1d6ec43e7b7beb21e213c131eec451cd" integrity sha512-su3pbFi1DT89g6Cuh72TE0MWWKHmWgHcQJ3ODRkm6XfIppWaGpU49t02ur3sgJc7hUhfQXjB93aSkDgOmIii2w== @@ -349,11 +349,16 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.16.7", "@babel/parser@^7.16.8", "@babel/parser@^7.18.4", "@babel/parser@^7.18.5": +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.16.8", "@babel/parser@^7.18.4": version "7.18.11" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9" integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ== +"@babel/parser@^7.18.10", "@babel/parser@^7.19.0": + version "7.20.15" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.15.tgz#eec9f36d8eaf0948bb88c87a46784b5ee9fd0c89" + integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12": version "7.17.12" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e" @@ -1065,30 +1070,140 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f" integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA== -"@esbuild/android-arm@0.15.18": - version "0.15.18" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.18.tgz#266d40b8fdcf87962df8af05b76219bc786b4f80" - integrity sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw== +"@esbuild/android-arm64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23" + integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg== + +"@esbuild/android-arm64@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.4.tgz#0a900a7e448cc038ae5a751255257fc67163ed32" + integrity sha512-91VwDrl4EpxBCiG6h2LZZEkuNvVZYJkv2T9gyLG/mhGG1qrM7i5SwUcg/hlSPnL/4hDT0TFcF35/XMGSn0bemg== + +"@esbuild/android-arm@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2" + integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw== + +"@esbuild/android-arm@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.4.tgz#fe32ce82eb6064d3dc13c0d8ca0e440bbc776c93" + integrity sha512-R9GCe2xl2XDSc2XbQB63mFiFXHIVkOP+ltIxICKXqUPrFX97z6Z7vONCLQM1pSOLGqfLrGi3B7nbhxmFY/fomg== + +"@esbuild/android-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e" + integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ== + +"@esbuild/android-x64@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.4.tgz#6ae1056f6ecf1963c1d076cf5f0109b52d8049f6" + integrity sha512-mGSqhEPL7029XL7QHNPxPs15JVa02hvZvysUcyMP9UXdGFwncl2WU0bqx+Ysgzd+WAbv8rfNa73QveOxAnAM2w== + +"@esbuild/darwin-arm64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220" + integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w== + +"@esbuild/darwin-arm64@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.4.tgz#5064d81ee5b8d646a5b7cc3e53c98cb983c4af55" + integrity sha512-tTyJRM9dHvlMPt1KrBFVB5OW1kXOsRNvAPtbzoKazd5RhD5/wKlXk1qR2MpaZRYwf4WDMadt0Pv0GwxB41CVow== + +"@esbuild/darwin-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4" + integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg== + +"@esbuild/darwin-x64@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.4.tgz#67f0213b3333248b32a97a7fc3fee880c2157674" + integrity sha512-phQuC2Imrb3TjOJwLN8EO50nb2FHe8Ew0OwgZDH1SV6asIPGudnwTQtighDF2EAYlXChLoMJwqjAp4vAaACq6w== + +"@esbuild/freebsd-arm64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27" + integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw== -"@esbuild/android-arm@0.15.9": - version "0.15.9" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.9.tgz#7e1221604ab88ed5021ead74fa8cca4405e1e431" - integrity sha512-VZPy/ETF3fBG5PiinIkA0W/tlsvlEgJccyN2DzWZEl0DlVKRbu91PvY2D6Lxgluj4w9QtYHjOWjAT44C+oQ+EQ== +"@esbuild/freebsd-arm64@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.4.tgz#8eaaa126d9ff24822c730f06a71ac2d1091dc1c2" + integrity sha512-oH6JUZkocgmjzzYaP5juERLpJQSwazdjZrTPgLRmAU2bzJ688x0vfMB/WTv4r58RiecdHvXOPC46VtsMy/mepg== + +"@esbuild/freebsd-x64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72" + integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug== + +"@esbuild/freebsd-x64@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.4.tgz#314eff900a71abf64d4e5bea31e430d8ebd78d79" + integrity sha512-U4iWGn/9TrAfpAdfd56eO0pRxIgb0a8Wj9jClrhT8hvZnOnS4dfMPW7o4fn15D/KqoiVYHRm43jjBaTt3g/2KA== + +"@esbuild/linux-arm64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca" + integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g== + +"@esbuild/linux-arm64@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.4.tgz#5bed6bb8eb1d331644f8b31c87b8df57f204e84e" + integrity sha512-UkGfQvYlwOaeYJzZG4cLV0hCASzQZnKNktRXUo3/BMZvdau40AOz9GzmGA063n1piq6VrFFh43apRDQx8hMP2w== + +"@esbuild/linux-arm@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196" + integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ== + +"@esbuild/linux-arm@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.4.tgz#6eaa41f37e231d113da715a1d9cc820e5523aeb6" + integrity sha512-S2s9xWTGMTa/fG5EyMGDeL0wrWVgOSQcNddJWgu6rG1NCSXJHs76ZP9AsxjB3f2nZow9fWOyApklIgiTGZKhiw== + +"@esbuild/linux-ia32@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54" + integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg== + +"@esbuild/linux-ia32@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.4.tgz#3fc352bb54e0959fda273cd2253b1c72ca41b8c2" + integrity sha512-3lqFi4VFo/Vwvn77FZXeLd0ctolIJH/uXkH3yNgEk89Eh6D3XXAC9/iTPEzeEpsNE5IqGIsFa5Z0iPeOh25IyA== "@esbuild/linux-loong64@0.14.54": version "0.14.54" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw== -"@esbuild/linux-loong64@0.15.18": - version "0.15.18" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz#128b76ecb9be48b60cf5cfc1c63a4f00691a3239" - integrity sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ== +"@esbuild/linux-loong64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8" + integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ== + +"@esbuild/linux-loong64@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.4.tgz#86d54f690be53669cd2a38a5333ecf2608c11189" + integrity sha512-HqpWZkVslDHIwdQ9D+gk7NuAulgQvRxF9no54ut/M55KEb3mi7sQS3GwpPJzSyzzP0UkjQVN7/tbk88/CaX4EQ== -"@esbuild/linux-loong64@0.15.9": - version "0.15.9" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.9.tgz#b658a97babf1f40783354af7039b84c3fdfc3fc3" - integrity sha512-O+NfmkfRrb3uSsTa4jE3WApidSe3N5++fyOVGP1SmMZi4A3BZELkhUUvj5hwmMuNdlpzAZ8iAPz2vmcR7DCFQA== +"@esbuild/linux-mips64el@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726" + integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw== + +"@esbuild/linux-mips64el@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.4.tgz#3dbd897bd8f047fef35e69bd253b8f07ca7fe483" + integrity sha512-d/nMCKKh/SVDbqR9ju+b78vOr0tNXtfBjcp5vfHONCCOAL9ad8gN9dC/u+UnH939pz7wO+0u/x9y1MaZcb/lKA== + +"@esbuild/linux-ppc64@0.16.17": + version "0.16.17" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8" + integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g== + +"@esbuild/linux-ppc64@0.17.4": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.4.tgz#defaff6db9a60f08936fc0c59e0eabfb1055968a" + integrity sha512-lOD9p2dmjZcNiTU+sGe9Nn6G3aYw3k0HBJies1PU0j5IGfp6tdKOQ6mzfACRFCqXjnBuTqK7eTYpwx09O5LLfg== "@esbuild/linux-riscv64@0.16.17": version "0.16.17" @@ -1683,7 +1798,7 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" -"@jridgewell/gen-mapping@^0.3.2": +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== @@ -1741,6 +1856,11 @@ resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0" integrity sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg== +"@linaria/core@3.0.0-beta.13": + version "3.0.0-beta.13" + resolved "https://registry.yarnpkg.com/@linaria/core/-/core-3.0.0-beta.13.tgz#049c5be5faa67e341e413a0f6b641d5d78d91056" + integrity sha512-3zEi5plBCOsEzUneRVuQb+2SAx3qaC1dj0FfFAI6zIJQoDWu0dlSwKijMRack7oO9tUWrchfj3OkKQAd1LBdVg== + "@miragejs/pretender-node-polyfill@^0.1.0": version "0.1.2" resolved "https://registry.yarnpkg.com/@miragejs/pretender-node-polyfill/-/pretender-node-polyfill-0.1.2.tgz#d26b6b7483fb70cd62189d05c95d2f67153e43f2" @@ -1820,6 +1940,41 @@ resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.4-7.tgz#ef0b83ef40f64bc6704e13ae6624236a4a91fa6f" integrity sha512-842WcLh0BErNgGE8rdqNh31VnqGQcklPQ7RXzQfA0ilQNZcU7AO+t576g1m//18Lk8m7cXZ8fIKA1YB41LKWAQ== +"@remirror/core-constants@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-2.0.0.tgz#a52f89059d93955e00810023cc76b4f7db9650bf" + integrity sha512-vpePPMecHJllBqCWXl6+FIcZqS+tRUM2kSCCKFeEo1H3XUEv3ocijBIPhnlSAa7g6maX+12ATTgxrOsLpWVr2g== + dependencies: + "@babel/runtime" "^7.13.10" + +"@remirror/core-helpers@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@remirror/core-helpers/-/core-helpers-2.0.1.tgz#6847666a009ada8c9b9f3a093c13a6d07a95d9bb" + integrity sha512-s8M1pn33aBUhduvD1QR02uUQMegnFkGaTr4c1iBzxTTyg0rbQstzuQ7Q8TkL6n64JtgCdJS9jLz2dONb2meBKQ== + dependencies: + "@babel/runtime" "^7.13.10" + "@linaria/core" "3.0.0-beta.13" + "@remirror/core-constants" "^2.0.0" + "@remirror/types" "^1.0.0" + "@types/object.omit" "^3.0.0" + "@types/object.pick" "^1.3.1" + "@types/throttle-debounce" "^2.1.0" + case-anything "^2.1.10" + dash-get "^1.0.2" + deepmerge "^4.2.2" + fast-deep-equal "^3.1.3" + make-error "^1.3.6" + object.omit "^3.0.0" + object.pick "^1.3.0" + throttle-debounce "^3.0.1" + +"@remirror/types@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@remirror/types/-/types-1.0.0.tgz#cc8764440089a2ada71f149c409739575b73b12e" + integrity sha512-7HQbW7k8VxrAtfzs9FxwO6XSDabn8tSFDi1wwzShOnU+cvaYpfxu0ygyTk3TpXsag1hgFKY3ZIlAfB4WVz2LkQ== + dependencies: + type-fest "^2.0.0" + "@rollup/plugin-graphql@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-graphql/-/plugin-graphql-1.1.0.tgz#492f579816f65bc21ce26394f2f140d95192622d" @@ -1947,30 +2102,22 @@ dom-accessibility-api "^0.5.1" pretty-format "^26.4.2" -"@tiptap/core@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.202.tgz#be4c6a200e81875c552e1cc15ae9c6cdd86c37c2" - integrity sha512-KnOcZBtkWoDT7EsVLiJr9DyBnQcKJQHI8kOhNIL0snUrksr25q8xBW05iYqw6cGAF7iu1cFM80VikfgefsZUpw== - dependencies: - prosemirror-commands "^1.3.1" - prosemirror-keymap "^1.2.0" - prosemirror-model "^1.18.1" - prosemirror-schema-list "^1.2.2" - prosemirror-state "^1.4.1" - prosemirror-transform "^1.7.0" - prosemirror-view "^1.28.2" +"@tiptap/core@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.212.tgz#a2e7bb3e7a94ac09cb54f0b3126b7fad53607de0" + integrity sha512-aQbeTJiR3wtqCNXyrFnRBjBT4F0kQrHGSOJyj5lWnEetImprJNgg2DbX8Yu5odh9CRcYVtAoWKdEdnyvtMhzAQ== -"@tiptap/extension-blockquote@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.202.tgz#91168b32387ed0ce4d03dd3b6c802682287ede3c" - integrity sha512-weLbMxM7VfI4hJsThw1+mB4jbQnVFizmzRlGU40LKMzEU5yIgIhuaomQ02Z7V0cRgfXsoKX9oc0BYGiO0Ra6/g== +"@tiptap/extension-blockquote@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.212.tgz#a68485dfae3622cb49a65da4063175d72aa6439b" + integrity sha512-6UmW1/UQU1JmF3DrbJ4HCVwNdulpGmRK9r5XH3CUPH4Im35Vb4c9gmh+F3ePJR2uvXgK5Lx3WYt6955PyReS2w== -"@tiptap/extension-bold@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.202.tgz#877309e7b84701c22865517f09cbc5d288aa9369" - integrity sha512-AsfoChIleoSbY9gAuhbLF8BAEhHPrRKofmU09xJ62SBkL1rtgci8YzJYhL9leQCM4n1MQZEDeVf0ho75HeTPMA== +"@tiptap/extension-bold@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.212.tgz#b77b0e7ce30b9c4b7697ca9fb60ffe8a40d08a98" + integrity sha512-YSPQNGV9ZADq/aAbDfGa9lyLm7NxPFLzAHaa65wFhXNNU/1BvNUngqDK6u31Q2nuSSrk38PE6ltZ6uVSjBfEQA== -"@tiptap/extension-bubble-menu@2.0.0-beta.200", "@tiptap/extension-bubble-menu@^2.0.0-beta.200": +"@tiptap/extension-bubble-menu@2.0.0-beta.200": version "2.0.0-beta.200" resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.200.tgz#7851efdb5b9bccf78a020e386ee0f5eb92103198" integrity sha512-57EIDlYpI+jRurzHzsnulkAgf+LFoGytK5YcoXmuq8A2f295mj9ANzuOUnLJ76nm2NBmt8Y6ks0zUIIktKKK0Q== @@ -1979,10 +2126,18 @@ prosemirror-view "^1.28.2" tippy.js "^6.3.7" -"@tiptap/extension-bullet-list@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.202.tgz#1826ec86a83cc2feba3f90b3015c0e642a925f8c" - integrity sha512-Su+GvRGyW9FTBtcFjvNkkYwzDRo+1O2YTNOZi1Z/OkDqbg3g89kRue78avs0nHW7HEgdhCap+z8KtAPrie4eBg== +"@tiptap/extension-bubble-menu@^2.0.0-beta.200": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.212.tgz#321063ba3a70cd2495cacff915aeea2677b0ede7" + integrity sha512-LqwXN66hIhjQL+aVbKHlsu6ryX6Mtnz2eaKrUPDkU/vqu1M7iSlB9kSDu7DQgOJzd9a69UrsH9DiD3LdUtyd/g== + dependencies: + lodash "^4.17.21" + tippy.js "^6.3.7" + +"@tiptap/extension-bullet-list@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.212.tgz#331d5ca389b6934f1ef7b036b584b67e15603e24" + integrity sha512-owW+SPkeYEB4SKCprp5yt6MRMvB+TOObxauvaiuZ+RPGKX/a6/uXyCfsPJ+Wz85lPn1GYefZwlfANJ6C5HQGkg== "@tiptap/extension-code-block-lowlight@2.0.0-beta.202": version "2.0.0-beta.202" @@ -1993,172 +2148,173 @@ prosemirror-state "^1.4.1" prosemirror-view "^1.28.2" -"@tiptap/extension-code-block@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.202.tgz#a76fcb90e8e22082bedd9853f7a9bd0a541a800e" - integrity sha512-tfK9khIroGjsXQvk2K/9z1/UyQrB4+zghkjyK1xikzRmhgfOeqQzA0TDrFrz7ywFXmSFQ7GnnYAp+RW6r6wyUg== - dependencies: - prosemirror-state "^1.4.1" +"@tiptap/extension-code-block@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.212.tgz#48c79ef982a9f01f4b63387938ccaf038587ddf7" + integrity sha512-pS1R8kGcYFHJNiiyB0NF1i7HPT0iL+URPvW4u1Ww4LmyhBrv5RwqdYyg/E6q+J+0AZkhMVQL3Y1Wg6SPJYq8EA== -"@tiptap/extension-code@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.202.tgz#5d4352a6cc4a2d16262472fb11c54cfca24bd40a" - integrity sha512-XwAr7ysSWJVZWHNXDaNBTPH1CTyVxHnPv/PiCWTGhf8Fkx7R7xW2QCUKx4ablwxFlTY7H8xGmCujaewUQBdO5w== +"@tiptap/extension-code@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.212.tgz#340c6739127f110a79a80c70c3ab3f7cd5805ce1" + integrity sha512-F/r5cQ2JrGYm4YN2+ifKF/ZQUl/pShI2ICwaohV1zcEle+BCjmM13Pb5UOyXFGEmI2nwGwEz023PGxGK1p2RXw== -"@tiptap/extension-document@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.0.0-beta.202.tgz#fa2b1a42075b1a6bfbcd9564289dfbf7347c903c" - integrity sha512-UsDSe93QtnuDrUo11wYCMtp7XlTIBvL5HNhx+enLRY7B8nUhX+d78u1BzspTpCkMYKcdwDmAGfIYMqqPViPEvA== +"@tiptap/extension-document@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.0.0-beta.212.tgz#94aff82e343b12f00ccd5f92595615e6990facb5" + integrity sha512-dGt4Y/aDHWkYzGJLaZtx823af0b0NMPdtUECwpypvTEIqLG1RrEvNP5va2BsHcgug+Kt5UgmPrR+PvuDPX9Vnw== -"@tiptap/extension-dropcursor@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.202.tgz#a7e2b3c66dfb5c05077c05991fccd5e4166bdc1d" - integrity sha512-4Q3LnqvMnxP0KdX7tIgCoTCKg949rg351m0wguVb1bo4v9lA0zfJpSgqjQ1Xs2vaYVBwkFjLoqrfhTRn5mnopQ== - dependencies: - prosemirror-dropcursor "1.5.0" +"@tiptap/extension-dropcursor@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.212.tgz#1422fb9e7dfc84ed3795b34d55fed68128da91c0" + integrity sha512-DsZeoL0ZCSWxeHTm0eeRzx74kk0bUHRqhwr8kK39hi8lppBrRdHoi4KcjlDXMwgpAoMZEeB8ZX3zFg6TtFMsRg== "@tiptap/extension-floating-menu@^2.0.0-beta.200": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.202.tgz#9f895a04cd93cf4b41542ef3b09f3c90bfd0e215" - integrity sha512-09liirOFsPDFRLS2FiFdnfzyyOQwwyVXLzI6MzUOw5RZbOsGJ5kB8jZdkXvsAIiOs0YYsH3fyOyWirIwSRhBTQ== + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.212.tgz#56236907ec09d03c3a529b6176de87584f9594af" + integrity sha512-sMTv9jSDbqg59fUkv0y+Yn2ecSxPnbNXoIl+abbE9XhLgeDhZMzOG75ICK9Am5YSiH7fz+DakpPSgt+3KGycAQ== dependencies: - prosemirror-state "^1.4.1" - prosemirror-view "^1.28.2" tippy.js "^6.3.7" -"@tiptap/extension-gapcursor@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.202.tgz#567fb6281068db7fb5da2092550e83e01530d8cf" - integrity sha512-jOPMPPnTfVuc5YpFTcQM42/cg1J3+OeHitYb1/vBMpaNinVijuafsK14xDoVP8+sydKVgtBzYkfP/faN82I9iA== - dependencies: - prosemirror-gapcursor "^1.3.1" - -"@tiptap/extension-hard-break@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.202.tgz#f82c29f71082ae44c361964fb42e6e78d339dc29" - integrity sha512-Nr9BXeP+dXS5vLP/C2voTrhl+4YkDHBtPlc+5xm5NPBn04slTGSPO2lgV3YrMsfUOMNXHqeob1lq4qiLF4pybQ== - -"@tiptap/extension-heading@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.202.tgz#da12041c626825f8a3f3173ac922e11f2df55cbf" - integrity sha512-sF271jSWHgtoJLDNFLS7eyUcUStl7mBDQNJIENWVI+lFu2Ax8GmO7AoB74Q6L5Zaw4h73L6TAvaafHIXurz7tA== - -"@tiptap/extension-highlight@2.0.0-beta.35": - version "2.0.0-beta.35" - resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-2.0.0-beta.35.tgz#0738102b23f69f9c8ddada4f05ccb580d1d50133" - integrity sha512-xvEKOyuTj4mhQ8GIOItaSymJhGkWt2gGuCvmFWnTVZAaJJQOlgUTdkmayLCtwoDDP7biiuDhRJokTukGGmhUZw== - -"@tiptap/extension-history@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.202.tgz#d94770367a1a7b4e8f81f36d8b1731ca1fbc6879" - integrity sha512-BLwaOWmFHBQjOonojYHl1Po27IHxgjSAPw+ijMKtKzqa2msJRJevjC4tBaX5s/YrB7PQ2tFE7rfJED4HLjBm6w== - dependencies: - prosemirror-history "^1.3.0" - -"@tiptap/extension-horizontal-rule@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.202.tgz#12da36ea8ede0e720c7b2e5d1a2dd4c255798b2f" - integrity sha512-ut2Im/TNQynnuqdoY9yOjMDUKmxn97ERVEpqcQSaIgqBuF6bjk60Wa13ob6oS2g6vqXxwWFrnQVz48A9TcF5FQ== - dependencies: - prosemirror-state "^1.4.1" - -"@tiptap/extension-image@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.202.tgz#5e50fdf7d7ac67b3475b1cfba71fb3acaddab0df" - integrity sha512-aHPJMXuoMgToTYkGZsz2ue8gKzes+B92qb9lVRYlY9f+r/tC2K4q3HMtx6qvh8l4Dei5/yeV9TqliY79E9A5dg== - -"@tiptap/extension-italic@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.202.tgz#0a991167dd06064bdf3c811d638d04cea9029206" - integrity sha512-vgSLy4KDp6AmnAHLHXe/nWeNbLnyUXxmf4U4+esebAV5Hu2F7LgceknFt9D8AGEtYUU+/fYKSeE2NGJgTQG9lA== - -"@tiptap/extension-link@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.202.tgz#2b10ef877937bf2d491fffaf3e0545105f61b6fb" - integrity sha512-/9bZd43dMkzmo7SCCDtEscgdFKCat9yZAyAyg+PHYdhI8Lbqv5GfjxzBbx58v7jEP1eDKFnwTDFVwAsxCE9f0w== +"@tiptap/extension-gapcursor@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.212.tgz#0847f2d13ed87652067a1c592f23242d9e69c7b7" + integrity sha512-DIv1K+uOfMVWtfkJqv+fccZ/kxPUU+YgNFPINAFXqBh/rTkXbcXAb96x/g18apwo7WDOQvYwHOjxb1tB3b64ZQ== + +"@tiptap/extension-hard-break@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.212.tgz#4b412a45973a2dfe2025360d6bc4bdbf3c4160d5" + integrity sha512-JcoE10HWH7g6Pdj/1MzavKlO6XwNgc4JfaYQQnIlcw2ws9SGN/82thnvNyq6joVF4FlVAR9cUCPpc1Fpr57dIQ== + +"@tiptap/extension-heading@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.212.tgz#eff69ad2c91dc890bfa1582e3656eb039369c982" + integrity sha512-LrEs/Arp/4IN6D1D8sraf4iTIy7XCERu/nAgqXzs4N9DKS2UM3QD0ql09A3hKZrxwb5Yo6Mk1mnOOxihd+0WpA== + +"@tiptap/extension-highlight@^2.0.0-beta.209": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-highlight/-/extension-highlight-2.0.0-beta.212.tgz#af057f88ef0d4f351eba7accd9914e4bc1c09703" + integrity sha512-ejmtVvZm2sEOuh2clACceDfBZvTlHxPRWdX1JSsYfNaJxnxQrDw6IQZI7I8n+qupySLVZx0TNx/zBYKCnG90zA== + +"@tiptap/extension-history@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.212.tgz#b41d3d0b12031e2f1f6aa972b13c7541741ad23c" + integrity sha512-o2VU01AVNhfJPzqSSPJMbKJ167BHomlbbq01dGigPM0YNfkOpBJG5GLrgpXlACMqmE/y3BVw1/o+Z/buzgC2Vg== + +"@tiptap/extension-horizontal-rule@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.212.tgz#c5bba6ec90d43c5073489f42bafdcb432112b56b" + integrity sha512-f+C5EAhQCeDWA2VqnOvlDzZ31WuMUAHIqDYYBxL9sNrhqHHduLBp7Oa498oyVeAcU2ZQT+iLGE9yO+fY3f6dSA== + +"@tiptap/extension-image@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.212.tgz#59fb92541884ed31d571a805d980590841a8c18b" + integrity sha512-F/3N3Er57shgfIfavAQoTy5E0C1cJivQ0VyG/gfxzjMPfUdPJdECv9W5V0KZ41VGwKtDyu7nmvR6vsqcTYx9Ww== + +"@tiptap/extension-italic@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.212.tgz#03c5589d9725f184ad3c506858c0a7bcc5422a0c" + integrity sha512-sLsRojqIIjpGapxxRxoc2IwcJtn3+eYwyenNjX7xl/GIsfTEJ3uOehxS5GZSAJwiWVtQAAAQunSfmPZAHTxdRw== + +"@tiptap/extension-link@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.212.tgz#5f2cf1ba1f681e1e7ab491a2a4d42c168ef2a5a8" + integrity sha512-FRhJHBIYpObrZXWvLgLW3lx+GYnkOJsJrkrKqkS5t5MdGDpsreKgqkxA06tQjNYx13xkt2HeaeUIuQENiB1d4Q== dependencies: linkifyjs "^3.0.5" - prosemirror-model "^1.18.1" - prosemirror-state "^1.4.1" -"@tiptap/extension-list-item@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.0.0-beta.202.tgz#32bc4beacb0f692abfc8283760292a6354f070dc" - integrity sha512-15yAsO+CCM8ievdX4oxg8kMBVFqhzVAw7pU6E8KL76kIwWCIIyVW6hU3VZdglyBVnAG0ws5/DaZ4VRFtVPRDvg== - -"@tiptap/extension-ordered-list@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.202.tgz#5b5987d3a1c98e579071e70485db2e82bf638ed9" - integrity sha512-PpJn8EtS8MLZ4NN9R3crmrivbjTMHjuSE2Ab3Y9TdeR9x9DIF23O/EkunnkPUiBUx6sNADprEWJIQesgpakrtw== - -"@tiptap/extension-paragraph@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.202.tgz#5a395a8107bfc767f80335a0cf7f89278ad0cf20" - integrity sha512-QI86DMUAz5froDJJXpbFV0I+iSFikjhQ8W5clYDbnrP/clRI/FYxklQ3oxSk4VzGBGB5EaBJf+jD7htLKb39UA== - -"@tiptap/extension-strike@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.202.tgz#8bf200fb044e5b2401edef26e26920b94ab35249" - integrity sha512-cs87UI/VTkmSfIwlHpm7nAPXok2bAQvxmNJ1y7UPzTATVl+ixP1F4aIkwiYk+X7rE/Sys+09PGg1Pr1shwUUkQ== - -"@tiptap/extension-subscript@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-subscript/-/extension-subscript-2.0.0-beta.202.tgz#730e0181c5b8d623fb4674d568d5ef4f3bd986d5" - integrity sha512-s/90xjDJGlWxontzyL0howpdTEbnl5EyvIDDYdAwalnHOGkyfWq8JMxL3klnxUL+Rn10sjatHnEYaLS2A5tN+Q== - -"@tiptap/extension-superscript@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-superscript/-/extension-superscript-2.0.0-beta.202.tgz#d756fb63585f8214ce3a7e2333978f2fb68b1259" - integrity sha512-kDOc+Sf1N5LzKWDBrTYBWaQFG40z3dCt/ljIMDWJt3Vka8ahnH4kcXhW9eNZLeIWavoj+M+4th+CPSfMdAYJbg== - -"@tiptap/extension-table-cell@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-table-cell/-/extension-table-cell-2.0.0-beta.202.tgz#95f3f9c14d4f21122bab109fb82e10b64ca5e613" - integrity sha512-Ypmcq7zaMSZ0VNKwDPINOsSzyuH+gSIw+FrXy6O1dzVHAo1gNFJ2pEG/ZhQ2RqpDTpGfJFD8tNDx8wjCCAVlxA== - -"@tiptap/extension-table-header@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-table-header/-/extension-table-header-2.0.0-beta.202.tgz#e9284abcfbe17c3c1ddfff55bb98873879c9d34a" - integrity sha512-/l0lz3Hmc+hikj+RfSW7F6B/jYV2dROGQnK1/EYjgbvOK0158ml1mB6/Dhm+BhldV73MI7eU8+3YLB9uhsPR4w== - -"@tiptap/extension-table-row@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-table-row/-/extension-table-row-2.0.0-beta.202.tgz#60cc878e7f7ae4ad82e1013471cb39a4058f9844" - integrity sha512-IsHBT3lp//XSqcAWPIGWjPIKQ4okVaDJbwcElehlOo/rcRBeK0orT+c10T08PoOsozi4BeMYRo0nfA5tvrJMEw== - -"@tiptap/extension-table@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.0.0-beta.202.tgz#841254bf183e84a5b76edb4f1719883c85d51df8" - integrity sha512-WMfXtDfx45FgU81WnfxGOSJbVoaDpe8hjuBJSGbwJj+Qj4HGhbK7/RbTtDrM8oqseHRzHuGWgNX+EfOUQppjdA== - dependencies: - "@_ueberdosis/prosemirror-tables" "1.1.3" +"@tiptap/extension-list-item@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.0.0-beta.212.tgz#9f0615e1e6ba2acf003bdceb6b375ef3e971cdcc" + integrity sha512-I028s1mc60QcYTZ6quWzCBiZpQczTfhWtzoDZ5tsqQrlEENpSo6g1ktHhgw8AyGK1e9w/ZbxQkFqno+HpZLuWw== + +"@tiptap/extension-ordered-list@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.212.tgz#d4a6682b52162db5e02a8428e5c06d5d711d3ca5" + integrity sha512-k6zEpxrZbXcveOXGoNELZcHKqGHlh3MLfUvdVnXy4khcHfevMAXVstma6lPzNmPcCkRpmrKtKykCOn2aTX9IHA== + +"@tiptap/extension-paragraph@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.212.tgz#8aced9ccdcbec9cf2f6f323e4516b1d14d68dc59" + integrity sha512-teyjFRLqJwHhxgUv5X3jOt6k4JAzHV+R6rdl5E2DJOJ8IlZxP/gEae2GXBqcidTb8v7GXyPszqyPbaV2iq6oBw== + +"@tiptap/extension-strike@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.212.tgz#0c7ec3f90131e363d8eb5ed28f2939e19eed360a" + integrity sha512-/6V2ia4CNzMY7MXMBOBFTXl+sZzD3iMOgBy5U85AQnmYgSqLQR/SinsnaJ9e7Wgd2zUikG1pahdnQ47RoGp/ag== + +"@tiptap/extension-subscript@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-subscript/-/extension-subscript-2.0.0-beta.212.tgz#ffb2bd897afb0155eb8238494b1421e657d4a72e" + integrity sha512-mr8eqUOvjzVHFGbbDGyyxmUvA2DjM/fEOU7hbsbk7QUdHUU9ohi2zwrPsAlDLdM9hbO7uCHXQtobT4TN9SvJUQ== + +"@tiptap/extension-superscript@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-superscript/-/extension-superscript-2.0.0-beta.212.tgz#61d8c7ba8686f0d947914515cd83e711ee542431" + integrity sha512-R8DJpSrwa3lMD6UxdU0WRg38wuL8T6Q+mZlYbiByMiLfBkALknCjgJcZuvw6dqQ57qXtSrK717BuM18fYwWGhA== + +"@tiptap/extension-table-cell@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-table-cell/-/extension-table-cell-2.0.0-beta.212.tgz#1a3b89d2933719913d9ea242b066c75771f7761d" + integrity sha512-0j8AbVn2B79enX0dZc0cKbgy+4zFD2ICeRbSzOKsDvb3xy4QMX1OQgLUnCk5s3/QqZWdGb3uc/abZbWQGz9fCg== + +"@tiptap/extension-table-header@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-table-header/-/extension-table-header-2.0.0-beta.212.tgz#543f6a6c1ed1c17af897cac19fbbaf705579bd10" + integrity sha512-N/KnUbH6R+rrjA9GF6G+IUAo0+jaRJJhwvOJVFbrAFQTo0IKq5UZtKzHKqgM4BGvYeeLvovqYA6S4ehXsVTk7A== + +"@tiptap/extension-table-row@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-table-row/-/extension-table-row-2.0.0-beta.212.tgz#27a6d87c26fc4a8d4bfe7470f4722586c2b134fc" + integrity sha512-QI2LLP/eH7Xe9a5n7o8gRMd3i21xzJBibeRaqfoF88LAAq4bMmnZyQBVX/7RS01IkvewRvWD+kBioQ5GFpmQ0g== + +"@tiptap/extension-table@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-table/-/extension-table-2.0.0-beta.212.tgz#e40c9c0f0c47505bbfbc692874c8fb9d12e30afc" + integrity sha512-gVmCcQuTn62nBPYaXqVbJL91+xXU7uHH3+PyaV6eBcUTLkWf2zNNoBzRQ7EeCn55eFUGrJ1fXgLfICuI51TdPg== + +"@tiptap/extension-task-item@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-task-item/-/extension-task-item-2.0.0-beta.212.tgz#109232a5bc7d7c5769ac42e581442d0f9d61fb6e" + integrity sha512-dl5YA4SuAGznCc//v7wktIWE0MJAZ3JsTs25frLx8vDBvqV1jwkT+xg4phlxoqla7EIpqoJI3BDdE2kh2KbNlA== + +"@tiptap/extension-task-list@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-task-list/-/extension-task-list-2.0.0-beta.212.tgz#4ba2e7505e1096efea9789d22e4eb7b06d42dfb2" + integrity sha512-hsagYH0UjjshKvqdBCN3IP2pwhu3FSbt8ACTkZAQylItsrVEu6qsrEJ2VKn+7GZee8Wii6EhY2ghTdTzpwVNvA== + +"@tiptap/extension-text@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.0.0-beta.212.tgz#5ae31b98cbe65b59c10a5da1656160f5f504dcab" + integrity sha512-KesuaSB6m1AI1G37LTdscE/RLgtqfxD29CCUqlPfUeM05gYyMwRsW0421yuaXJQC0UOHwdLok9SfFRQErhC23w== + +"@tiptap/pm@^2.0.0-beta.212": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.0.0-beta.212.tgz#ea9f6c60301d6a329ee921793e94676d5fbb3abc" + integrity sha512-TyGooU5in2r+cCbSivWBpeMODOCZFzJ0bxn3rJeoLxycId5UOd2dHE2chEQ5X6MsAukjscV+uMdUK6CrNRoA3w== + dependencies: + prosemirror-changeset "^2.2.0" + prosemirror-collab "^1.3.0" + prosemirror-commands "^1.3.1" + prosemirror-dropcursor "^1.5.0" + prosemirror-gapcursor "^1.3.1" + prosemirror-history "^1.3.0" + prosemirror-inputrules "^1.2.0" + prosemirror-keymap "^1.2.0" + prosemirror-markdown "^1.10.1" + prosemirror-menu "^1.2.1" prosemirror-model "^1.18.1" + prosemirror-schema-basic "^1.2.0" + prosemirror-schema-list "^1.2.2" prosemirror-state "^1.4.1" + prosemirror-tables "^1.3.0" + prosemirror-trailing-node "^2.0.2" + prosemirror-transform "^1.7.0" prosemirror-view "^1.28.2" -"@tiptap/extension-task-item@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-task-item/-/extension-task-item-2.0.0-beta.202.tgz#350fd2d823300bd9e64a56c98404bbcffe802f08" - integrity sha512-yOd72ELIr/NK3wb4SjetFCsTW/YU66LMjUCv6RFxgbcPtTN3auoaCelyo1l7EZSZmWbovR7G2QOiG1fQmfNgMg== - -"@tiptap/extension-task-list@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-task-list/-/extension-task-list-2.0.0-beta.202.tgz#b2484ca0507f1d8b413e7f2967f4b71afefa91a9" - integrity sha512-0E7hL2+vVeBm1khONomqk4Lac/LcQfKYesLvzLhjHOEuC7t8wTt7sZxI407b87YnQ+l8dsZey0vrcmV2/Wi4YQ== - -"@tiptap/extension-text@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.0.0-beta.202.tgz#d0152f547572a14c4e0e88287acb2b0c311fef04" - integrity sha512-6UsfU9xvKTxHfZYxVJy5DSQ0ibnhC403KLRQ4ePwpJql0TotBx93/CBfPCVLFEwF86HNhf1fFUCx+j2wuwVxmA== - -"@tiptap/suggestion@^2.0.0-beta.202": - version "2.0.0-beta.202" - resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.0.0-beta.202.tgz#f0bc6a6712aeea266d7ed156c7c70ad29fb864e5" - integrity sha512-V2BepOUj3ycvogOZE/nY9q2J4Hm1oH44YhOkqHB+QFQeOu6vqhFRqgGniJji52z2tAF+dvydSpQEzG+uCf2MEA== - dependencies: - prosemirror-model "^1.18.1" - prosemirror-state "^1.4.1" - prosemirror-view "^1.28.2" +"@tiptap/suggestion@^2.0.0-beta.210": + version "2.0.0-beta.212" + resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.0.0-beta.212.tgz#205906991b52a45829143e7f2947bfb24868b8c1" + integrity sha512-BcTz+4qA1lgBqzxQr1hwdBDaRECn5beGaRCYOxz3A3yce94S9EDnCXIcPXp2VS/auLDXmpGGmjHCStZmFWlcrg== "@tiptap/vue-2@2.0.0-beta.200": version "2.0.0-beta.200" @@ -2416,6 +2572,16 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== +"@types/object.omit@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/object.omit/-/object.omit-3.0.0.tgz#0d31e1208eac8fe2ad5c9499a1016a8273bbfafc" + integrity sha512-I27IoPpH250TUzc9FzXd0P1BV/BMJuzqD3jOz98ehf9dQqGkxlq+hO1bIqZGWqCg5bVOy0g4AUVJtnxe0klDmw== + +"@types/object.pick@^1.3.1": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@types/object.pick/-/object.pick-1.3.2.tgz#9eb28118240ad8f658b9c9c6caf35359fdb37150" + integrity sha512-sn7L+qQ6RLPdXRoiaE7bZ/Ek+o4uICma/lBFPyJEKDTPTBP1W8u0c4baj3EiS4DiqLs+Hk+KUGvMVJtAw3ePJg== + "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" @@ -2488,6 +2654,11 @@ resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1" integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== +"@types/throttle-debounce@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz#1c3df624bfc4b62f992d3012b84c56d41eab3776" + integrity sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ== + "@types/tough-cookie@*": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" @@ -2942,7 +3113,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0: +acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0: version "8.8.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== @@ -3770,6 +3941,11 @@ canvas-confetti@^1.4.0: resolved "https://registry.yarnpkg.com/canvas-confetti/-/canvas-confetti-1.4.0.tgz#840f6db4a566f8f32abe28c00dcd82acf39c92bd" integrity sha512-S18o4Y9PqI/uabdlT/jI3MY7XBJjNxnfapFIkjkMwpz6qNxLFZOm2b22OMf4ZYDL9lpNWI+Ih4fEMVPwO1KHFQ== +case-anything@^2.1.10: + version "2.1.10" + resolved "https://registry.yarnpkg.com/case-anything/-/case-anything-2.1.10.tgz#d18a6ca968d54ec3421df71e3e190f3bced23410" + integrity sha512-JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ== + ccount@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5" @@ -4281,6 +4457,11 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== +crelt@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.5.tgz#57c0d52af8c859e354bace1883eb2e1eb182bb94" + integrity sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA== + cron-validator@^1.1.1: version "1.2.1" resolved "https://registry.yarnpkg.com/cron-validator/-/cron-validator-1.2.1.tgz#0f0de2de36d231a6ace0e43ffc6c0564fe6edf1a" @@ -4458,11 +4639,6 @@ cssfontparser@^1.2.1: resolved "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz#f4022fc8f9700c68029d542084afbaf425a3f3e3" integrity sha1-9AIvyPlwDGgCnVQghK+69CWj8+M= -cssom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" - integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== - csso@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" @@ -4470,10 +4646,10 @@ csso@^4.2.0: dependencies: css-tree "^1.1.2" -cssom@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== +cssom@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" + integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== cssom@~0.3.6: version "0.3.8" @@ -5020,6 +5196,11 @@ dagre@^0.8.5: graphlib "^2.1.8" lodash "^4.17.15" +dash-get@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/dash-get/-/dash-get-1.0.2.tgz#4c9e9ad5ef04c4bf9d3c9a451f6f7997298dcc7c" + integrity sha512-4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ== + data-urls@^3.0.1: version "3.0.2" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" @@ -5601,317 +5782,117 @@ esbuild-android-64@0.14.54: resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be" integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ== -esbuild-android-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz#20a7ae1416c8eaade917fb2453c1259302c637a5" - integrity sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA== - -esbuild-android-64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.9.tgz#4a7eb320ca8d3a305f14792061fd9614ccebb7c0" - integrity sha512-HQCX7FJn9T4kxZQkhPjNZC7tBWZqJvhlLHPU2SFzrQB/7nDXjmTIFpFTjt7Bd1uFpeXmuwf5h5fZm+x/hLnhbw== - esbuild-android-arm64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771" integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg== -esbuild-android-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz#9cc0ec60581d6ad267568f29cf4895ffdd9f2f04" - integrity sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ== - -esbuild-android-arm64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.9.tgz#c948e5686df20857ad361ec67e070d40d7cab985" - integrity sha512-E6zbLfqbFVCNEKircSHnPiSTsm3fCRxeIMPfrkS33tFjIAoXtwegQfVZqMGR0FlsvVxp2NEDOUz+WW48COCjSg== - esbuild-darwin-64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25" integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug== -esbuild-darwin-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz#428e1730ea819d500808f220fbc5207aea6d4410" - integrity sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg== - -esbuild-darwin-64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.9.tgz#25f564fa4b39c1cec84dc46bce5634fdbce1d5e4" - integrity sha512-gI7dClcDN/HHVacZhTmGjl0/TWZcGuKJ0I7/xDGJwRQQn7aafZGtvagOFNmuOq+OBFPhlPv1T6JElOXb0unkSQ== - esbuild-darwin-arm64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73" integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw== -esbuild-darwin-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz#b6dfc7799115a2917f35970bfbc93ae50256b337" - integrity sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA== - -esbuild-darwin-arm64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.9.tgz#60faea3ed95d15239536aa88d06bb82b29278a86" - integrity sha512-VZIMlcRN29yg/sv7DsDwN+OeufCcoTNaTl3Vnav7dL/nvsApD7uvhVRbgyMzv0zU/PP0xRhhIpTyc7lxEzHGSw== - esbuild-freebsd-64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d" integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg== -esbuild-freebsd-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz#4e190d9c2d1e67164619ae30a438be87d5eedaf2" - integrity sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA== - -esbuild-freebsd-64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.9.tgz#0339ef1c90a919175e7816788224517896657a0e" - integrity sha512-uM4z5bTvuAXqPxrI204txhlsPIolQPWRMLenvGuCPZTnnGlCMF2QLs0Plcm26gcskhxewYo9LkkmYSS5Czrb5A== - esbuild-freebsd-arm64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48" integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q== -esbuild-freebsd-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz#18a4c0344ee23bd5a6d06d18c76e2fd6d3f91635" - integrity sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA== - -esbuild-freebsd-arm64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.9.tgz#32abfc0be3ae3dd38e5a86a9beadbbcf592f1b57" - integrity sha512-HHDjT3O5gWzicGdgJ5yokZVN9K9KG05SnERwl9nBYZaCjcCgj/sX8Ps1jvoFSfNCO04JSsHSOWo4qvxFuj8FoA== - esbuild-linux-32@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5" integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw== -esbuild-linux-32@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz#9a329731ee079b12262b793fb84eea762e82e0ce" - integrity sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg== - -esbuild-linux-32@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.9.tgz#93581348a4da7ed2b29bc5539f2605ad7fcee77b" - integrity sha512-AQIdE8FugGt1DkcekKi5ycI46QZpGJ/wqcMr7w6YUmOmp2ohQ8eO4sKUsOxNOvYL7hGEVwkndSyszR6HpVHLFg== - esbuild-linux-64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652" integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg== -esbuild-linux-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz#532738075397b994467b514e524aeb520c191b6c" - integrity sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw== - -esbuild-linux-64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.9.tgz#0d171e7946c95d0d3ed4826026af2c5632d7dcc4" - integrity sha512-4RXjae7g6Qs7StZyiYyXTZXBlfODhb1aBVAjd+ANuPmMhWthQilWo7rFHwJwL7DQu1Fjej2sODAVwLbcIVsAYQ== - esbuild-linux-arm64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b" integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig== -esbuild-linux-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz#5372e7993ac2da8f06b2ba313710d722b7a86e5d" - integrity sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug== - -esbuild-linux-arm64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.9.tgz#9838795a3720cbe736d3bc20621bd366eac22f24" - integrity sha512-a+bTtxJmYmk9d+s2W4/R1SYKDDAldOKmWjWP0BnrWtDbvUBNOm++du0ysPju4mZVoEFgS1yLNW+VXnG/4FNwdQ== - esbuild-linux-arm@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59" integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw== -esbuild-linux-arm@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz#e734aaf259a2e3d109d4886c9e81ec0f2fd9a9cc" - integrity sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA== - -esbuild-linux-arm@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.9.tgz#dce96cd817bc7376f6af3967649c4ab1f2f79506" - integrity sha512-3Zf2GVGUOI7XwChH3qrnTOSqfV1V4CAc/7zLVm4lO6JT6wbJrTgEYCCiNSzziSju+J9Jhf9YGWk/26quWPC6yQ== - esbuild-linux-mips64le@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34" integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw== -esbuild-linux-mips64le@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz#c0487c14a9371a84eb08fab0e1d7b045a77105eb" - integrity sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ== - -esbuild-linux-mips64le@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.9.tgz#0335a0739e61aa97cb9b4a018e3facfcca9cdcfd" - integrity sha512-Zn9HSylDp89y+TRREMDoGrc3Z4Hs5u56ozZLQCiZAUx2+HdbbXbWdjmw3FdTJ/i7t5Cew6/Q+6kfO3KCcFGlyw== - esbuild-linux-ppc64le@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e" integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ== -esbuild-linux-ppc64le@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz#af048ad94eed0ce32f6d5a873f7abe9115012507" - integrity sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w== - -esbuild-linux-ppc64le@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.9.tgz#18482afb95b8a705e2da0a59d7131bff221281f9" - integrity sha512-OEiOxNAMH9ENFYqRsWUj3CWyN3V8P3ZXyfNAtX5rlCEC/ERXrCEFCJji/1F6POzsXAzxvUJrTSTCy7G6BhA6Fw== - esbuild-linux-riscv64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8" integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg== -esbuild-linux-riscv64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz#423ed4e5927bd77f842bd566972178f424d455e6" - integrity sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg== - -esbuild-linux-riscv64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.9.tgz#03b6f9708272c117006b9ce1c9ae8aab91b5a5b6" - integrity sha512-ukm4KsC3QRausEFjzTsOZ/qqazw0YvJsKmfoZZm9QW27OHjk2XKSQGGvx8gIEswft/Sadp03/VZvAaqv5AIwNA== - esbuild-linux-s390x@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6" integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA== -esbuild-linux-s390x@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz#21d21eaa962a183bfb76312e5a01cc5ae48ce8eb" - integrity sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ== - -esbuild-linux-s390x@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.9.tgz#65fb645623d575780f155f0ee52935e62f9cca4f" - integrity sha512-uDOQEH55wQ6ahcIKzQr3VyjGc6Po/xblLGLoUk3fVL1qjlZAibtQr6XRfy5wPJLu/M2o0vQKLq4lyJ2r1tWKcw== - -esbuild-loader@^2.20.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.20.0.tgz#28fcff0142fa7bd227512d69f31e9a6e202bb88f" - integrity sha512-dr+j8O4w5RvqZ7I4PPB4EIyVTd679EBQnMm+JBB7av+vu05Zpje2IpK5N3ld1VWa+WxrInIbNFAg093+E1aRsA== +esbuild-loader@^2.21.0: + version "2.21.0" + resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.21.0.tgz#2698a3e565b0db2bb19a3dd91c2b6c9aad526c80" + integrity sha512-k7ijTkCT43YBSZ6+fBCW1Gin7s46RrJ0VQaM8qA7lq7W+OLsGgtLyFV8470FzYi/4TeDexniTBTPTwZUnXXR5g== dependencies: esbuild "^0.16.17" joycon "^3.0.1" json5 "^2.2.0" loader-utils "^2.0.0" tapable "^2.2.0" - webpack-sources "^2.2.0" + webpack-sources "^1.4.3" esbuild-netbsd-64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81" integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w== -esbuild-netbsd-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz#ae75682f60d08560b1fe9482bfe0173e5110b998" - integrity sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg== - -esbuild-netbsd-64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.9.tgz#7894297bb9e11f3d2f6f31efecd1be4e181f0d54" - integrity sha512-yWgxaYTQz+TqX80wXRq6xAtb7GSBAp6gqLKfOdANg9qEmAI1Bxn04IrQr0Mzm4AhxvGKoHzjHjMgXbCCSSDxcw== - esbuild-openbsd-64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b" integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw== -esbuild-openbsd-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz#79591a90aa3b03e4863f93beec0d2bab2853d0a8" - integrity sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ== - -esbuild-openbsd-64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.9.tgz#0f9d4c6b6772ae50d491d68ad4cc028300dda7c0" - integrity sha512-JmS18acQl4iSAjrEha1MfEmUMN4FcnnrtTaJ7Qg0tDCOcgpPPQRLGsZqhes0vmx8VA6IqRyScqXvaL7+Q0Uf3A== - esbuild-sunos-64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da" integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw== -esbuild-sunos-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz#fd528aa5da5374b7e1e93d36ef9b07c3dfed2971" - integrity sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw== - -esbuild-sunos-64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.9.tgz#c32b7ce574b08f814de810ce7c1e34b843768126" - integrity sha512-UKynGSWpzkPmXW3D2UMOD9BZPIuRaSqphxSCwScfEE05Be3KAmvjsBhht1fLzKpiFVJb0BYMd4jEbWMyJ/z1hQ== - esbuild-windows-32@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31" integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w== -esbuild-windows-32@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz#0e92b66ecdf5435a76813c4bc5ccda0696f4efc3" - integrity sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ== - -esbuild-windows-32@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.9.tgz#37a8f7cfccdb2177cd46613a1a1e1fcb419d36df" - integrity sha512-aqXvu4/W9XyTVqO/hw3rNxKE1TcZiEYHPsXM9LwYmKSX9/hjvfIJzXwQBlPcJ/QOxedfoMVH0YnhhQ9Ffb0RGA== - esbuild-windows-64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4" integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ== -esbuild-windows-64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz#0fc761d785414284fc408e7914226d33f82420d0" - integrity sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw== - -esbuild-windows-64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.9.tgz#5fe1e76fc13dd7f520febecaea110b6f1649c7b2" - integrity sha512-zm7h91WUmlS4idMtjvCrEeNhlH7+TNOmqw5dJPJZrgFaxoFyqYG6CKDpdFCQXdyKpD5yvzaQBOMVTCBVKGZDEg== - esbuild-windows-arm64@0.14.54: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982" integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg== -esbuild-windows-arm64@0.15.18: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz#5b5bdc56d341d0922ee94965c89ee120a6a86eb7" - integrity sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ== - -esbuild-windows-arm64@0.15.9: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.9.tgz#98504428f7ba7d2cfc11940be68ee1139173fdce" - integrity sha512-yQEVIv27oauAtvtuhJVfSNMztJJX47ismRS6Sv2QMVV9RM+6xjbMWuuwM2nxr5A2/gj/mu2z9YlQxiwoFRCfZA== - -esbuild@0.15.9, esbuild@^0.15.6: - version "0.15.9" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.9.tgz#33fb18b67b85004b6f7616bec955ca4b3e58935d" - integrity sha512-OnYr1rkMVxtmMHIAKZLMcEUlJmqcbxBz9QoBU8G9v455na0fuzlT/GLu6l+SRghrk0Mm2fSSciMmzV43Q8e0Gg== +esbuild@0.17.4: + version "0.17.4" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.4.tgz#af4f8f78604c67f8e6afbdee36a3f4211ecfc859" + integrity sha512-zBn9MeCwT7W5F1a3lXClD61ip6vQM+H8Msb0w8zMT4ZKBpDg+rFAraNyWCDelB/2L6M3g6AXHPnsyvjMFnxtFw== optionalDependencies: "@esbuild/android-arm" "0.17.4" "@esbuild/android-arm64" "0.17.4" @@ -5936,34 +5917,6 @@ esbuild@0.15.9, esbuild@^0.15.6: "@esbuild/win32-ia32" "0.17.4" "@esbuild/win32-x64" "0.17.4" -esbuild@^0.16.17: - version "0.16.17" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.17.tgz#fc2c3914c57ee750635fee71b89f615f25065259" - integrity sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg== - optionalDependencies: - "@esbuild/android-arm" "0.16.17" - "@esbuild/android-arm64" "0.16.17" - "@esbuild/android-x64" "0.16.17" - "@esbuild/darwin-arm64" "0.16.17" - "@esbuild/darwin-x64" "0.16.17" - "@esbuild/freebsd-arm64" "0.16.17" - "@esbuild/freebsd-x64" "0.16.17" - "@esbuild/linux-arm" "0.16.17" - "@esbuild/linux-arm64" "0.16.17" - "@esbuild/linux-ia32" "0.16.17" - "@esbuild/linux-loong64" "0.16.17" - "@esbuild/linux-mips64el" "0.16.17" - "@esbuild/linux-ppc64" "0.16.17" - "@esbuild/linux-riscv64" "0.16.17" - "@esbuild/linux-s390x" "0.16.17" - "@esbuild/linux-x64" "0.16.17" - "@esbuild/netbsd-x64" "0.16.17" - "@esbuild/openbsd-x64" "0.16.17" - "@esbuild/sunos-x64" "0.16.17" - "@esbuild/win32-arm64" "0.16.17" - "@esbuild/win32-ia32" "0.16.17" - "@esbuild/win32-x64" "0.16.17" - esbuild@^0.14.14: version "0.14.54" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2" @@ -5991,33 +5944,33 @@ esbuild@^0.14.14: esbuild-windows-64 "0.14.54" esbuild-windows-arm64 "0.14.54" -esbuild@^0.15.9: - version "0.15.18" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.18.tgz#ea894adaf3fbc036d32320a00d4d6e4978a2f36d" - integrity sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q== +esbuild@^0.16.14, esbuild@^0.16.17: + version "0.16.17" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.17.tgz#fc2c3914c57ee750635fee71b89f615f25065259" + integrity sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg== optionalDependencies: - "@esbuild/android-arm" "0.15.18" - "@esbuild/linux-loong64" "0.15.18" - esbuild-android-64 "0.15.18" - esbuild-android-arm64 "0.15.18" - esbuild-darwin-64 "0.15.18" - esbuild-darwin-arm64 "0.15.18" - esbuild-freebsd-64 "0.15.18" - esbuild-freebsd-arm64 "0.15.18" - esbuild-linux-32 "0.15.18" - esbuild-linux-64 "0.15.18" - esbuild-linux-arm "0.15.18" - esbuild-linux-arm64 "0.15.18" - esbuild-linux-mips64le "0.15.18" - esbuild-linux-ppc64le "0.15.18" - esbuild-linux-riscv64 "0.15.18" - esbuild-linux-s390x "0.15.18" - esbuild-netbsd-64 "0.15.18" - esbuild-openbsd-64 "0.15.18" - esbuild-sunos-64 "0.15.18" - esbuild-windows-32 "0.15.18" - esbuild-windows-64 "0.15.18" - esbuild-windows-arm64 "0.15.18" + "@esbuild/android-arm" "0.16.17" + "@esbuild/android-arm64" "0.16.17" + "@esbuild/android-x64" "0.16.17" + "@esbuild/darwin-arm64" "0.16.17" + "@esbuild/darwin-x64" "0.16.17" + "@esbuild/freebsd-arm64" "0.16.17" + "@esbuild/freebsd-x64" "0.16.17" + "@esbuild/linux-arm" "0.16.17" + "@esbuild/linux-arm64" "0.16.17" + "@esbuild/linux-ia32" "0.16.17" + "@esbuild/linux-loong64" "0.16.17" + "@esbuild/linux-mips64el" "0.16.17" + "@esbuild/linux-ppc64" "0.16.17" + "@esbuild/linux-riscv64" "0.16.17" + "@esbuild/linux-s390x" "0.16.17" + "@esbuild/linux-x64" "0.16.17" + "@esbuild/netbsd-x64" "0.16.17" + "@esbuild/openbsd-x64" "0.16.17" + "@esbuild/sunos-x64" "0.16.17" + "@esbuild/win32-arm64" "0.16.17" + "@esbuild/win32-ia32" "0.16.17" + "@esbuild/win32-x64" "0.16.17" escalade@^3.1.1: version "3.1.1" @@ -6657,13 +6610,6 @@ find-root@^1.1.0: resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== -find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - dependencies: - locate-path "^2.0.0" - find-up@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" @@ -7735,20 +7681,20 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.5.0, is-core-module@^2.7.0, is-core-module@^2.8.1: - version "2.9.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" - integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== - dependencies: - has "^1.0.3" - -is-core-module@^2.9.0: +is-core-module@^2.11.0, is-core-module@^2.9.0: version "2.11.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" +is-core-module@^2.5.0, is-core-module@^2.7.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" + integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== + dependencies: + has "^1.0.3" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -7796,7 +7742,7 @@ is-extendable@^0.1.0, is-extendable@^0.1.1: resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= -is-extendable@^1.0.1: +is-extendable@^1.0.0, is-extendable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== @@ -8438,11 +8384,6 @@ jest-watcher@^28.1.3: jest-util "^28.1.3" string-length "^4.0.1" -jest-worker@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== - jest-worker@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98" @@ -8746,22 +8687,6 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -8967,11 +8892,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lz-string@^1.4.4: - version "1.4.4" - resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" - integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ== - magic-string@^0.25.3, magic-string@^0.25.7: version "0.25.9" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" @@ -8994,7 +8914,7 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: dependencies: semver "^6.0.0" -make-error@^1.1.1: +make-error@^1.1.1, make-error@^1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== @@ -10184,6 +10104,13 @@ object.entries@^1.1.5: define-properties "^1.1.3" es-abstract "^1.19.1" +object.omit@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-3.0.0.tgz#0e3edc2fce2ba54df5577ff529f6d97bd8a522af" + integrity sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ== + dependencies: + is-extendable "^1.0.0" + object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -10320,13 +10247,6 @@ p-limit@3.1.0, p-limit@^3.0.2, p-limit@^3.1.0: dependencies: yocto-queue "^0.1.0" -p-limit@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" - integrity sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng== - dependencies: - p-try "^1.0.0" - p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -10334,13 +10254,6 @@ p-limit@^2.0.0, p-limit@^2.2.0: dependencies: p-try "^2.0.0" -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= - dependencies: - p-limit "^1.1.0" - p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -10704,7 +10617,7 @@ postcss@^8.1.10: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@^8.4.14, postcss@^8.4.18: +postcss@^8.4.14: version "8.4.19" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc" integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA== @@ -10713,6 +10626,15 @@ postcss@^8.4.14, postcss@^8.4.18: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.21: + version "8.4.21" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" + integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -10802,19 +10724,33 @@ property-information@^6.0.0: resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.1.1.tgz#5ca85510a3019726cb9afed4197b7b8ac5926a22" integrity sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w== -prosemirror-commands@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.3.1.tgz#926c88801eebaa50363d4658850b41406d375a31" - integrity sha512-XTporPgoECkOQACVw0JTe3RZGi+fls3/byqt+tXwGTkD7qLuB4KdVrJamDMJf4kfKga3uB8hZ+kUUyZ5oWpnfg== +prosemirror-changeset@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.2.0.tgz#22c05da271a118be40d3e339fa2cace789b1254b" + integrity sha512-QM7ohGtkpVpwVGmFb8wqVhaz9+6IUXcIQBGZ81YNAKYuHiFJ1ShvSzab4pKqTinJhwciZbrtBEk/2WsqSt2PYg== + dependencies: + prosemirror-transform "^1.0.0" + +prosemirror-collab@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.3.0.tgz#601d33473bf72e6c43041a54b860c84c60b37769" + integrity sha512-+S/IJ69G2cUu2IM5b3PBekuxs94HO1CxJIWOFrLQXUaUDKL/JfBx+QcH31ldBlBXyDEUl+k3Vltfi1E1MKp2mA== + dependencies: + prosemirror-state "^1.0.0" + +prosemirror-commands@^1.0.0, prosemirror-commands@^1.3.1: + version "1.5.0" + resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.5.0.tgz#d10efece1647c1d984fef6f65d52fdc77785560b" + integrity sha512-zL0Fxbj3fh71GPNHn5YdYgYGX2aU2XLecZYk2ekEF0oOD259HcXtM+96VjPVi5o3h4sGUdDfEEhGiREXW6U+4A== dependencies: prosemirror-model "^1.0.0" prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-dropcursor@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.5.0.tgz#edbc61d6f71f9f924130eec8e85b0861357957c9" - integrity sha512-vy7i77ddKyXlu8kKBB3nlxLBnsWyKUmQIPB5x8RkYNh01QNp/qqGmdd5yZefJs0s3rtv5r7Izfu2qbtr+tYAMQ== +prosemirror-dropcursor@^1.5.0: + version "1.6.1" + resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.6.1.tgz#31f696172105f232bd17543ccf305e0f33e59d1d" + integrity sha512-LtyqQpkIknaT7NnZl3vDr3TpkNcG4ABvGRXx37XJ8tJNUGtcrZBh40A0344rDwlRTfUEmynQS/grUsoSWz+HgA== dependencies: prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" @@ -10830,7 +10766,7 @@ prosemirror-gapcursor@^1.3.1: prosemirror-state "^1.0.0" prosemirror-view "^1.0.0" -prosemirror-history@^1.3.0: +prosemirror-history@^1.0.0, prosemirror-history@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.3.0.tgz#bf5a1ff7759aca759ddf0c722c2fa5b14fb0ddc1" integrity sha512-qo/9Wn4B/Bq89/YD+eNWFbAytu6dmIM85EhID+fz9Jcl9+DfGEo8TTSrRhP15+fFEoaPqpHSxlvSzSEbmlxlUA== @@ -10839,6 +10775,14 @@ prosemirror-history@^1.3.0: prosemirror-transform "^1.0.0" rope-sequence "^1.3.0" +prosemirror-inputrules@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.2.0.tgz#476dde2dc244050b3aca00cf58a82adfad6749e7" + integrity sha512-eAW/M/NTSSzpCOxfR8Abw6OagdG0MiDAiWHQMQveIsZtoKVYzm0AflSPq/ymqJd56/Su1YPbwy9lM13wgHOFmQ== + dependencies: + prosemirror-state "^1.0.0" + prosemirror-transform "^1.0.0" + prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.0.tgz#d5cc9da9b712020690a994b50b92a0e448a60bf5" @@ -10855,6 +10799,24 @@ prosemirror-markdown@1.9.1: markdown-it "^13.0.1" prosemirror-model "^1.0.0" +prosemirror-markdown@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.10.1.tgz#e20468201cda1916a6182686159398b242bb78ab" + integrity sha512-s7iaTLiX+qO5z8kF2NcMmy2T7mIlxzkS4Sp3vTKSYChPtbMpg6YxFkU0Y06rUg2WtKlvBu7v1bXzlGBkfjUWAA== + dependencies: + markdown-it "^13.0.1" + prosemirror-model "^1.0.0" + +prosemirror-menu@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prosemirror-menu/-/prosemirror-menu-1.2.1.tgz#94d99a8547b7ba5680c20e9c497ce19846ce3b2c" + integrity sha512-sBirXxVfHalZO4f1ZS63WzewINK4182+7dOmoMeBkqYO8wqMBvBS7wQuwVOHnkMWPEh0+N0LJ856KYUN+vFkmQ== + dependencies: + crelt "^1.0.0" + prosemirror-commands "^1.0.0" + prosemirror-history "^1.0.0" + prosemirror-state "^1.0.0" + prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.18.1, prosemirror-model@^1.2.0, prosemirror-model@^1.8.1: version "1.18.1" resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.18.1.tgz#1d5d6b6de7b983ee67a479dc607165fdef3935bd" @@ -10878,7 +10840,7 @@ prosemirror-schema-list@^1.0.0, prosemirror-schema-list@^1.2.2: prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.4.1: +prosemirror-state@^1.0.0, prosemirror-state@^1.3.1, prosemirror-state@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.1.tgz#f6e26c7b6a7e11206176689eb6ebbf91870953e1" integrity sha512-U/LBDW2gNmVa07sz/D229XigSdDQ5CLFwVB1Vb32MJbAHHhWe/6pOc721faI17tqw4pZ49i1xfY/jEZ9tbIhPg== @@ -10886,6 +10848,26 @@ prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, pr prosemirror-model "^1.0.0" prosemirror-transform "^1.0.0" +prosemirror-state@^1.2.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.2.tgz#f93bd8a33a4454efab917ba9b738259d828db7e5" + integrity sha512-puuzLD2mz/oTdfgd8msFbe0A42j5eNudKAAPDB0+QJRw8cO1ygjLmhLrg9RvDpf87Dkd6D4t93qdef00KKNacQ== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-transform "^1.0.0" + prosemirror-view "^1.27.0" + +prosemirror-tables@^1.3.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.3.2.tgz#ca208c6a55d510af14b652d23e800e00ba6bebd4" + integrity sha512-/9JTeN6s58Zq66HXaxP6uf8PAmc7XXKZFPlOGVtLvxEd6xBP6WtzaJB9wBjiGUzwbdhdMEy7V62yuHqk/3VrnQ== + dependencies: + prosemirror-keymap "^1.1.2" + prosemirror-model "^1.8.1" + prosemirror-state "^1.3.1" + prosemirror-transform "^1.2.1" + prosemirror-view "^1.13.3" + prosemirror-test-builder@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/prosemirror-test-builder/-/prosemirror-test-builder-1.1.0.tgz#70d0b10d56e45dff47e0e4b0a1b29c4403a5d9e6" @@ -10895,14 +10877,40 @@ prosemirror-test-builder@^1.1.0: prosemirror-schema-basic "^1.0.0" prosemirror-schema-list "^1.0.0" -prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1, prosemirror-transform@^1.7.0: +prosemirror-trailing-node@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/prosemirror-trailing-node/-/prosemirror-trailing-node-2.0.3.tgz#213fc0e545a434ff3c37b5218a0de69561bf3892" + integrity sha512-lGrjMrn97KWkjQSW/FjdvnhJmqFACmQIyr6lKYApvHitDnKsCoZz6XzrHB7RZYHni/0NxQmZ01p/2vyK2SkvaA== + dependencies: + "@babel/runtime" "^7.13.10" + "@remirror/core-constants" "^2.0.0" + "@remirror/core-helpers" "^2.0.1" + escape-string-regexp "^4.0.0" + +prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1: version "1.7.0" resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.7.0.tgz#a8a0768f3ee6418d26ebef435beda9d43c65e472" integrity sha512-O4T697Cqilw06Zvc3Wm+e237R6eZtJL/xGMliCi+Uo8VL6qHk6afz1qq0zNjT3eZMuYwnP8ZS0+YxX/tfcE9TQ== dependencies: prosemirror-model "^1.0.0" -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.28.2: +prosemirror-transform@^1.7.0: + version "1.7.1" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.7.1.tgz#b516e818c3add0bdf960f4ca8ccb9d057a3ba21b" + integrity sha512-VteoifAfpt46z0yEt6Fc73A5OID9t/y2QIeR5MgxEwTuitadEunD/V0c9jQW8ziT8pbFM54uTzRLJ/nLuQjMxg== + dependencies: + prosemirror-model "^1.0.0" + +prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.27.0: + version "1.30.1" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.30.1.tgz#7cf0ae8dc8553a02c32961e82eca25079c4d8fc9" + integrity sha512-pZUfr7lICJkEY7XwzldAKrkflZDeIvnbfuu2RIS01N5NwJmR/dfZzDzJRzhb3SM2QtT/bM8b4Nnib8X3MGpAhA== + dependencies: + prosemirror-model "^1.16.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + +prosemirror-view@^1.13.3, prosemirror-view@^1.28.2: version "1.28.2" resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.28.2.tgz#e997ef9dc623d01afd170e328fc924e6f4382003" integrity sha512-uK28mJbu0GI8Oz7Aclt6BKL4g+C59EBShBXDB0Y9Y71H25p4bQgmLQLfDWjsT1J9XOw0bR8QQajZmdK8RvXI9g== @@ -11351,7 +11359,7 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.9.0: +resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.9.0: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -11425,17 +11433,17 @@ rollup-pluginutils@^2.8.1: dependencies: estree-walker "^0.6.1" -rollup@^2.79.1: - version "2.79.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" - integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== +rollup@^3.10.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.14.0.tgz#f5925255f3b6e8de1dba3916d7619c7da5708d95" + integrity sha512-o23sdgCLcLSe3zIplT9nQ1+r97okuaiR+vmAPZPTDYB7/f3tgWIYNyiQveMsZwshBT0is4eGax/HH83Q7CG+/Q== optionalDependencies: fsevents "~2.3.2" rope-sequence@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b" - integrity sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg== + version "1.3.3" + resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.3.tgz#3f67fc106288b84b71532b4a5fd9d4881e4457f0" + integrity sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q== route-recognizer@^0.3.3: version "0.3.4" @@ -11889,7 +11897,15 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20: +source-map-support@0.5.13: + version "0.5.13" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" + integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-support@~0.5.12, source-map-support@~0.5.20: version "0.5.20" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== @@ -11912,11 +11928,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" @@ -12449,6 +12460,11 @@ throttle-debounce@^2.1.0: resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.1.0.tgz#257e648f0a56bd9e54fe0f132c4ab8611df4e1d5" integrity sha512-AOvyNahXQuU7NN+VVvOOX+uW6FPaWdAOdRP5HfwYxAfCzXTFKRMoIMk+n+po318+ktcChx+F1Dd91G3YHeMKyg== +throttle-debounce@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb" + integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg== + through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -12715,6 +12731,11 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== +type-fest@^2.0.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" + integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -13092,15 +13113,15 @@ vite-svg-loader@^3.4.0: "@vue/compiler-sfc" "^3.2.20" svgo "^2.7.0" -vite@^3.0.4: - version "3.2.5" - resolved "https://registry.yarnpkg.com/vite/-/vite-3.2.5.tgz#dee5678172a8a0ab3e547ad4148c3d547f90e86a" - integrity sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ== +vite@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/vite/-/vite-4.1.1.tgz#3b18b81a4e85ce3df5cbdbf4c687d93ebf402e6b" + integrity sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg== dependencies: - esbuild "^0.15.9" - postcss "^8.4.18" + esbuild "^0.16.14" + postcss "^8.4.21" resolve "^1.22.1" - rollup "^2.79.1" + rollup "^3.10.0" optionalDependencies: fsevents "~2.3.2" -- GitLab