Merge remote-tracking branch 'origin/feat-upgrade'

pixelfusion · May 27, 2024 · 5cbd465 · 5cbd465
2 parents 9917e88 + fc0b2fa
commit 5cbd465
Show file tree

Hide file tree

Showing 43 changed files with 60,228 additions and 139,429 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 node_modules
-reports
+reports
+.env
+**/.env
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 ## Monorepo tooling
 
-gatsby-plugin-s3 uses a Lerna-based monorepo. After cloning the repository, please use `npx lerna bootstrap` to install
+gatsby-plugin-s3 uses a Lerna-based monorepo. After cloning the repository, please use `npm install` to install
 dependencies and symlink the different projects together.
 
 You can use `npx lerna run build` to automatically build all of the projects in the correct order.
@@ -12,4 +12,4 @@ please be patient.
 
 ## Test setup
 
-Running our e2e tests requires some setup, please see [TESTING.md](./TESTING.md) for more details.
+Running our e2e tests requires some setup, please see [TESTING.md](./TESTING.md) for more details.
diff --git a/README.md b/README.md
diff --git a/examples/with-redirects/gatsby-config.js b/examples/with-redirects/gatsby-config.js
@@ -13,21 +13,16 @@ module.exports = {
             options: {
                 bucketName: process.env.GATSBY_S3_TARGET_BUCKET || 'test',
                 bucketPrefix: process.env.GATSBY_S3_BUCKET_PREFIX ? process.env.GATSBY_S3_BUCKET_PREFIX : null,
-                region: 'eu-west-1',
-                generateRedirectObjectsForPermanentRedirects: !process.env.GATSBY_S3_LEGACY_REDIRECTS,
+                region: process.env.AWS_REGION || 'us-east-1',
                 ...(process.env.GATSBY_S3_ACL
                     ? {
-                          acl: process.env.ACL != 'NULL' ? process.env.ACL : null,
-                      }
+                        acl: process.env.ACL !== 'NULL' ? process.env.ACL : null,
+                    }
                     : {}),
                 removeNonexistentObjects: true,
                 retainObjectsPatterns: ['**/*.retain.js', '**/retain-folder/*'],
             },
         },
-        {
-            resolve: `gatsby-plugin-create-client-paths`,
-            options: { prefixes: [`/client-only/*`] },
-        },
         'gatsby-plugin-offline',
     ],
 };
diff --git a/examples/with-redirects/gatsby-node.js b/examples/with-redirects/gatsby-node.js
@@ -2,30 +2,39 @@ exports.createPages = ({ actions }) => {
     // create some test redirects
     actions.createRedirect({
         fromPath: '/',
-        toPath: '/page-2',
+        toPath: '/page-2/',
     });
 
     actions.createRedirect({
         fromPath: '/blog',
-        toPath: '/blog/1',
+        toPath: '/blog/1/',
         isPermanent: true
     });
-    
+
     actions.createRedirect({
         fromPath: '/hello-there',
-        toPath: '/client-only',
+        toPath: '/client-only/',
         isPermanent: false
     });
 
     actions.createRedirect({
         fromPath: '/asdf123.-~_!$&\'()*+,;=:@%',
-        toPath: '/special-characters',
+        toPath: '/special-characters/',
         isPermanent: true
     });
 
     actions.createRedirect({
         fromPath: '/trailing-slash/',
-        toPath: '/trailing-slash/1',
+        toPath: '/trailing-slash/1/',
         isPermanent: true
     });
-};
+};
+
+// Required for client only paths to work
+exports.onCreatePage = async ({ page, actions }) => {
+    const {createPage} = actions
+    if (page.path.match(/^\/client-only/)) {
+        page.matchPath = "/client-only/*"
+        createPage(page)
+    }
+}