Merge branch 'v1.x-2022-07' into dependabot/npm_and_yarn/undici-5.28.4

Shopify · Apr 9, 2024 · 2c01b9f · 2c01b9f
2 parents 7abccd4 + 9bc19de
commit 2c01b9f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "turbo": "^1.7.4",
     "type-fest": "^2.12.0",
     "typescript": "^4.8.2",
-    "vite": "^2.9.17",
+    "vite": "^2.9.18",
     "yorkie": "^2.0.0"
   },
   "gitHooks": {

diff --git a/packages/playground/async-config/package.json b/packages/playground/async-config/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
-    "vite": "^2.9.17",
+    "vite": "^2.9.18",
     "@shopify/cli": "^3.12.0",
     "@shopify/cli-hydrogen": "^3.12.0"
   },

diff --git a/packages/playground/server-components/package.json b/packages/playground/server-components/package.json
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
-    "vite": "^2.9.17",
+    "vite": "^2.9.18",
     "@shopify/cli": "^3.12.0",
     "@shopify/cli-hydrogen": "^3.12.0"
   },

diff --git a/templates/demo-store/package.json b/templates/demo-store/package.json
@@ -32,7 +32,7 @@
     "prettier": "^2.3.2",
     "tailwindcss": "^3.0.24",
     "typescript": "^4.7.2",
-    "vite": "^2.9.17",
+    "vite": "^2.9.18",
     "vitest": "^0.15.2"
   },
   "prettier": "@shopify/prettier-config",

diff --git a/templates/hello-world/package.json b/templates/hello-world/package.json
@@ -17,7 +17,7 @@
     "@shopify/cli-hydrogen": "^3.12.0",
     "@types/react": "^18.0.9",
     "typescript": "^4.7.2",
-    "vite": "^2.9.17"
+    "vite": "^2.9.18"
   },
   "dependencies": {
     "@shopify/hydrogen": "^1.7.3",

diff --git a/yarn.lock b/yarn.lock
@@ -10766,11 +10766,6 @@ nano-css@^5.3.1:
     stacktrace-js "^2.0.2"
     stylis "^4.0.6"
 
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
-
 nanoid@^3.3.7:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
@@ -12054,16 +12049,7 @@ postcss-value-parser@^4.0.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, postcss@^8.4.12, postcss@^8.4.13, postcss@^8.4.18:
-  version "8.4.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2"
-  integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==
-  dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.4.31:
+postcss@^8, postcss@^8.4.12, postcss@^8.4.13, postcss@^8.4.18, postcss@^8.4.31:
   version "8.4.38"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
   integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
@@ -13492,11 +13478,6 @@ sonic-boom@^3.1.0:
   dependencies:
     atomic-sleep "^1.0.0"
 
-source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
-
 source-map-js@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
@@ -15260,7 +15241,7 @@ vite-plugin-inspect@^0.3.6:
     sirv "^2.0.2"
     ufo "^0.7.10"
 
-vite@^2.9.12, vite@^2.9.13:
+vite@^2.9.12, vite@^2.9.13, vite@^2.9.18:
   version "2.9.18"
   resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.18.tgz#74e2a83b29da81e602dac4c293312cc575f091c7"
   integrity sha512-sAOqI5wNM9QvSEE70W3UGMdT8cyEn0+PmJMTFvTB8wB0YbYUWw3gUbY62AOyrXosGieF2htmeLATvNxpv/zNyQ==
@@ -15284,18 +15265,6 @@ vite@^2.9.12, vite@^2.9.13:
   optionalDependencies:
     fsevents "~2.3.2"
 
-vite@^2.9.17:
-  version "2.9.17"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.17.tgz#6b770525e12fa2a2e3a0fa0d028d304f4f7dc7d4"
-  integrity sha512-XxcRzra6d7xrKXH66jZUgb+srThoPu+TLJc06GifUyKq9JmjHkc1Numc8ra0h56rju2jfVWw3B3fs5l3OFMvUw==
-  dependencies:
-    esbuild "^0.14.27"
-    postcss "^8.4.13"
-    resolve "^1.22.0"
-    rollup ">=2.59.0 <2.78.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
 vitest@0.24.3:
   version "0.24.3"
   resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.24.3.tgz#d91c7e2d557877d5270033efdf18add6063f0c97"