From 2e518579b423834273149583886b7c2ebd3bc9a7 Mon Sep 17 00:00:00 2001 From: Marc Rousavy Date: Tue, 20 Feb 2024 19:16:14 +0100 Subject: [PATCH] Clean --- package/.editorconfig | 15 ------- package/.eslintrc.js | 19 +++++++++ package/.prettierrc.js | 10 +++++ package/.yarnrc.yml | 10 ----- package/package.json | 89 ++++++++++++++++-------------------------- package/tsconfig.json | 6 ++- package/turbo.json | 34 ---------------- tsconfig.build.json | 4 -- 8 files changed, 68 insertions(+), 119 deletions(-) delete mode 100644 package/.editorconfig create mode 100644 package/.eslintrc.js create mode 100644 package/.prettierrc.js delete mode 100644 package/.yarnrc.yml delete mode 100644 package/turbo.json delete mode 100644 tsconfig.build.json diff --git a/package/.editorconfig b/package/.editorconfig deleted file mode 100644 index 65365be6..00000000 --- a/package/.editorconfig +++ /dev/null @@ -1,15 +0,0 @@ -# EditorConfig helps developers define and maintain consistent -# coding styles between different editors and IDEs -# editorconfig.org - -root = true - -[*] - -indent_style = space -indent_size = 2 - -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true diff --git a/package/.eslintrc.js b/package/.eslintrc.js new file mode 100644 index 00000000..d30844fe --- /dev/null +++ b/package/.eslintrc.js @@ -0,0 +1,19 @@ +module.exports = { + root: true, + extends: [ + "@react-native", + "prettier" + ], + rules: { + "prettier/prettier": [ + "error", + { + quoteProps: "consistent", + singleQuote: true, + tabWidth: 2, + trailingComma: "es5", + useTabs: false + } + ] + } +} diff --git a/package/.prettierrc.js b/package/.prettierrc.js new file mode 100644 index 00000000..4721542b --- /dev/null +++ b/package/.prettierrc.js @@ -0,0 +1,10 @@ +module.exports = { + bracketSpacing: true, + bracketSameLine: true, + singleQuote: true, + trailingComma: 'all', + semi: false, + tabWidth: 2, + useTabs: false, + printWidth: 140 +} diff --git a/package/.yarnrc.yml b/package/.yarnrc.yml deleted file mode 100644 index 13215d63..00000000 --- a/package/.yarnrc.yml +++ /dev/null @@ -1,10 +0,0 @@ -nodeLinker: node-modules -nmHoistingLimits: workspaces - -plugins: - - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs - spec: "@yarnpkg/plugin-interactive-tools" - - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs - spec: "@yarnpkg/plugin-workspace-tools" - -yarnPath: .yarn/releases/yarn-3.6.1.cjs diff --git a/package/package.json b/package/package.json index a6e4f85f..42d52eed 100644 --- a/package/package.json +++ b/package/package.json @@ -26,15 +26,21 @@ "!**/.*" ], "scripts": { - "test": "jest", "typecheck": "tsc --noEmit", "lint": "eslint \"**/*.{js,ts,tsx}\"", - "clean": "del-cli android/build example/android/build example/android/app/build example/ios/build lib", + "clean": "rm -rf android/build example/android/build example/android/app/build example/ios/build lib", "prepare": "bob build", "release": "release-it" }, "keywords": [ "react-native", + "filament", + "3d", + "rendering", + "engine", + "gltf", + "model", + "threejs", "ios", "android" ], @@ -59,22 +65,17 @@ "registry": "https://registry.npmjs.org/" }, "devDependencies": { - "@evilmartians/lefthook": "^1.5.0", "@react-native/eslint-config": "^0.73.1", "@release-it/conventional-changelog": "^5.0.0", - "@types/jest": "^29.5.5", "@types/react": "^18.2.44", - "del-cli": "^5.1.0", "eslint": "^8.51.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-prettier": "^5.0.1", - "jest": "^29.7.0", "prettier": "^3.0.3", "react": "18.2.0", "react-native": "0.73.4", "react-native-builder-bob": "^0.20.0", "release-it": "^15.0.0", - "turbo": "^1.10.7", "typescript": "^5.2.2" }, "resolutions": { @@ -84,22 +85,6 @@ "react": "*", "react-native": "*" }, - "workspaces": [ - "example" - ], - "packageManager": "yarn@3.6.1", - "jest": { - "preset": "react-native", - "modulePathIgnorePatterns": [ - "/example/node_modules", - "/lib/" - ] - }, - "commitlint": { - "extends": [ - "@commitlint/config-conventional" - ] - }, "release-it": { "git": { "commitMessage": "chore: release ${version}", @@ -113,40 +98,34 @@ }, "plugins": { "@release-it/conventional-changelog": { - "preset": "angular" - } - } - }, - "eslintConfig": { - "root": true, - "extends": [ - "@react-native", - "prettier" - ], - "rules": { - "prettier/prettier": [ - "error", - { - "quoteProps": "consistent", - "singleQuote": true, - "tabWidth": 2, - "trailingComma": "es5", - "useTabs": false + "preset": { + "name": "conventionalcommits", + "types": [ + { + "type": "feat", + "section": "✨ Features" + }, + { + "type": "perf", + "section": "💨 Performance Improvements" + }, + { + "type": "fix", + "section": "🐛 Bug Fixes" + }, + { + "type": "chore(deps)", + "section": "🛠️ Dependency Upgrades" + }, + { + "type": "docs", + "section": "📚 Documentation" + } + ] } - ] + } } }, - "eslintIgnore": [ - "node_modules/", - "lib/" - ], - "prettier": { - "quoteProps": "consistent", - "singleQuote": true, - "tabWidth": 2, - "trailingComma": "es5", - "useTabs": false - }, "react-native-builder-bob": { "source": "src", "output": "lib", @@ -156,7 +135,7 @@ [ "typescript", { - "project": "tsconfig.build.json" + "project": "tsconfig.json" } ] ] diff --git a/package/tsconfig.json b/package/tsconfig.json index 72fd0a2d..6fd55707 100644 --- a/package/tsconfig.json +++ b/package/tsconfig.json @@ -24,5 +24,9 @@ "strict": true, "target": "esnext", "verbatimModuleSyntax": true - } + }, + "exclude": [ + "example", + "node_modules" + ] } diff --git a/package/turbo.json b/package/turbo.json deleted file mode 100644 index 331e2890..00000000 --- a/package/turbo.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "$schema": "https://turbo.build/schema.json", - "pipeline": { - "build:android": { - "inputs": [ - "package.json", - "android", - "!android/build", - "src/*.ts", - "src/*.tsx", - "example/package.json", - "example/android", - "!example/android/.gradle", - "!example/android/build", - "!example/android/app/build" - ], - "outputs": [] - }, - "build:ios": { - "inputs": [ - "package.json", - "*.podspec", - "ios", - "src/*.ts", - "src/*.tsx", - "example/package.json", - "example/ios", - "!example/ios/build", - "!example/ios/Pods" - ], - "outputs": [] - } - } -} diff --git a/tsconfig.build.json b/tsconfig.build.json deleted file mode 100644 index 2a21c289..00000000 --- a/tsconfig.build.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "./tsconfig", - "exclude": ["example"] -}