Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: expo app router fixes and restructing #27

Merged
merged 6 commits into from
Jan 6, 2025
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
7 changes: 5 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ module.exports = {
'plugin:react-native/all',
'plugin:react/all',
'plugin:@typescript-eslint/all',
'plugin:react-hooks/recommended'
'plugin:react-hooks/recommended',
'plugin:n/recommended'
],
overrides: [
{
Expand All @@ -36,8 +37,10 @@ module.exports = {
version: 'detect'
}
},
plugins: ['react', 'react-native', 'import', 'jest'],
plugins: ['react', 'react-native', 'import', 'jest', 'eslint-plugin-react-compiler'],
rules: {
'n/no-missing-import': 'off',
'react-compiler/react-compiler': 'error',
'jest/max-expects': 'off',
'@typescript-eslint/parameter-properties': 'off',
'@typescript-eslint/indent': 'off',
Expand Down
6 changes: 2 additions & 4 deletions .release-it.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ const version = '${version}';
module.exports = {
plugins: {
'@release-it/conventional-changelog': {
path: '.',
infile: 'CHANGELOG.md',
preset: 'conventionalcommits',
gitRawCommitsOpts: {
path: '.'
preset: {
name: 'conventionalcommits'
}
}
},
Expand Down
4 changes: 0 additions & 4 deletions .ts-prunerc.js

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added .yarn/cache/fsevents-patch-19706e7e35-10.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
81 changes: 39 additions & 42 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"expo": {
"name": "suuudokuuu",
"slug": "suuudokuuu",
"scheme": "suuudokuuu",
Expand All @@ -8,57 +7,55 @@
"icon": "./assets/icon.png",
"userInterfaceStyle": "automatic",
"splash": {
"image": "./assets/splash.png",
"resizeMode": "contain",
"backgroundColor": "#000"
"image": "./assets/splash.png",
"resizeMode": "contain",
"backgroundColor": "#000"
},
"assetBundlePatterns": [
"**/*"
],
"assetBundlePatterns": ["**/*"],
"ios": {
"supportsTablet": true,
"bundleIdentifier": "com.vitalyiegorov.suuudokuuu",
"config": {
"usesNonExemptEncryption": false
},
"buildNumber": "1"
"supportsTablet": true,
"bundleIdentifier": "com.vitalyiegorov.suuudokuuu",
"config": {
"usesNonExemptEncryption": false
},
"buildNumber": "1"
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#000"
},
"package": "com.vitaliiyehorov.suuudokuuu",
"versionCode": 1
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#000"
},
"package": "com.vitaliiyehorov.suuudokuuu",
"versionCode": 1
},
"web": {
"favicon": "./assets/favicon.png",
"bundler": "metro"
"favicon": "./assets/favicon.png",
"bundler": "metro"
},
"extra": {
"eas": {
"projectId": "4a70028a-5f9e-4ab6-9389-82d8b8b6c833"
}
"eas": {
"projectId": "4a70028a-5f9e-4ab6-9389-82d8b8b6c833"
}
},
"owner": "vitalyiegorov",
"updates": {
"url": "https://u.expo.dev/4a70028a-5f9e-4ab6-9389-82d8b8b6c833"
"url": "https://u.expo.dev/4a70028a-5f9e-4ab6-9389-82d8b8b6c833"
},
"plugins": [
[
"expo-router",
{
"origin": "https://www.suuudokuuu.com/"
}
],
[
"expo-font",
{
"fonts": [
"node_modules/@expo-google-fonts/inter/Inter_900Black.ttf"
]
}
]
]
}
}
[
"expo-router",
{
"origin": "https://www.suuudokuuu.com/"
}
],
[
"expo-font",
{
"fonts": ["node_modules/@expo-google-fonts/inter/Inter_900Black.ttf"]
}
]
],
"experiments": {
"reactCompiler": true
}
}
10 changes: 0 additions & 10 deletions app/loser/loser.styles.ts

This file was deleted.

15 changes: 0 additions & 15 deletions app/pause/pause-screen.styles.ts

This file was deleted.

