bump deps + example move

krizzu · krizzu · commit 6cbfc54f1f1e · 2024-12-01T10:30:36.000+01:00
diff --git a/package.json b/package.json
@@ -21,30 +21,17 @@
     "turbo": "^1.12.5",
     "typescript": "^5.3.0"
   },
+  "resolutions": {
+    "@react-native-mac/virtualized-lists": "0.76.0"
+  },
   "engines": {
     "node": "v20.11.1"
   },
   "packageManager": "yarn@4.2.2",
-  "resolutions": {
-    "@react-native-community/cli": "^14.0.0",
-    "@react-native-community/cli-platform-android": "^14.0.0",
-    "@react-native-community/cli-platform-ios": "^14.0.0",
-    "@react-native/assets-registry": "^0.75.0",
-    "@react-native/babel-plugin-codegen": "^0.75.0",
-    "@react-native/babel-preset": "^0.75.0",
-    "@react-native/codegen": "^0.75.0",
-    "@react-native/community-cli-plugin": "^0.75.0",
-    "@react-native/community-cli-plugin/@react-native-community/cli-server-api": "^14.0.0",
-    "@react-native/community-cli-plugin/@react-native-community/cli-tools": "^14.0.0",
-    "@react-native/gradle-plugin": "^0.75.0",
-    "@react-native/js-polyfills": "^0.75.0",
-    "@react-native/normalize-colors": "^0.75.0",
-    "@react-native/virtualized-lists": "^0.75.0",
-    "find-babel-config/json5": "^2.1.1"
-  },
   "workspaces": [
     "packages/api",
     "packages/default-storage",
+    "packages/default-storage/example",
     "packages/eslint-config",
     "packages/sqlite-storage",
     "packages/website"
diff --git a/packages/default-storage/example/app.json b/packages/default-storage/example/app.json
@@ -3,12 +3,22 @@
   "displayName": "AsyncStorageExample",
   "components": [
     {
-      "appKey": "AsyncStorageExample"
+      "appKey": "AsyncStorageExample",
+      "displayName": "AsyncStorageExample"
     }
   ],
   "resources": {
-    "android": ["index.android.jsbundle"],
-    "ios": ["index.ios.jsbundle"],
-    "macos": ["index.macos.jsbundle"]
+    "android": [
+      "index.android.jsbundle"
+    ],
+    "ios": [
+      "index.ios.jsbundle"
+    ],
+    "macos": [
+      "index.macos.jsbundle"
+    ],
+    "windows": [
+      "main.windows.bundle"
+    ]
   }
 }
