chore(react-18): upgrade rn and nextjs example apps

aws-amplify · Oct 21, 2023 · 56c6fbb · 56c6fbb
1 parent c8684c1
commit 56c6fbb
Show file tree

Hide file tree

Showing 68 changed files with 1,379 additions and 7,311 deletions.
diff --git a/examples/angular/angular.json b/examples/angular/angular.json
@@ -113,5 +113,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": false
   }
 }
diff --git a/examples/next/next-env.d.ts b/examples/next/next-env.d.ts
diff --git a/examples/next/next.config.js b/examples/next/next.config.js
@@ -13,14 +13,6 @@ module.exports = {
     // allows importing of css files inside modules
     patchWebpackConfig(config, options);
 
-    // resolve react and react-dom from project node_modules
-    config.resolve.alias = {
-      ...config.resolve.alias,
-      react: path.resolve(__dirname, 'node_modules/react'),
-      'react-dom': path.resolve(__dirname, 'node_modules/react-dom'),
-      'react-map-gl': path.resolve(__dirname, 'node_modules/react-map-gl'),
-    };
-
     return config;
   },
 };
diff --git a/examples/next/package.json b/examples/next/package.json
@@ -17,20 +17,20 @@
     "@aws-amplify/ui-react-geo": "^1.0.2",
     "@aws-sdk/credential-providers": "^3.370.0",
     "aws-amplify": "latest",
-    "next": "^11.1.3",
+    "next": "^13.5.5",
     "next-global-css": "^1.1.1",
-    "react": "17",
+    "react": "18.2.0",
     "react-copy-to-clipboard": "^5.1.0",
-    "react-dom": "17",
+    "react-dom": "18.2.0",
     "react-icons": "^4.4.0",
     "react-map-gl": "7.0.23",
     "swr": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^15.12.4",
-    "@types/react": "17.0.47",
+    "@types/react": "^18.2.22",
     "eslint": "^8.44.0",
-    "eslint-config-next": "11.0.1",
+    "eslint-config-next": "^13.5.5",
     "rimraf": "^3.0.2"
   }
 }
diff --git a/examples/next/tsconfig.json b/examples/next/tsconfig.json
@@ -19,8 +19,11 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "paths": {
-      "@environments/*": ["../../environments/*"]
-    }
+      "@environments/*": [
+        "../../environments/*"
+      ]
+    },
+    "incremental": true
   },
   "include": [
     "next-env.d.ts",

diff --git a/examples/react-native/.buckconfig b/examples/react-native/.buckconfig
diff --git a/examples/react-native/_bundle/config → examples/react-native/.bundle/config b/examples/react-native/_bundle/config → examples/react-native/.bundle/config
diff --git a/examples/react-native/.gitignore b/examples/react-native/.gitignore
@@ -20,6 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+ios/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -29,33 +30,34 @@ build/
 local.properties
 *.iml
 *.hprof
+.cxx/
+*.keystore
+!debug.keystore
 
 # node.js
 #
 node_modules/
 npm-debug.log
 yarn-error.log
 
-# BUCK
-buck-out/
-\.buckd/
-*.keystore
-!debug.keystore
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
 # https://docs.fastlane.tools/best-practices/source-control/
 
-*/fastlane/report.xml
-*/fastlane/Preview.html
-*/fastlane/screenshots
+**/fastlane/report.xml
+**/fastlane/Preview.html
+**/fastlane/screenshots
+**/fastlane/test_output
 
 # Bundle artifact
 *.jsbundle
 
 # Ruby / CocoaPods
 /ios/Pods/
 /vendor/bundle/
+
+# Temporary files created by Metro to check the health of the file watcher
+.metro-health-check*
diff --git a/examples/react-native/Gemfile b/examples/react-native/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.4'
+ruby '>= 2.6.10'
 
-gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+gem 'cocoapods', '>= 1.11.3'
diff --git a/examples/react-native/_ruby-version b/examples/react-native/_ruby-version
diff --git a/examples/react-native/android/app/_BUCK b/examples/react-native/android/app/_BUCK
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,5 +113,8 @@ @@
             }
           }
         }
+      },
+      "cli": {
+        "analytics": false
       }
     }