Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/android-build-paper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

runs-on: ubuntu-latest
env:
WORKING_DIRECTORY: apps/ExpoExample
WORKING_DIRECTORY: apps/expo-example
concurrency:
group: android-paper-${{ github.ref }}
cancel-in-progress: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths:
- .github/workflows/android-build.yml
- packages/react-native-gesture-handler/android/**
- apps/BasicExample/android/**
- apps/basic-example/android/**
push:
branches:
- main
Expand All @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
working-directory: [apps/BasicExample, apps/ExpoExample]
working-directory: [apps/basic-example, apps/expo-example]
concurrency:
group: android-${{ matrix.working-directory }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-archs-consistency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- .github/workflows/check-archs-consistency.yml
- packages/react-native-gesture-handler/src/specs/**
- packages/react-native-gesture-handler/package.json
- apps/BasicExample/package.json
- apps/basic-example/package.json
push:
branches:
- main
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-build-paper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

runs-on: macos-14
env:
WORKING_DIRECTORY: apps/ExpoExample
WORKING_DIRECTORY: apps/expo-example
concurrency:
group: ios-paper-${{ matrix.working-directory }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/ios-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- .github/workflows/ios-build.yml
- packages/react-native-gesture-handler/RNGestureHandler.podspec
- packages/react-native-gesture-handler/apple/**
- apps/BasicExample/ios/**
- apps/basic-example/ios/**
push:
branches:
- main
Expand All @@ -17,11 +17,9 @@ jobs:
if: github.repository == 'software-mansion/react-native-gesture-handler'

runs-on: macos-14
env:
WORKING_DIRECTORY: apps/BasicExample
strategy:
matrix:
working-directory: [apps/BasicExample, apps/ExpoExample]
working-directory: [apps/basic-example, apps/expo-example]
concurrency:
group: ios-${{ matrix.working-directory }}-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -46,7 +44,7 @@ jobs:
run: yarn install --immutable

- name: Install pods
if: ${{ matrix.working-directory == 'apps/BasicExample' }}
if: ${{ matrix.working-directory == 'apps/basic-example' }}
working-directory: ${{ matrix.working-directory }}/ios
run: bundle install && NO_FLIPPER=1 bundle exec pod install

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- .github/workflows/macos-build.yml
- packages/react-native-gesture-handler/RNGestureHandler.podspec
- packages/react-native-gesture-handler/apple/**
- apps/MacOSExample/macos/**
- apps/macos-example/macos/**
push:
branches:
- main
Expand All @@ -18,7 +18,7 @@ jobs:

runs-on: macos-15
env:
WORKING_DIRECTORY: apps/MacOSExample
WORKING_DIRECTORY: apps/macos-example
concurrency:
group: macos-${{ github.ref }}
cancel-in-progress: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/static-example-apps-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Test TypeScript and Lint
on:
pull_request:
paths:
- apps/BasicExample/**'
- apps/CommonApp/**
- apps/basic-example/**'
- apps/common-app/**
push:
branches:
- main
Expand All @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
working-directory: [apps/BasicExample, apps/CommonApp]
working-directory: [apps/basic-example, apps/common-app]
concurrency:
group: typescript-${{ matrix.working-directory }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
2 changes: 1 addition & 1 deletion .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"{apps/BasicExample,packages/react-native-gesture-handler}/package.json": "node scripts/check-rn-versions.js",
"{apps/basic-example,packages/react-native-gesture-handler}/package.json": "node scripts/check-rn-versions.js",
"**/*.{ts,tsx}": ["prettier --write", "eslint"],
"packages/react-native-gesture-handler/android/**/*.kt": [
"node scripts/check-android-dirs.js",
Expand Down
3 changes: 0 additions & 3 deletions apps/ExpoExample/App.tsx

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "BasicExample",
"name": "basic-example",
"version": "0.0.1",
"private": true,
"scripts": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 5 additions & 2 deletions apps/CommonApp/App.tsx → apps/common-app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,13 @@ function navigate(

function MainScreen({ navigation }: StackScreenProps<ParamListBase>) {
useEffect(() => {
AsyncStorage.multiGet([OPEN_LAST_EXAMPLE_KEY, LAST_EXAMPLE_KEY]).then(
void AsyncStorage.multiGet([OPEN_LAST_EXAMPLE_KEY, LAST_EXAMPLE_KEY]).then(
([openLastExample, lastExample]) => {
if (openLastExample[1] === 'true' && lastExample[1]) {
navigate(navigation, lastExample[1]);
}

return;
Comment on lines +310 to +316
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are funny changes.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, this is because eslint for some reason started yelling at me and I wanted to avoid adding another ignores/warns 😅

}
);
// we only want to run this effect once
Expand Down Expand Up @@ -345,8 +347,9 @@ function OpenLastExampleSetting() {
const [openLastExample, setOpenLastExample] = React.useState(false);

useEffect(() => {
AsyncStorage.getItem(OPEN_LAST_EXAMPLE_KEY).then((value) => {
void AsyncStorage.getItem(OPEN_LAST_EXAMPLE_KEY).then((value) => {
setOpenLastExample(value === 'true');
return;
});
}, []);

Expand Down
File renamed without changes.
File renamed without changes.
5 changes: 1 addition & 4 deletions apps/CommonApp/package.json → apps/common-app/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "CommonApp",
"name": "common-app",
"version": "0.0.1",
"private": true,
"scripts": {
Expand Down Expand Up @@ -59,8 +59,5 @@
},
"engines": {
"node": ">=18"
},
"installConfig": {
"selfReferences": false
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions apps/expo-example/App.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import App from 'common-app';

export default App;
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "expoexample",
"name": "expo-example",
"version": "1.0.0",
"main": "index.ts",
"scripts": {
Expand All @@ -8,6 +8,7 @@
"android": "expo run:android",
"ios": "expo run:ios",
"web": "expo start --web",
"paper": "rm -rf android ios && PAPER_ENABLED=1 npx expo prebuild",
"clean": "rm -rf node_modules android ios"
},
"dependencies": {
Expand All @@ -19,6 +20,7 @@
"@react-navigation/native": "^7.1.6",
"@react-navigation/stack": "^7.2.10",
"@swmansion/icons": "^0.0.1",
"common-app": "workspace:*",
"expo": "~53.0.0-preview.7",
"expo-camera": "~16.1.1",
"expo-status-bar": "~2.2.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"noEmit": true,
"baseUrl": ".",
"paths": {
"CommonApp": ["../CommonApp/index.ts"],
"common-app": ["../common-app/index.ts"],
"react-native-gesture-handler": [
"../../packages/react-native-gesture-handler/index.ts"
],
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/MacOSExample/index.ts → apps/macos-example/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import { AppRegistry } from 'react-native';
import App from 'CommonApp';
import App from 'common-app';
import { name as appName } from './app.json';

AppRegistry.registerComponent(appName, () => App);
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"name": "MacOSExample",
"name": "macos-example",
"version": "0.0.1",
"private": true,
"scripts": {
"android": "react-native run-android",
"ios": "react-native run-ios",
"macos": "npx react-native-macos run-macos",
"lint": "eslint .",
"start": "react-native start",
"test": "jest",
Expand All @@ -19,6 +18,7 @@
"@react-navigation/native": "^7.1.6",
"@react-navigation/stack": "^7.2.10",
"@swmansion/icons": "^0.0.1",
"common-app": "workspace:*",
"react": "19.0.0",
"react-native": "0.78.0",
"react-native-gesture-handler": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"noEmit": true,
"baseUrl": ".",
"paths": {
"CommonApp": ["../CommonApp/index.ts"],
"common-app": ["../common-app/index.ts"],
"react-native-gesture-handler": [
"../../packages/react-native-gesture-handler/index.ts"
],
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"private": true,
"workspaces": [
"packages/react-native-gesture-handler",
"apps/BasicExample",
"apps/ExpoExample",
"apps/MacOSExample",
"apps/CommonApp"
"apps/basic-example",
"apps/expo-example",
"apps/macos-example",
"apps/common-app"
],
"scripts": {
"postinstall": "husky",
Expand Down
2 changes: 1 addition & 1 deletion scripts/check-rn-versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const path = require('path');

const basicExamplePackageJsonPath = path.join(
__dirname,
'../apps/BasicExample/package.json'
'../apps/basic-example/package.json'
);
const basicExamplePackageJson = require(basicExamplePackageJsonPath);

Expand Down
Loading
Loading