Update to 1.17.1

Shopify · Jun 8, 2023 · 28110ca · 28110ca
1 parent 0e069d4
commit 28110ca
Show file tree

Hide file tree

Showing 9 changed files with 771 additions and 155 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -26,14 +26,14 @@
     "vitest": "^0.28.1"
   },
   "peerDependencies": {
-    "@remix-run/react": "^1.16.1",
+    "@remix-run/react": "^1.17.1-pre.0",
     "@shopify/hydrogen-react": "^2023.4.3",
     "@shopify/remix-oxygen": "^1.0.7"
   },
   "dependencies": {
     "@graphql-codegen/cli": "3.3.1",
     "@oclif/core": "2.1.4",
-    "@remix-run/dev": "1.16.1",
+    "@remix-run/dev": "1.17.1-pre.0",
     "@shopify/cli-kit": "3.45.0",
     "@shopify/hydrogen-codegen": "^0.0.1",
     "@shopify/mini-oxygen": "^1.6.0",

diff --git a/packages/cli/src/commands/hydrogen/build.ts b/packages/cli/src/commands/hydrogen/build.ts
@@ -66,12 +66,14 @@ export async function runBuild({
 
   outputInfo(`\n🏗️  Building in ${process.env.NODE_ENV} mode...`);
 
-  const [remixConfig, {build}, {logThrown}] = await Promise.all([
-    getRemixConfig(root),
-    import('@remix-run/dev/dist/compiler/build.js'),
-    import('@remix-run/dev/dist/compiler/utils/log.js'),
-    rmdir(buildPath, {force: true}),
-  ]);
+  const [remixConfig, {build}, {logThrown}, {createFileWatchCache}] =
+    await Promise.all([
+      getRemixConfig(root),
+      import('@remix-run/dev/dist/compiler/build.js'),
+      import('@remix-run/dev/dist/compiler/utils/log.js'),
+      import('@remix-run/dev/dist/compiler/fileWatchCache.js'),
+      rmdir(buildPath, {force: true}),
+    ]);
 
   await Promise.all([
     copyPublicFiles(publicPath, buildPathClient),
@@ -82,6 +84,7 @@ export async function runBuild({
         onWarning: warnOnce,
         sourcemap,
       },
+      fileWatchCache: createFileWatchCache(),
     }).catch((thrown) => {
       logThrown(thrown);
       process.exit(1);

diff --git a/packages/cli/src/commands/hydrogen/dev.ts b/packages/cli/src/commands/hydrogen/dev.ts
@@ -145,7 +145,10 @@ async function runDev({
   }
 
   let isInitialBuild = true;
-  const {watch} = await import('@remix-run/dev/dist/compiler/watch.js');
+  const [{watch}, {createFileWatchCache}] = await Promise.all([
+    import('@remix-run/dev/dist/compiler/watch.js'),
+    import('@remix-run/dev/dist/compiler/fileWatchCache.js'),
+  ]);
 
   const remixConfig = await reloadConfig();
 
@@ -161,6 +164,7 @@ async function runDev({
         onWarning: warnOnce,
         sourcemap,
       },
+      fileWatchCache: createFileWatchCache(),
     },
     {
       reloadConfig,

diff --git a/packages/hydrogen/package.json b/packages/hydrogen/package.json
@@ -58,8 +58,8 @@
     "react": "^18.2.0"
   },
   "peerDependencies": {
-    "@remix-run/react": "^1.16.1",
-    "@remix-run/server-runtime": "^1.16.1"
+    "@remix-run/react": "^1.17.1-pre.0",
+    "@remix-run/server-runtime": "^1.17.1-pre.0"
   },
   "devDependencies": {
     "@testing-library/react": "^14.0.0",

diff --git a/packages/remix-oxygen/package.json b/packages/remix-oxygen/package.json
@@ -40,7 +40,7 @@
     "dist"
   ],
   "dependencies": {
-    "@remix-run/server-runtime": "1.16.1"
+    "@remix-run/server-runtime": "1.17.1-pre.0"
   },
   "devDependencies": {
     "@shopify/oxygen-workers-types": "^3.17.2"

diff --git a/templates/demo-store/package.json b/templates/demo-store/package.json
@@ -18,7 +18,7 @@
   "prettier": "@shopify/prettier-config",
   "dependencies": {
     "@headlessui/react": "^1.7.2",
-    "@remix-run/react": "1.16.1",
+    "@remix-run/react": "1.17.1-pre.0",
     "@shopify/cli": "3.45.0",
     "@shopify/cli-hydrogen": "^4.2.1",
     "@shopify/hydrogen": "^2023.4.3",
@@ -38,8 +38,8 @@
     "worktop": "^0.7.3"
   },
   "devDependencies": {
-    "@remix-run/dev": "1.16.1",
-    "@remix-run/eslint-config": "1.16.1",
+    "@remix-run/dev": "1.17.1-pre.0",
+    "@remix-run/eslint-config": "1.17.1-pre.0",
     "@shopify/eslint-plugin": "^42.0.1",
     "@shopify/oxygen-workers-types": "^3.17.2",
     "@shopify/prettier-config": "^1.1.2",

diff --git a/templates/hello-world/package.json b/templates/hello-world/package.json
@@ -12,7 +12,7 @@
   },
   "prettier": "@shopify/prettier-config",
   "dependencies": {
-    "@remix-run/react": "1.16.1",
+    "@remix-run/react": "1.17.1-pre.0",
     "@shopify/cli": "3.45.0",
     "@shopify/cli-hydrogen": "^4.2.1",
     "@shopify/hydrogen": "^2023.4.3",
@@ -24,7 +24,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "1.16.1",
+    "@remix-run/dev": "1.17.1-pre.0",
     "@shopify/oxygen-workers-types": "^3.17.2",
     "@shopify/prettier-config": "^1.1.2",
     "@types/eslint": "^8.4.10",

diff --git a/templates/skeleton/package.json b/templates/skeleton/package.json
@@ -12,7 +12,7 @@
   },
   "prettier": "@shopify/prettier-config",
   "dependencies": {
-    "@remix-run/react": "1.16.1",
+    "@remix-run/react": "1.17.1-pre.0",
     "@shopify/cli": "3.45.0",
     "@shopify/cli-hydrogen": "^4.2.1",
     "@shopify/hydrogen": "^2023.4.3",
@@ -24,7 +24,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "1.16.1",
+    "@remix-run/dev": "1.17.1-pre.0",
     "@shopify/oxygen-workers-types": "^3.17.2",
     "@shopify/prettier-config": "^1.1.2",
     "@types/eslint": "^8.4.10",