Thanks to visit codestin.com
Credit goes to github.com

Skip to content

refactor: Migrate from Next.js to pure webpack config #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 72 commits into from
Mar 12, 2022
Merged

refactor: Migrate from Next.js to pure webpack config #360

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
f87c03e
Remove nextJS as dependency
bryphe-coder Feb 24, 2022
d767aa8
Next js config -> webpack config
bryphe-coder Feb 24, 2022
e1dbec2
Migrate next/link -> react-router-dom Link
bryphe-coder Feb 24, 2022
6f65f1b
Migrate routing to react-router-dom style; get webpack building
bryphe-coder Feb 24, 2022
69010f8
Hook up workspaces route
bryphe-coder Feb 25, 2022
7800a4e
First round of clean-up
bryphe-coder Feb 25, 2022
7158d75
Get SignInForm tests green
bryphe-coder Feb 25, 2022
a58a29d
Get additional tests green
bryphe-coder Feb 25, 2022
bc83df6
Get tests green again
bryphe-coder Feb 25, 2022
3c5895c
HMR / live reload updates from FE variety
bryphe-coder Feb 25, 2022
b657fe6
Remove export from Makefile temporarily
bryphe-coder Feb 25, 2022
75a38d9
Remove export command
bryphe-coder Feb 25, 2022
e4fe1ed
Convert webpack config to typescript
bryphe-coder Feb 25, 2022
d9e9d2d
Split out dev vs prod webpack configs
bryphe-coder Feb 25, 2022
02838a2
Remove nextrouter, port over some functionality to embed
bryphe-coder Feb 25, 2022
d8c983f
Implement content-addressable (and cache-friendly) bundle name
bryphe-coder Feb 26, 2022
396be38
Start setting up new post-nextrouter routing strategy
bryphe-coder Feb 26, 2022
87be7aa
Fix production webpack config
bryphe-coder Feb 26, 2022
3e1d008
Remove _document
bryphe-coder Feb 26, 2022
d1566d3
Remove nested GITKEEP
bryphe-coder Feb 26, 2022
bdd966b
Copy static files over
bryphe-coder Feb 26, 2022
ac064ca
Fix up dependencies
bryphe-coder Feb 26, 2022
c0ca05c
Clean-up
bryphe-coder Feb 26, 2022
b85dcf1
Merge main
bryphe-coder Mar 2, 2022
3a724e4
Merge main
bryphe-coder Mar 8, 2022
40a4e69
Use same entry point as v1
bryphe-coder Mar 8, 2022
7f10110
Initial lint fix
bryphe-coder Mar 8, 2022
a5a09d5
Move index.html -> html_templates
bryphe-coder Mar 8, 2022
5af2c20
Merge branch 'main' into bryphe/experiment/nextjs-to-webpack
bryphe-coder Mar 8, 2022
3898544
Implement 404 page
bryphe-coder Mar 8, 2022
cd07056
Add test case for caching
bryphe-coder Mar 9, 2022
78051ff
Remove now-unused function
bryphe-coder Mar 9, 2022
cf8b4e0
Add plumbing to make CSRF token testable
bryphe-coder Mar 9, 2022
8bd5804
Fix todos
bryphe-coder Mar 9, 2022
427672b
Additional test cases
bryphe-coder Mar 9, 2022
929a3b7
Remove now unnecessary test
bryphe-coder Mar 9, 2022
f822347
Add test + fix template parameters
bryphe-coder Mar 9, 2022
6c00822
Fix up go lint cases
bryphe-coder Mar 9, 2022
12b0e1d
Remove commented and now-unnecessary export step
bryphe-coder Mar 9, 2022
b348b70
Fix Handler -> DefaultHandler
bryphe-coder Mar 9, 2022
07f52d5
Fix remaining lint issues
bryphe-coder Mar 9, 2022
095bcfc
Add webpack-bundle-analyzer + command to run server
bryphe-coder Mar 9, 2022
7b5e982
Better document the webpack files to match the work Grey is doing in v1
bryphe-coder Mar 9, 2022
a3f31c9
Update webpack configs
bryphe-coder Mar 9, 2022
4134392
Port over fileoverview comments
bryphe-coder Mar 9, 2022
90f04ab
Remove accidental addition of test collateral
bryphe-coder Mar 10, 2022
6ffd38b
Use <Navigate> component from react-router-dom instead of custom <Red…
bryphe-coder Mar 10, 2022
7a50bc1
Merge main
bryphe-coder Mar 11, 2022
b4a18e0
Fix lint issues
bryphe-coder Mar 11, 2022
244e305
Remove build:dev to match v1 suite of webpack build commands
bryphe-coder Mar 11, 2022
e65f5af
Remove dev.ts and several references in jest/tsconfig
bryphe-coder Mar 11, 2022
19509bc
Fix copy-paste error with the NotFoundPage
bryphe-coder Mar 11, 2022
f4f7cb3
Add descriptive comment for SWR fetching
bryphe-coder Mar 11, 2022
37295ce
Remove unnecessary inline styles
bryphe-coder Mar 11, 2022
02a8718
Remove custom title in HTMLWebpackPlugin
bryphe-coder Mar 11, 2022
6e168a8
Use default settings for HtmlWebpackPlugin for script injection
bryphe-coder Mar 11, 2022
1a600d1
Remove 'noEmit' flag from tsconfig
bryphe-coder Mar 11, 2022
cab30cd
Remove dev.ts from tsconfig.test.json
bryphe-coder Mar 11, 2022
b725cf8
Format jest file
bryphe-coder Mar 11, 2022
71d076d
Use bundle name as-is for development
bryphe-coder Mar 11, 2022
818fc74
Factor to v1 strategy; get tests passing
bryphe-coder Mar 11, 2022
b61d39e
Fix go lint issues
bryphe-coder Mar 11, 2022
8b67328
Add missed meta tag
bryphe-coder Mar 11, 2022
2a183ce
Port over publicPath, needed for the v1 embed strategy
bryphe-coder Mar 11, 2022
037489f
Fix up formatting
bryphe-coder Mar 11, 2022
0b81ab8
Fix compilation error
bryphe-coder Mar 12, 2022
0839201
Update comment
bryphe-coder Mar 12, 2022
685b8f1
Add progress to build:analyze command
bryphe-coder Mar 12, 2022
807ac3b
Tweak comment
bryphe-coder Mar 12, 2022
2d47d8c
Add more logs to playwright
bryphe-coder Mar 12, 2022
861592a
Port over our playwright utilities for client-side nav
bryphe-coder Mar 12, 2022
c31f594
Merge branch 'main' into bryphe/experiment/nextjs-to-webpack
bryphe-coder Mar 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge main
  • Loading branch information