diff --git a/packages/default-storage/example/babel.config.js b/packages/default-storage/example/babel.config.js
@@ -1,3 +1,12 @@
-module.exports = {
-  presets: ["module:@react-native/babel-preset"],
-};
+const path = require('path');
+const { getConfig } = require('react-native-builder-bob/babel-config');
+const pkg = require('../package.json');
+
+const root = path.resolve(__dirname, '..');
+
+module.exports = getConfig(
+  {
+    presets: ['module:@react-native/babel-preset'],
+  },
+  { root, pkg }
+);
diff --git a/packages/default-storage/example/index.js b/packages/default-storage/example/index.js
diff --git a/packages/default-storage/example/ios/AsyncStorageExample.xcworkspace/contents.xcworkspacedata b/packages/default-storage/example/ios/AsyncStorageExample.xcworkspace/contents.xcworkspacedata
diff --git a/packages/default-storage/example/macos/AsyncStorageExample.xcworkspace/contents.xcworkspacedata b/packages/default-storage/example/macos/AsyncStorageExample.xcworkspace/contents.xcworkspacedata
diff --git a/packages/default-storage/example/metro.config.js b/packages/default-storage/example/metro.config.js
@@ -0,0 +1,18 @@
+const path = require('path');
+const { getDefaultConfig } = require('@react-native/metro-config');
+const { getConfig } = require('react-native-builder-bob/metro-config');
+const pkg = require('../package.json');
+
+const root = path.resolve(__dirname, '..');
+
+/**
+ * Metro configuration
+ * https://facebook.github.io/metro/docs/configuration
+ *
+ * @type {import('metro-config').MetroConfig}
+ */
+module.exports = getConfig(getDefaultConfig(__dirname), {
+  root,
+  pkg,
+  project: __dirname,
+});
diff --git a/packages/default-storage/example/package.json b/packages/default-storage/example/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "example-defaultstorage",
+  "version": "0.0.1",
+  "private": true,
+  "scripts": {
+    "start": "react-native start",
+    "start:android": "react-native run-android",
+    "start:ios": "react-native run-ios",
+    "start:macos": "react-native run-macos --project-path macos --scheme AsyncStorageExample",
+    "start:web": "expo start --web",
+    "start:windows": "install-windows-test-app -p windows && react-native run-windows --logging --no-packager --no-telemetry",
+    "start:windows:fabric": "install-windows-test-app -p windows --use-fabric && react-native run-windows --logging --no-packager --no-telemetry",
+    "build:e2e:android": "scripts/android_e2e.sh 'build'",
+    "build:e2e:ios": "scripts/ios_e2e.sh 'build'",
+    "build:e2e:macos": "scripts/macos_e2e.sh 'build'",
+    "bundle:android": "scripts/android_e2e.sh 'bundle'",
+    "bundle:ios": "scripts/ios_e2e.sh 'bundle'",
+    "bundle:macos": "react-native bundle --entry-file index.js --platform macos --dev false --bundle-output index.macos.jsbundle",
+    "test:e2e:android": "scripts/android_e2e.sh 'test'",
+    "test:e2e:ios": "scripts/ios_e2e.sh 'test'",
+    "test:e2e:macos": "scripts/macos_e2e.sh 'test'"
+  },
+  "installConfig": {
+    "hoistingLimits": "workspaces"
+  },
+  "dependencies": {
+    "react": "18.3.1",
+    "react-native": "0.76.1"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/runtime": "^7.25.0",
+    "@react-native-community/cli": "15.0.0",
+    "@react-native-community/cli-platform-android": "15.0.0",
+    "@react-native-community/cli-platform-ios": "15.0.0",
+    "@react-native/babel-preset": "0.76.1",
+    "@react-native/metro-config": "0.76.1",
+    "@react-native/typescript-config": "0.76.1",
+    "@rnx-kit/metro-config": "^2.0.0",
+    "react-native-builder-bob": "^0.33.3",
+    "react-native-test-app": "^4.0.3"
+  }
+}
diff --git a/packages/default-storage/example/react-native.config.js b/packages/default-storage/example/react-native.config.js
@@ -0,0 +1,27 @@
+const path = require("path");
+const pkg = require("../package.json");
+const { configureProjects } = require("react-native-test-app");
+
+module.exports = {
+  project: configureProjects({
+    android: {
+      sourceDir: "android",
+    },
+    ios: {
+      sourceDir: "ios",
+      automaticPodsInstallation: true,
+    },
+    macos: {
+      sourceDir: "macos",
+    },
+    windows: {
+      sourceDir: "windows",
+      solutionFile: path.join("windows", "AsyncStorageExample.sln"),
+    },
+  }),
+  dependencies: {
+    [pkg.name]: {
+      root: path.join(__dirname, ".."),
+    },
+  },
+};
diff --git a/packages/default-storage/example/scripts/android_e2e.sh b/packages/default-storage/example/scripts/android_e2e.sh
@@ -3,20 +3,20 @@
 build_apk() {
   echo
   echo "[Android E2E] Building APK"
-  (cd example/android; ./gradlew assembleRelease -PAsyncStorage_useNextStorage=false --max-workers 2)
+  (cd android; ./gradlew assembleRelease -PAsyncStorage_useNextStorage=false --max-workers 2)
 }
 
 bundle_js() {
   extraArgs="$@"
   echo
   echo "[Android E2E] Bundling JS"
-  react-native bundle --entry-file index.ts --platform android --bundle-output example/index.android.jsbundle --dev false $extraArgs
+  react-native bundle --entry-file index.ts --platform android --bundle-output index.android.jsbundle --dev false $extraArgs
 }
 
 
 run_e2e_test() {
   echo "[Android E2E] Running tests"
-  wdio run example/__tests__/android.conf.ts
+  wdio run __tests__/android.conf.ts
 }
 
 case $1 in
diff --git a/packages/default-storage/example/scripts/ios_e2e.sh b/packages/default-storage/example/scripts/ios_e2e.sh
@@ -3,23 +3,23 @@
 build_project() {
   echo "[iOS E2E] Building iOS project"
   eval "xcodebuild \
-    -workspace example/ios/AsyncStorageExample.xcworkspace \
+    -workspace ios/AsyncStorageExample.xcworkspace \
     -scheme ReactTestApp \
     -configuration Release \
     -sdk iphonesimulator \
-    -derivedDataPath example/ios/build"
+    -derivedDataPath ios/build"
 }
 
 bundle_js() {
   extraArgs="$@"
   echo
   echo "[iOS E2E] Bundling JS"
-  react-native bundle --entry-file index.ts --platform ios --bundle-output example/index.ios.jsbundle --dev false $extraArgs
+  react-native bundle --entry-file index.ts --platform ios --bundle-output index.ios.jsbundle --dev false $extraArgs
 }
 
 run_e2e_test() {
   echo "[iOS E2E] Running tests"
-  wdio run example/__tests__/ios.conf.ts
+  wdio run __tests__/ios.conf.ts
 }
 
 
diff --git a/packages/default-storage/example/scripts/macos_e2e.sh b/packages/default-storage/example/scripts/macos_e2e.sh
@@ -26,11 +26,11 @@ fi
 defaults write com.microsoft.ReactTestApp "NSWindow Frame MainWindow" "0 0 800 500 0 0 2560 1417 "
 
 xcodebuild \
-  -workspace example/macos/AsyncStorageExample.xcworkspace \
+  -workspace macos/AsyncStorageExample.xcworkspace \
   -scheme ReactTestApp \
   -configuration Release \
   -sdk macosx \