16 changes: 0 additions & 16 deletions app/privacy-policy/privacy-policy.styles.ts

This file was deleted.

47 changes: 0 additions & 47 deletions app/start-screen.styles.ts

This file was deleted.

21 changes: 0 additions & 21 deletions app/winner/winner.styles.ts

This file was deleted.

21 changes: 21 additions & 0 deletions knip.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"entry": ["src/app/**/*.{ts,tsx}"],
"ignore": [
"babel.config.js",
"jest.config.js",
"metro.config.js",
"tsconfig.json",
"index.js",
"**/*.web.ts",
"**/*.web.tsx",
"**/selectors.ts",
"src/game/store/game.state.ts"
],
"ignoreDependencies": [
"react-compiler-runtime",
"react-native-gesture-handler",
"babel-jest",
"babel-plugin-macros",
"babel-plugin-react-compiler"
]
}
22 changes: 13 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"private": true,
"scripts": {
"android": "expo run:android",
"cpd": "run -T jscpd --pattern \"**/*.{ts,tsx}\"",
"deadcode": "run -T ts-prune .",
"format": "run -T prettier --write \"./src/**/*.{ts,tsx}\"",
"cpd": "jscpd --pattern \"**/*.{ts,tsx}\"",
"deadcode": "knip",
"format": "prettier --write \"./src/**/*.{ts,tsx}\"",
"ios": "expo run:ios",
"lint": "run -T eslint --quiet --fix ./",
"lint": "eslint --quiet --fix ./",
"prepare": "husky install",
"release": "release-it --ci",
"start": "expo start --dev-client",
"test": "run -T jest",
"test:coverage": "run -T jest --coverage",
"ts": "run -T tsc -p .",
"test": "jest",
"test:coverage": "jest --coverage",
"ts": "tsc -p .",
"web": "expo start --web"
},
"resolutions": {
Expand All @@ -23,10 +23,12 @@
"dependencies": {
"@expo-google-fonts/inter": "^0.2.3",
"@react-native-async-storage/async-storage": "1.23.1",
"@react-navigation/native": "^7.0.14",
"@reduxjs/toolkit": "^1.9.5",
"@rnw-community/shared": "^0.54.0",
"@rnw-community/wdio": "^0.54.0",
"date-fns": "^2.30.0",
"eslint-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
"expo": "~52.0.23",
"expo-constants": "~17.0.3",
"expo-dev-client": "~5.0.8",
Expand All @@ -39,6 +41,7 @@
"expo-system-ui": "~4.0.6",
"expo-updates": "~0.26.10",
"react": "18.3.1",
"react-compiler-runtime": "19.0.0-beta-63e3235-20250105",
"react-dom": "18.3.1",
"react-native": "0.76.5",
"react-native-gesture-handler": "~2.20.2",
Expand All @@ -54,13 +57,14 @@
"@commitlint/config-conventional": "^18.6.3",
"@jest/globals": "^29.5.0",
"@release-it/conventional-changelog": "^9.0.4",
"@types/node": "^22.10.5",
"@types/react": "~18.3.18",
"@typescript-eslint/eslint-plugin": "^8.19.0",
"@typescript-eslint/parser": "^8.19.0",
"@wdio/globals": "^8.10.6",
"babel-jest": "^29.5.0",
"babel-plugin-macros": "^3.1.0",
"babel-plugin-react-compiler": "19.0.0-beta-0dec889-20241115",
"babel-plugin-react-compiler": "19.0.0-beta-63e3235-20250105",
"eslint": "^8.57.1",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jest": "^28.10.0",
Expand All @@ -72,12 +76,12 @@
"husky": "^9.1.7",
"jest": "~29.7.0",
"jscpd": "^4.0.5",
"knip": "^5.41.1",
"lint-staged": "^15.3.0",
"prettier": "^3.4.2",
"react-native-version": "^4.0.0",
"release-it": "^17.11.0",
"sort-package-json": "^2.12.0",
"ts-prune": "^0.10.3",
"turbo": "^2.3.3",
"typescript": "^5.7.2"
},
Expand Down
Loading
Loading