@bryphe-coder
bryphe-coder committed Mar 8, 2022
commit 3a724e47fb7bcb437dac7c960f704fc3f32662e9
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ site/out:
./scripts/yarn_install.sh
cd site && yarn build
# cd site && yarn export
# Restores GITKEEP files!
git checkout HEAD site/out
.PHONY: site/out

snapshot:
Expand Down
3 changes: 2 additions & 1 deletion site/embed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ import (
// The `embed` package ignores recursively including directories
// that prefix with `_`. Wildcarding nested is janky, but seems to
// work quite well for edge-cases.
//go:embed out/*
//go:embed out
//go:embed out/bin/*
var site embed.FS

// Handler returns an HTTP handler for serving the static site.
Expand Down
3 changes: 2 additions & 1 deletion site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
"@material-ui/core": "4.9.4",
"@material-ui/icons": "4.5.1",
"@material-ui/lab": "4.0.0-alpha.42",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
"@playwright/test": "1.19.2",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
"@react-theming/storybook-addon": "1.1.5",
"@storybook/addon-actions": "6.4.19",
"@storybook/addon-essentials": "6.4.19",
Expand Down
137 changes: 137 additions & 0 deletions site/test_results/junit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites name="Front-end Jest Tests" tests="44" failures="0" errors="0" time="22.967">
<testsuite name="array" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="15.598" tests="3">
<testcase classname="array firstOrItem returns null if empty array" name="array firstOrItem returns null if empty array" time="0.064">
</testcase>
<testcase classname="array firstOrItem returns first item if array with more one item" name="array firstOrItem returns first item if array with more one item" time="0.014">
</testcase>
<testcase classname="array firstOrItem returns item if single item" name="array firstOrItem returns item if single item" time="0">
</testcase>
</testsuite>
<testsuite name="ErrorSummary" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="16.559" tests="1">
<testcase classname="ErrorSummary renders" name="ErrorSummary renders" time="0.099">
</testcase>
</testsuite>
<testsuite name="FullScreenLoader" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="17.467" tests="1">
<testcase classname="FullScreenLoader renders" name="FullScreenLoader renders" time="0.285">
</testcase>
</testsuite>
<testsuite name="Redirect" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="17.564" tests="1">
<testcase classname="Redirect performs client-side redirect on render" name="Redirect performs client-side redirect on render" time="0.102">
</testcase>
</testsuite>
<testsuite name="Workspace" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="17.866" tests="1">
<testcase classname="Workspace renders" name="Workspace renders" time="0.283">
</testcase>
</testsuite>
<testsuite name="LoadingButton" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="17.91" tests="2">
<testcase classname="LoadingButton renders" name="LoadingButton renders" time="0.295">
</testcase>
<testcase classname="LoadingButton shows spinner if loading is set to true" name="LoadingButton shows spinner if loading is set to true" time="0.138">
</testcase>
</testsuite>
<testsuite name="EmptyState" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.047" tests="1">
<testcase classname="EmptyState renders (smoke test)" name="EmptyState renders (smoke test)" time="0.067">
</testcase>
</testsuite>
<testsuite name="PasswordField" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.075" tests="1">
<testcase classname="PasswordField renders" name="PasswordField renders" time="0.195">
</testcase>
</testsuite>
<testsuite name="FormTextField" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.257" tests="2">
<testcase classname="FormTextField helperText uses helperText prop when there are no errors" name="FormTextField helperText uses helperText prop when there are no errors" time="0.159">
</testcase>
<testcase classname="FormTextField helperText uses validation message when there are errors" name="FormTextField helperText uses validation message when there are errors" time="0.07">
</testcase>
</testsuite>
<testsuite name="CliAuthToken" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.283" tests="1">
<testcase classname="CliAuthToken renders content" name="CliAuthToken renders content" time="0.241">
</testcase>
</testsuite>
<testsuite name="Icons" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.564" tests="5">
<testcase classname="Icons rendering icon &quot;CoderIcon&quot;" name="Icons rendering icon &quot;CoderIcon&quot;" time="0.049">
</testcase>
<testcase classname="Icons rendering icon &quot;Logo&quot;" name="Icons rendering icon &quot;Logo&quot;" time="0.007">
</testcase>
<testcase classname="Icons rendering icon &quot;WorkspacesIcon&quot;" name="Icons rendering icon &quot;WorkspacesIcon&quot;" time="0.007">
</testcase>
<testcase classname="Icons rendering icon &quot;FileCopy&quot;" name="Icons rendering icon &quot;FileCopy&quot;" time="0.007">
</testcase>
<testcase classname="Icons rendering icon &quot;LogoutIcon&quot;" name="Icons rendering icon &quot;LogoutIcon&quot;" time="0.006">
</testcase>
</testsuite>
<testsuite name="Footer" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.569" tests="1">
<testcase classname="Footer renders content" name="Footer renders content" time="0.062">
</testcase>
</testsuite>
<testsuite name="FormCloseButton" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.582" tests="4">
<testcase classname="FormCloseButton renders" name="FormCloseButton renders" time="0.14">
</testcase>
<testcase classname="FormCloseButton calls onClose when clicked" name="FormCloseButton calls onClose when clicked" time="0.065">
</testcase>
<testcase classname="FormCloseButton calls onClose when escape is pressed" name="FormCloseButton calls onClose when escape is pressed" time="0.052">
</testcase>
<testcase classname="FormCloseButton doesn&apos;t call onClose if another key is pressed" name="FormCloseButton doesn&apos;t call onClose if another key is pressed" time="0.028">
</testcase>
</testsuite>
<testsuite name="CodeBlock" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.631" tests="1">
<testcase classname="CodeBlock renders lines)" name="CodeBlock renders lines)" time="0.099">
</testcase>
</testsuite>
<testsuite name="SplitButton" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.657" tests="2">
<testcase classname="SplitButton onClick is called when primary action is clicked" name="SplitButton onClick is called when primary action is clicked" time="0.154">
</testcase>
<testcase classname="SplitButton onClick is called when clicking option in pop-up" name="SplitButton onClick is called when clicking option in pop-up" time="0.293">
</testcase>
</testsuite>
<testsuite name="CodeExample" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.697" tests="1">
<testcase classname="CodeExample renders code" name="CodeExample renders code" time="0.135">
</testcase>
</testsuite>
<testsuite name="CreateProjectForm" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.732" tests="1">
<testcase classname="CreateProjectForm renders" name="CreateProjectForm renders" time="0.337">
</testcase>
</testsuite>
<testsuite name="CreateWorkspaceForm" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.749" tests="1">
<testcase classname="CreateWorkspaceForm renders" name="CreateWorkspaceForm renders" time="0.218">
</testcase>
</testsuite>
<testsuite name="Header" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="18.785" tests="2">
<testcase classname="Header renders title and subtitle" name="Header renders title and subtitle" time="0.073">
</testcase>
<testcase classname="Header renders button if specified" name="Header renders button if specified" time="0.141">
</testcase>
</testsuite>
<testsuite name="Table" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="19.057" tests="3">
<testcase classname="Table renders empty state if empty" name="Table renders empty state if empty" time="0.086">
</testcase>
<testcase classname="Table renders title" name="Table renders title" time="0.03">
</testcase>
<testcase classname="Table renders data fields with default renderer if none provided" name="Table renders data fields with default renderer if none provided" time="0.028">
</testcase>
</testsuite>
<testsuite name="UserContext" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="19.127" tests="3">
<testcase classname="UserContext shouldn&apos;t redirect if user fails to load and redirectOnFailure is false" name="UserContext shouldn&apos;t redirect if user fails to load and redirectOnFailure is false" time="0.037">
</testcase>
<testcase classname="UserContext should redirect if user fails to load and redirectOnFailure is true" name="UserContext should redirect if user fails to load and redirectOnFailure is true" time="0.055">
</testcase>
<testcase classname="UserContext should not redirect if user loads and redirectOnFailure is true" name="UserContext should not redirect if user loads and redirectOnFailure is true" time="0.007">
</testcase>
</testsuite>
<testsuite name="SignInForm" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="19.801" tests="4">
<testcase classname="SignInForm renders content" name="SignInForm renders content" time="0.159">
</testcase>
<testcase classname="SignInForm shows an error message if SignIn fails" name="SignInForm shows an error message if SignIn fails" time="0.168">
</testcase>
<testcase classname="SignInForm redirects when login is complete" name="SignInForm redirects when login is complete" time="0.127">
</testcase>
<testcase classname="SignInForm respects ?redirect query parameter when complete" name="SignInForm respects ?redirect query parameter when complete" time="0.12">
</testcase>
</testsuite>
<testsuite name="Navbar" errors="0" failures="0" skipped="0" timestamp="2022-02-26T04:35:02" time="20.789" tests="2">
<testcase classname="Navbar renders content" name="Navbar renders content" time="0.099">
</testcase>
<testcase classname="Navbar renders profile picture for user" name="Navbar renders profile picture for user" time="0.076">
</testcase>
</testsuite>
</testsuites>
110 changes: 110 additions & 0 deletions site/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,7 +1707,57 @@
mkdirp "^1.0.4"
rimraf "^3.0.2"

<<<<<<< HEAD
"@pmmmwh/react-refresh-webpack-plugin@^0.5.1", "@pmmmwh/react-refresh-webpack-plugin@^0.5.4":
||||||| 7e72eb9
"@pmmmwh/react-refresh-webpack-plugin@^0.5.1":
=======
"@playwright/[email protected]":
version "1.19.2"
resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.19.2.tgz#429d1aa70f5e4cd521cdc8a5d9861ae4fcda3f7c"
integrity sha512-5oCmlYHjtOL662OxSkZBYGnoHWIQui7b4YHWNeSCYwhQjmjVcV5njRc8oBZlU8IwJgG7ZH2yhDk1haU96ygbWw==
dependencies:
"@babel/code-frame" "7.16.7"
"@babel/core" "7.16.12"
"@babel/plugin-proposal-class-properties" "7.16.7"
"@babel/plugin-proposal-dynamic-import" "7.16.7"
"@babel/plugin-proposal-export-namespace-from" "7.16.7"
"@babel/plugin-proposal-logical-assignment-operators" "7.16.7"
"@babel/plugin-proposal-nullish-coalescing-operator" "7.16.7"
"@babel/plugin-proposal-numeric-separator" "7.16.7"
"@babel/plugin-proposal-optional-chaining" "7.16.7"
"@babel/plugin-proposal-private-methods" "7.16.11"
"@babel/plugin-proposal-private-property-in-object" "7.16.7"
"@babel/plugin-syntax-async-generators" "7.8.4"
"@babel/plugin-syntax-json-strings" "7.8.3"
"@babel/plugin-syntax-object-rest-spread" "7.8.3"
"@babel/plugin-syntax-optional-catch-binding" "7.8.3"
"@babel/plugin-transform-modules-commonjs" "7.16.8"
"@babel/plugin-transform-react-jsx" "7.16.7"
"@babel/preset-typescript" "7.16.7"
babel-plugin-module-resolver "4.1.0"
colors "1.4.0"
commander "8.3.0"
debug "4.3.3"
expect "27.2.5"
jest-matcher-utils "27.2.5"
jpeg-js "0.4.3"
json5 "2.2.0"
mime "3.0.0"
minimatch "3.0.4"
ms "2.1.3"
open "8.4.0"
pirates "4.0.4"
pixelmatch "5.2.1"
playwright-core "1.19.2"
pngjs "6.0.0"
rimraf "3.0.2"
source-map-support "0.4.18"
stack-utils "2.0.5"
yazl "2.5.1"

"@pmmmwh/react-refresh-webpack-plugin@^0.5.1":
>>>>>>> main
version "0.5.4"
resolved "https://registry.yarnpkg.com/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.4.tgz#df0d0d855fc527db48aac93c218a0bf4ada41f99"
integrity sha512-zZbZeHQDnoTlt2AF+diQT0wsSXpvWiaIOZwBRdltNFhG1+I3ozyaw7U/nBiUwyJ0D+zwdXp0E3bWOl38Ag2BMw==
Expand Down Expand Up @@ -5545,6 +5595,7 @@ deepmerge@^4.2.2:
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==

<<<<<<< HEAD
default-gateway@^6.0.3:
version "6.0.3"
resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
Expand All @@ -5557,6 +5608,14 @@ define-lazy-prop@^2.0.0:
resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==

||||||| 7e72eb9
=======
define-lazy-prop@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==

>>>>>>> main
define-properties@^1.1.2, define-properties@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
Expand Down Expand Up @@ -10519,6 +10578,7 @@ pretty-error@^2.1.1:
lodash "^4.17.20"
renderkid "^2.0.4"

<<<<<<< HEAD
pretty-error@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"
Expand All @@ -10528,6 +10588,11 @@ pretty-error@^4.0.0:
renderkid "^3.0.0"

pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
||||||| 7e72eb9
pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.5.1:
=======
pretty-format@^27.0.0, pretty-format@^27.0.2, pretty-format@^27.2.5, pretty-format@^27.5.1:
>>>>>>> main
version "27.5.1"
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
Expand Down Expand Up @@ -11324,7 +11389,13 @@ resolve.exports@^1.1.0:
resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==

<<<<<<< HEAD
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.9.0:
||||||| 7e72eb9
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2:
=======
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2:
>>>>>>> main
version "1.22.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
Expand All @@ -11346,11 +11417,20 @@ ret@~0.1.10:
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==

<<<<<<< HEAD
retry@^0.13.1:
version "0.13.1"
resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==

||||||| 7e72eb9
=======
retry@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=

>>>>>>> main
reusify@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
Expand Down Expand Up @@ -11782,6 +11862,7 @@ snapdragon@^0.8.1:
source-map-resolve "^0.5.0"
use "^3.1.0"

<<<<<<< HEAD
sockjs@^0.3.21:
version "0.3.24"
resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
Expand All @@ -11791,6 +11872,26 @@ sockjs@^0.3.21:
uuid "^8.3.2"
websocket-driver "^0.7.4"

||||||| 7e72eb9
=======
[email protected]:
version "6.1.1"
resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
dependencies:
agent-base "^6.0.2"
debug "^4.3.1"
socks "^2.6.1"

socks@^2.6.1:
version "2.6.2"
resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
dependencies:
ip "^1.1.5"
smart-buffer "^4.2.0"

>>>>>>> main
source-list-map@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
Expand Down Expand Up @@ -13412,6 +13513,7 @@ ws@^7.4.6:
resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==

<<<<<<< HEAD
ws@^8.2.3:
version "8.4.2"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
Expand All @@ -13422,6 +13524,14 @@ ws@^8.4.2:
resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==

||||||| 7e72eb9
ws@^8.2.3:
version "8.4.2"
resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==

=======
>>>>>>> main
xml-name-validator@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.