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
8 changes: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
20 changes: 20 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": true,
"fixed": [
[
"react-native-bottom-tabs",
"@bottom-tabs/react-navigation"
]
],
"linked": [],
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": [
"react-native-bottom-tabs-docs",
"react-native-bottom-tabs-example",
"example-expo"
]
}
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: ./.github/actions/setup

- name: Build package
run: yarn prepare
run: yarn build

build-android:
runs-on: ubuntu-latest
Expand All @@ -51,7 +51,7 @@ jobs:
uses: ./.github/actions/setup

- name: Build package
run: yarn prepare
run: yarn build

- name: Cache turborepo for Android
uses: actions/cache@v3
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
uses: ./.github/actions/setup

- name: Build package
run: yarn prepare
run: yarn build

- name: Cache turborepo for Android new arch
uses: actions/cache@v3
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
uses: ./.github/actions/setup

- name: Build package
run: yarn prepare
run: yarn build

- name: Cache turborepo for iOS
uses: actions/cache@v3
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
uses: ./.github/actions/setup

- name: Build package
run: yarn prepare
run: yarn build

- name: Cache turborepo for iOS
uses: actions/cache@v3
Expand Down
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"lint": "turbo run lint",
"test": "turbo run test",
"typecheck": "turbo run typecheck",
"prepare": "turbo run prepare",
"release": "turbo run release",
"build": "turbo run build",
"build:android": "turbo run build:android",
"build:android:fabric": "turbo run build:android:fabric",
"build:ios": "turbo run build:ios",
"build:ios-expo": "turbo run build:ios-expo",
"build:android-expo": "turbo run build:android-expo"
"build:android-expo": "turbo run build:android-expo",
"publish-packages": "turbo run build lint && changeset version && changeset publish"
},
"resolutions": {
"@types/react": "^18.2.44"
Expand Down Expand Up @@ -54,5 +54,8 @@
"tabWidth": 2,
"trailingComma": "es5",
"useTabs": false
},
"dependencies": {
"@changesets/cli": "^2.27.10"
}
}
18 changes: 2 additions & 16 deletions packages/react-native-bottom-tabs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@
],
"scripts": {
"test": "jest",
"typecheck": "tsc",
"typecheck": "tsc -b",
"lint": "eslint \"**/*.{js,ts,tsx}\"",
"prepare": "bob build",
"release": "release-it"
"build": "bob build"
},
"keywords": [
"react-native",
Expand Down Expand Up @@ -78,25 +77,12 @@
"react": "18.3.1",
"react-native": "0.75.4",
"react-native-builder-bob": "^0.32.1",
"release-it": "^15.0.0",
"typescript": "^5.2.2"
},
"peerDependencies": {
"react": "*",
"react-native": "*"
},
"release-it": {
"git": {
"commitMessage": "chore: release ${version}",
"tagName": "v${version}"
},
"npm": {
"publish": true
},
"github": {
"release": true
}
},
"react-native-builder-bob": {
"source": "src",
"output": "lib",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-bottom-tabs/src/TabView.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import type { TabViewItems } from './TabViewNativeComponent';
import {
ColorValue,
type ColorValue,
Image,
Platform,
StyleSheet,
Expand Down Expand Up @@ -190,7 +190,7 @@

if (!loaded.includes(focusedKey)) {
// Set the current tab to be loaded if it was not loaded before
setLoaded((loaded) => [...loaded, focusedKey]);

Check warning on line 193 in packages/react-native-bottom-tabs/src/TabView.tsx

View workflow job for this annotation

GitHub Actions / lint

'loaded' is already declared in the upper scope on line 189 column 10
}

const icons = React.useMemo(
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-bottom-tabs/src/TabViewAdapter.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NativeTabView, { TabViewProps } from './TabViewNativeComponent';
import NativeTabView, { type TabViewProps } from './TabViewNativeComponent';

const TabViewAdapter = (props: TabViewProps) => {
return <NativeTabView {...props} />;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-bottom-tabs/src/expo.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {
ConfigPlugin,
type ConfigPlugin,
createRunOncePlugin,
withAndroidStyles,
} from '@expo/config-plugins';
Expand Down
3 changes: 1 addition & 2 deletions packages/react-native-bottom-tabs/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"extends": "./tsconfig",
"compilerOptions": {
"paths": {}
},
"exclude": ["lib"]
}
}
19 changes: 2 additions & 17 deletions packages/react-navigation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@
],
"scripts": {
"test": "jest",
"typecheck": "tsc",
"typecheck": "tsc -b",
"lint": "eslint \"**/*.{js,ts,tsx}\"",
"prepare": "bob build",
"release": "release-it"
"build": "bob build"
},
"keywords": [
"react-native",
Expand Down Expand Up @@ -64,7 +63,6 @@
"react-native": "0.75.4",
"react-native-bottom-tabs": "*",
"react-native-builder-bob": "^0.32.1",
"release-it": "^15.0.0",
"typescript": "^5.2.2"
},
"dependencies": {
Expand All @@ -76,26 +74,13 @@
"react-native": "*",
"react-native-bottom-tabs": "*"
},
"packageManager": "[email protected]",
"jest": {
"preset": "react-native",
"modulePathIgnorePatterns": [
"<rootDir>/example/node_modules",
"<rootDir>/lib/"
]
},
"release-it": {
"git": {
"commitMessage": "chore: release ${version}",
"tagName": "v${version}"
},
"npm": {
"publish": true
},
"github": {
"release": true
}
},
"react-native-builder-bob": {
"source": "src",
"output": "lib",
Expand Down
3 changes: 1 addition & 2 deletions packages/react-navigation/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"extends": "./tsconfig",
"compilerOptions": {
"paths": {}
},
"exclude": ["lib"]
}
}
4 changes: 3 additions & 1 deletion packages/react-navigation/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"extends": "../../tsconfig",
"references": [
{ "path": "../react-native-bottom-tabs" },
],
"compilerOptions": {
"rootDir": ".",
"outDir": "./lib/typescript",
"paths": {}
}
}
12 changes: 6 additions & 6 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@
"react-native-bottom-tabs": ["./packages/react-native-bottom-tabs/src/index"],
"@bottom-tabs/react-navigation": ["./packages/react-navigation/src/index"],
},
"composite": true,
"allowUnreachableCode": false,
"allowUnusedLabels": false,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"jsx": "react-jsx",
"lib": ["ESNext"],
"module": "ESNext",
"moduleResolution": "Bundler",
"noEmit": true,
"lib": ["esnext"],
"module": "esnext",
"moduleResolution": "node",
"noFallthroughCasesInSwitch": true,
"noImplicitReturns": true,
"noImplicitUseStrict": false,
"noStrictGenericChecks": false,
"noUncheckedIndexedAccess": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"strict": true,
"target": "ESNext"
"target": "esnext",
"verbatimModuleSyntax": true
},
"exclude": ["packages/*/lib"]
}
14 changes: 5 additions & 9 deletions turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
"$schema": "https://turbo.build/schema.json",
"tasks": {
"lint": {
"dependsOn": ["prepare"],
"dependsOn": ["build"],
"inputs": ["**/*.ts", "**/*.tsx", "**/*.js"]
},
"typecheck": {
"dependsOn": ["prepare"],
"dependsOn": ["build"],
"inputs": ["**/*.ts", "**/*.tsx"]
},
"test": {},
"release": {
"inputs": ["package.json", "lib/**"]
},
"prepare": {
"dependsOn": ["^prepare"],
"outputs": ["lib/**"],
"inputs": ["src/**/*.ts", "src/**/*.tsx"]
"build": {
"dependsOn": ["^build"],
"outputs": ["lib/**"]
},
"build:android": {
"env": ["JAVA_HOME", "ANDROID_NDK", "ANDROID_SDK", "ANDROID_HOME"],
Expand Down
Loading
Loading