-  -derivedDataPath example/macos/build \
+  -derivedDataPath macos/build \
   $BUILD_ACTIONS
 
 if [[ "$CCACHE_DISABLE" != "1" ]]; then
diff --git a/packages/default-storage/metro.config.js b/packages/default-storage/metro.config.js
diff --git a/packages/default-storage/package.json b/packages/default-storage/package.json
@@ -23,6 +23,7 @@
     "Evan Bacon <bacon@expo.io> (https://github.com/evanbacon)",
     "Tommy Nguyen <4123478+tido64@users.noreply.github.com> (https://github.com/tido64)"
   ],
+  "source": "src/index",
   "homepage": "https://github.com/react-native-async-storage/async-storage#readme",
   "license": "MIT",
   "keywords": [
@@ -40,25 +41,9 @@
   "scripts": {
     "prepack": "yarn build",
     "build": "bob build",
-    "start": "react-native start",
-    "start:android": "react-native run-android",
-    "start:ios": "react-native run-ios",
-    "start:macos": "react-native run-macos --project-path example/macos --scheme AsyncStorageExample",
-    "start:web": "expo start --web",
-    "start:windows": "install-windows-test-app -p example/windows && react-native run-windows --root example --logging --no-packager --no-telemetry",
-    "start:windows:fabric": "install-windows-test-app -p example/windows --use-fabric && react-native run-windows --root example --logging --no-packager --no-telemetry",
-    "build:e2e:android": "scripts/android_e2e.sh 'build'",
-    "build:e2e:ios": "scripts/ios_e2e.sh 'build'",
-    "build:e2e:macos": "scripts/macos_e2e.sh 'build'",
-    "bundle:android": "scripts/android_e2e.sh 'bundle'",
-    "bundle:ios": "scripts/ios_e2e.sh 'bundle'",
-    "bundle:macos": "react-native bundle --entry-file index.ts --platform macos --dev false --bundle-output example/index.macos.jsbundle",
-    "test": "concurrently -n lint,ts yarn:test:lint yarn:test:ts",
+    "start": "(cd example && react-native start)",
     "test:lint": "eslint $(git ls-files '*.js' '*.ts' '*.tsx')",
-    "test:ts": "tsc",
-    "test:e2e:android": "scripts/android_e2e.sh 'test'",
-    "test:e2e:ios": "scripts/ios_e2e.sh 'test'",
-    "test:e2e:macos": "scripts/macos_e2e.sh 'test'"
+    "test:ts": "tsc"
   },
   "installConfig": {
     "hoistingLimits": "workspaces"
@@ -92,14 +77,13 @@
     "expo": "^48.0.0",
     "lodash": "^4.17.21",
     "prettier": "2.8.8",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-native": "^0.75.0",
-    "react-native-builder-bob": "^0.18.0",
-    "react-native-macos": "^0.75.0",
-    "react-native-test-app": "^3.9.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-native": "^0.76.2",
+    "react-native-builder-bob": "^0.33.3",
+    "react-native-macos": "^0.76.2",
     "react-native-web": "~0.18.10",
-    "react-native-windows": "^0.75.0",
+    "react-native-windows": "^0.76.2",
     "react-test-renderer": "^18.2.0",
     "typescript": "^5.3.0",
     "webdriverio": "^8.24.0"
diff --git a/packages/default-storage/react-native.config.js b/packages/default-storage/react-native.config.js
@@ -1,59 +1,4 @@
-const project = (() => {
-  const path = require("path");
-  try {
-    const { configureProjects } = require("react-native-test-app");
-    return configureProjects({
-      android: {
-        sourceDir: path.join("example", "android"),
-      },
-      ios: {
-        sourceDir: path.join("example", "ios"),
-      },
-      macos: {
-        sourceDir: path.join("example", "macos"),
-      },
-      windows: {
-        sourceDir: path.join("example", "windows"),
-        solutionFile: path.join(
-          "example",
-          "windows",
-          "AsyncStorageExample.sln"
-        ),
-      },
-    });
-  } catch (_) {
-    return undefined;
-  }
-})();
-
-module.exports = {
-  dependencies: {
-    "@react-native-async-storage/async-storage": {
-      root: __dirname,
-      // rn-cli incorrectly resolves node_modules path for the following platforms
-      platforms: {
-        ios: null,
-        macos: null,
-      },
-    },
-    // We don't use Expo in our test apps
-    expo: {
-      platforms: {
-        android: null,
-        ios: null,
-        macos: null,
-        windows: null,
-      },
-    },
-    // Suppress warnings about bob not being a proper native module
-    "react-native-builder-bob": {
-      platforms: {
-        android: null,
-        ios: null,
-        macos: null,
-        windows: null,
-      },
-    },
-  },
-  ...(project ? { project } : undefined),
-};
+/**
+ * @type {import('@react-native-community/cli-types').UserDependencyConfig}
+ */
+module.exports = {};
diff --git a/yarn.lock b/yarn.lock
