diff --git a/.clang-format-ignore b/.clang-format-ignore index ff3c0dbe..c1749097 100644 --- a/.clang-format-ignore +++ b/.clang-format-ignore @@ -1 +1 @@ -package/cpp/sqlite/* +packages/react-native-nitro-sqlite/cpp/sqlite/* diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 10243bcf..bc9088a6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,7 +10,7 @@ updates: - package-ecosystem: 'gradle' directories: - - '/package/android/' + - '/packages/react-native-nitro-sqlite/android/' - '/example/android/' schedule: interval: 'daily' @@ -20,7 +20,7 @@ updates: - package-ecosystem: 'npm' directories: - - '/package/' + - '/packages/react-native-nitro-sqlite/' - '/example/' schedule: interval: 'daily' diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 250ef4fa..5fbceb46 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -9,8 +9,8 @@ on: - "example/android/**" - "**/nitrogen/generated/shared/**" - "**/nitrogen/generated/android/**" - - "package/cpp/**" - - "package/android/**" + - "packages/react-native-nitro-sqlite/cpp/**" + - "packages/react-native-nitro-sqlite/android/**" - "**/bun.lock" - "**/react-native.config.js" - "**/nitro.json" @@ -20,8 +20,8 @@ on: - "example/android/**" - "**/nitrogen/generated/shared/**" - "**/nitrogen/generated/android/**" - - "package/cpp/**" - - "package/android/**" + - "packages/react-native-nitro-sqlite/cpp/**" + - "packages/react-native-nitro-sqlite/android/**" - "**/bun.lock" - "**/react-native.config.js" - "**/nitro.json" diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 51a8aa0d..2ede600b 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -9,8 +9,8 @@ on: - "example/ios/**" - "**/nitrogen/generated/shared/**" - "**/nitrogen/generated/ios/**" - - "package/cpp/**" - - "package/ios/**" + - "packages/react-native-nitro-sqlite/cpp/**" + - "packages/react-native-nitro-sqlite/ios/**" - "**/Podfile.lock" - "**/*.podspec" - "**/react-native.config.js" @@ -21,8 +21,8 @@ on: - "example/ios/**" - "**/nitrogen/generated/shared/**" - "**/nitrogen/generated/ios/**" - - "package/cpp/**" - - "package/ios/**" + - "packages/react-native-nitro-sqlite/cpp/**" + - "packages/react-native-nitro-sqlite/ios/**" - "**/Podfile.lock" - "**/*.podspec" - "**/react-native.config.js" diff --git a/.github/workflows/lint-typescript.yml b/.github/workflows/lint-typescript.yml index 2b452c74..93ae5149 100644 --- a/.github/workflows/lint-typescript.yml +++ b/.github/workflows/lint-typescript.yml @@ -64,7 +64,7 @@ jobs: working-directory: example run: bun lint - name: Run ESLint with auto-fix in react-native-nitro-sqlite - working-directory: package + working-directory: packages/react-native-nitro-sqlite run: bun lint - name: Verify no files have changed after auto-fix diff --git a/.prettierignore b/.prettierignore index d784c54b..79e92d52 100644 --- a/.prettierignore +++ b/.prettierignore @@ -6,7 +6,7 @@ *.md *.markdown -package/lib +packages/react-native-nitro-sqlite/lib .well-known android diff --git a/bun.lock b/bun.lock index e8c6532b..c1e0b4fe 100644 --- a/bun.lock +++ b/bun.lock @@ -89,7 +89,7 @@ "react-test-renderer": "19.1.1", }, }, - "package": { + "packages/react-native-nitro-sqlite": { "name": "react-native-nitro-sqlite", "version": "9.6.0", "dependencies": { @@ -1895,7 +1895,7 @@ "react-native-nitro-modules": ["react-native-nitro-modules@0.36.1", "", { "peerDependencies": { "react": "*", "react-native": "*" } }, "sha512-kBv/VvKqAmkXAvP1DxJMC9b/fRhh7JdSO4EUnPP46hJjrIFeFR8AwKm8mYaKZEuF014M/TVdv2vomVUW0umsQQ=="], - "react-native-nitro-sqlite": ["react-native-nitro-sqlite@workspace:package"], + "react-native-nitro-sqlite": ["react-native-nitro-sqlite@workspace:packages/react-native-nitro-sqlite"], "react-native-nitro-sqlite-example": ["react-native-nitro-sqlite-example@workspace:example"], diff --git a/example/babel.config.js b/example/babel.config.js index 3e72a2e8..4bec5711 100644 --- a/example/babel.config.js +++ b/example/babel.config.js @@ -1,5 +1,5 @@ const path = require('path') -const pak = require('../package/package.json') +const pak = require('../packages/react-native-nitro-sqlite/package.json') module.exports = { presets: ['module:@react-native/babel-preset'], @@ -9,7 +9,11 @@ module.exports = { { extensions: ['.tsx', '.ts', '.js', '.json'], alias: { - [pak.name]: path.join(__dirname, '../package', pak.source), + [pak.name]: path.join( + __dirname, + '../packages/react-native-nitro-sqlite', + pak.source, + ), 'stream': 'stream-browserify', 'react-native-sqlite-storage': 'react-native-nitro-sqlite', }, diff --git a/example/react-native.config.js b/example/react-native.config.js index de42b61e..d8e3ac3e 100644 --- a/example/react-native.config.js +++ b/example/react-native.config.js @@ -1,10 +1,10 @@ const path = require('path') -const pak = require('../package/package.json') +const pak = require('../packages/react-native-nitro-sqlite/package.json') module.exports = { dependencies: { [pak.name]: { - root: path.join(__dirname, '../package'), + root: path.join(__dirname, '../packages/react-native-nitro-sqlite'), }, }, } diff --git a/example/src/tests/db.ts b/example/src/tests/db.ts index 1c342268..4aca5b2d 100644 --- a/example/src/tests/db.ts +++ b/example/src/tests/db.ts @@ -7,7 +7,7 @@ import { open } from 'react-native-nitro-sqlite' import { getDatabaseQueue, type DatabaseQueue, -} from '../../../package/src/DatabaseQueue' +} from '../../../packages/react-native-nitro-sqlite/src/DatabaseQueue' const chance = new Chance() diff --git a/example/tsconfig.json b/example/tsconfig.json index 6dabcad8..8a9ff65c 100644 --- a/example/tsconfig.json +++ b/example/tsconfig.json @@ -1,10 +1,10 @@ { "extends": "../config/tsconfig.json", - "include": ["src", "index.js", "../package"], + "include": ["src", "index.js", "../packages/react-native-nitro-sqlite"], "compilerOptions": { "baseUrl": ".", "paths": { - "react-native-nitro-sqlite": ["../package/src"] + "react-native-nitro-sqlite": ["../packages/react-native-nitro-sqlite/src"] } } } diff --git a/package.json b/package.json index 66f15cb6..adc1560c 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "packageManager": "bun@1.3.1", "private": "true", "workspaces": [ - "package", + "packages/*", "example" ], "repository": { @@ -23,9 +23,9 @@ "lint": "bun package lint && bun example lint", "lint-cpp": "./scripts/clang-format.sh", "prettier": "prettier --write .", - "clean": "rm -rf **/tsconfig.tsbuildinfo node_modules package/node_module package/lib", + "clean": "rm -rf **/tsconfig.tsbuildinfo node_modules packages/react-native-nitro-sqlite/node_module packages/react-native-nitro-sqlite/lib", "release": "./scripts/release.sh", - "package": "bun --cwd package", + "package": "bun --cwd packages/react-native-nitro-sqlite", "example": "bun --cwd example" }, "engines": { @@ -90,7 +90,7 @@ "plugins": { "@release-it/bumper": { "in": { - "file": "package/package.json", + "file": "packages/react-native-nitro-sqlite/package.json", "path": "version" }, "out": [ diff --git a/package/.eslintrc.js b/packages/react-native-nitro-sqlite/.eslintrc.js similarity index 73% rename from package/.eslintrc.js rename to packages/react-native-nitro-sqlite/.eslintrc.js index 9cf69884..0d3e3482 100644 --- a/package/.eslintrc.js +++ b/packages/react-native-nitro-sqlite/.eslintrc.js @@ -1,6 +1,6 @@ module.exports = { root: true, - extends: '../config/.eslintrc.js', + extends: '../../config/.eslintrc.js', parserOptions: { project: true, tsconfigRootDir: __dirname, diff --git a/package/.gitignore b/packages/react-native-nitro-sqlite/.gitignore similarity index 100% rename from package/.gitignore rename to packages/react-native-nitro-sqlite/.gitignore diff --git a/package/.watchmanconfig b/packages/react-native-nitro-sqlite/.watchmanconfig similarity index 100% rename from package/.watchmanconfig rename to packages/react-native-nitro-sqlite/.watchmanconfig diff --git a/package/RNNitroSQLite.podspec b/packages/react-native-nitro-sqlite/RNNitroSQLite.podspec similarity index 100% rename from package/RNNitroSQLite.podspec rename to packages/react-native-nitro-sqlite/RNNitroSQLite.podspec diff --git a/package/android/CMakeLists.txt b/packages/react-native-nitro-sqlite/android/CMakeLists.txt similarity index 100% rename from package/android/CMakeLists.txt rename to packages/react-native-nitro-sqlite/android/CMakeLists.txt diff --git a/package/android/build.gradle b/packages/react-native-nitro-sqlite/android/build.gradle similarity index 100% rename from package/android/build.gradle rename to packages/react-native-nitro-sqlite/android/build.gradle diff --git a/package/android/cpp-adapter.cpp b/packages/react-native-nitro-sqlite/android/cpp-adapter.cpp similarity index 100% rename from package/android/cpp-adapter.cpp rename to packages/react-native-nitro-sqlite/android/cpp-adapter.cpp diff --git a/package/android/gradle.properties b/packages/react-native-nitro-sqlite/android/gradle.properties similarity index 100% rename from package/android/gradle.properties rename to packages/react-native-nitro-sqlite/android/gradle.properties diff --git a/package/android/src/main/AndroidManifest.xml b/packages/react-native-nitro-sqlite/android/src/main/AndroidManifest.xml similarity index 100% rename from package/android/src/main/AndroidManifest.xml rename to packages/react-native-nitro-sqlite/android/src/main/AndroidManifest.xml diff --git a/package/android/src/main/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoad.kt b/packages/react-native-nitro-sqlite/android/src/main/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoad.kt similarity index 100% rename from package/android/src/main/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoad.kt rename to packages/react-native-nitro-sqlite/android/src/main/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoad.kt diff --git a/package/android/src/main/kotlin/com/margelo/rnnitrosqlite/DocPathSetter.kt b/packages/react-native-nitro-sqlite/android/src/main/kotlin/com/margelo/rnnitrosqlite/DocPathSetter.kt similarity index 100% rename from package/android/src/main/kotlin/com/margelo/rnnitrosqlite/DocPathSetter.kt rename to packages/react-native-nitro-sqlite/android/src/main/kotlin/com/margelo/rnnitrosqlite/DocPathSetter.kt diff --git a/package/android/src/main/kotlin/com/margelo/rnnitrosqlite/RNNitroSQLitePackage.kt b/packages/react-native-nitro-sqlite/android/src/main/kotlin/com/margelo/rnnitrosqlite/RNNitroSQLitePackage.kt similarity index 100% rename from package/android/src/main/kotlin/com/margelo/rnnitrosqlite/RNNitroSQLitePackage.kt rename to packages/react-native-nitro-sqlite/android/src/main/kotlin/com/margelo/rnnitrosqlite/RNNitroSQLitePackage.kt diff --git a/package/babel.config.js b/packages/react-native-nitro-sqlite/babel.config.js similarity index 100% rename from package/babel.config.js rename to packages/react-native-nitro-sqlite/babel.config.js diff --git a/package/cpp/NitroSQLiteException.hpp b/packages/react-native-nitro-sqlite/cpp/NitroSQLiteException.hpp similarity index 100% rename from package/cpp/NitroSQLiteException.hpp rename to packages/react-native-nitro-sqlite/cpp/NitroSQLiteException.hpp diff --git a/package/cpp/hybridObjects/HybridNitroSQLite.cpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.cpp similarity index 100% rename from package/cpp/hybridObjects/HybridNitroSQLite.cpp rename to packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.cpp diff --git a/package/cpp/hybridObjects/HybridNitroSQLite.hpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp similarity index 100% rename from package/cpp/hybridObjects/HybridNitroSQLite.hpp rename to packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLite.hpp diff --git a/package/cpp/hybridObjects/HybridNitroSQLiteQueryResult.cpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLiteQueryResult.cpp similarity index 100% rename from package/cpp/hybridObjects/HybridNitroSQLiteQueryResult.cpp rename to packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLiteQueryResult.cpp diff --git a/package/cpp/hybridObjects/HybridNitroSQLiteQueryResult.hpp b/packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLiteQueryResult.hpp similarity index 100% rename from package/cpp/hybridObjects/HybridNitroSQLiteQueryResult.hpp rename to packages/react-native-nitro-sqlite/cpp/hybridObjects/HybridNitroSQLiteQueryResult.hpp diff --git a/package/cpp/importSqlFile.cpp b/packages/react-native-nitro-sqlite/cpp/importSqlFile.cpp similarity index 100% rename from package/cpp/importSqlFile.cpp rename to packages/react-native-nitro-sqlite/cpp/importSqlFile.cpp diff --git a/package/cpp/importSqlFile.hpp b/packages/react-native-nitro-sqlite/cpp/importSqlFile.hpp similarity index 100% rename from package/cpp/importSqlFile.hpp rename to packages/react-native-nitro-sqlite/cpp/importSqlFile.hpp diff --git a/package/cpp/logs.hpp b/packages/react-native-nitro-sqlite/cpp/logs.hpp similarity index 100% rename from package/cpp/logs.hpp rename to packages/react-native-nitro-sqlite/cpp/logs.hpp diff --git a/package/cpp/macros.hpp b/packages/react-native-nitro-sqlite/cpp/macros.hpp similarity index 100% rename from package/cpp/macros.hpp rename to packages/react-native-nitro-sqlite/cpp/macros.hpp diff --git a/package/cpp/operations.cpp b/packages/react-native-nitro-sqlite/cpp/operations.cpp similarity index 100% rename from package/cpp/operations.cpp rename to packages/react-native-nitro-sqlite/cpp/operations.cpp diff --git a/package/cpp/operations.hpp b/packages/react-native-nitro-sqlite/cpp/operations.hpp similarity index 100% rename from package/cpp/operations.hpp rename to packages/react-native-nitro-sqlite/cpp/operations.hpp diff --git a/package/cpp/sqlite/sqlite3.c b/packages/react-native-nitro-sqlite/cpp/sqlite/sqlite3.c similarity index 100% rename from package/cpp/sqlite/sqlite3.c rename to packages/react-native-nitro-sqlite/cpp/sqlite/sqlite3.c diff --git a/package/cpp/sqlite/sqlite3.h b/packages/react-native-nitro-sqlite/cpp/sqlite/sqlite3.h similarity index 100% rename from package/cpp/sqlite/sqlite3.h rename to packages/react-native-nitro-sqlite/cpp/sqlite/sqlite3.h diff --git a/package/cpp/sqliteExecuteBatch.cpp b/packages/react-native-nitro-sqlite/cpp/sqliteExecuteBatch.cpp similarity index 100% rename from package/cpp/sqliteExecuteBatch.cpp rename to packages/react-native-nitro-sqlite/cpp/sqliteExecuteBatch.cpp diff --git a/package/cpp/sqliteExecuteBatch.hpp b/packages/react-native-nitro-sqlite/cpp/sqliteExecuteBatch.hpp similarity index 100% rename from package/cpp/sqliteExecuteBatch.hpp rename to packages/react-native-nitro-sqlite/cpp/sqliteExecuteBatch.hpp diff --git a/package/cpp/types.hpp b/packages/react-native-nitro-sqlite/cpp/types.hpp similarity index 100% rename from package/cpp/types.hpp rename to packages/react-native-nitro-sqlite/cpp/types.hpp diff --git a/package/cpp/utils.hpp b/packages/react-native-nitro-sqlite/cpp/utils.hpp similarity index 100% rename from package/cpp/utils.hpp rename to packages/react-native-nitro-sqlite/cpp/utils.hpp diff --git a/package/ios/NitroSQLite.xcodeproj/project.pbxproj b/packages/react-native-nitro-sqlite/ios/NitroSQLite.xcodeproj/project.pbxproj similarity index 100% rename from package/ios/NitroSQLite.xcodeproj/project.pbxproj rename to packages/react-native-nitro-sqlite/ios/NitroSQLite.xcodeproj/project.pbxproj diff --git a/package/ios/OnLoad.mm b/packages/react-native-nitro-sqlite/ios/OnLoad.mm similarity index 100% rename from package/ios/OnLoad.mm rename to packages/react-native-nitro-sqlite/ios/OnLoad.mm diff --git a/package/ios/RNNitroSQLite-Swift.h b/packages/react-native-nitro-sqlite/ios/RNNitroSQLite-Swift.h similarity index 100% rename from package/ios/RNNitroSQLite-Swift.h rename to packages/react-native-nitro-sqlite/ios/RNNitroSQLite-Swift.h diff --git a/package/nitro.json b/packages/react-native-nitro-sqlite/nitro.json similarity index 100% rename from package/nitro.json rename to packages/react-native-nitro-sqlite/nitro.json diff --git a/package/nitrogen/generated/.gitattributes b/packages/react-native-nitro-sqlite/nitrogen/generated/.gitattributes similarity index 100% rename from package/nitrogen/generated/.gitattributes rename to packages/react-native-nitro-sqlite/nitrogen/generated/.gitattributes diff --git a/package/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake b/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake similarity index 100% rename from package/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake rename to packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLite+autolinking.cmake diff --git a/package/nitrogen/generated/android/RNNitroSQLite+autolinking.gradle b/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLite+autolinking.gradle similarity index 100% rename from package/nitrogen/generated/android/RNNitroSQLite+autolinking.gradle rename to packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLite+autolinking.gradle diff --git a/package/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp similarity index 100% rename from package/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLiteOnLoad.cpp diff --git a/package/nitrogen/generated/android/RNNitroSQLiteOnLoad.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLiteOnLoad.hpp similarity index 100% rename from package/nitrogen/generated/android/RNNitroSQLiteOnLoad.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/android/RNNitroSQLiteOnLoad.hpp diff --git a/package/nitrogen/generated/android/c++/JHybridNitroSQLiteOnLoadSpec.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/JHybridNitroSQLiteOnLoadSpec.cpp similarity index 100% rename from package/nitrogen/generated/android/c++/JHybridNitroSQLiteOnLoadSpec.cpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/JHybridNitroSQLiteOnLoadSpec.cpp diff --git a/package/nitrogen/generated/android/c++/JHybridNitroSQLiteOnLoadSpec.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/JHybridNitroSQLiteOnLoadSpec.hpp similarity index 100% rename from package/nitrogen/generated/android/c++/JHybridNitroSQLiteOnLoadSpec.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/android/c++/JHybridNitroSQLiteOnLoadSpec.hpp diff --git a/package/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoadSpec.kt b/packages/react-native-nitro-sqlite/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoadSpec.kt similarity index 100% rename from package/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoadSpec.kt rename to packages/react-native-nitro-sqlite/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/HybridNitroSQLiteOnLoadSpec.kt diff --git a/package/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/RNNitroSQLiteOnLoad.kt b/packages/react-native-nitro-sqlite/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/RNNitroSQLiteOnLoad.kt similarity index 100% rename from package/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/RNNitroSQLiteOnLoad.kt rename to packages/react-native-nitro-sqlite/nitrogen/generated/android/kotlin/com/margelo/nitro/rnnitrosqlite/RNNitroSQLiteOnLoad.kt diff --git a/package/nitrogen/generated/ios/RNNitroSQLite+autolinking.rb b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLite+autolinking.rb similarity index 100% rename from package/nitrogen/generated/ios/RNNitroSQLite+autolinking.rb rename to packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLite+autolinking.rb diff --git a/package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.cpp similarity index 100% rename from package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.cpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.cpp diff --git a/package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.hpp similarity index 100% rename from package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Bridge.hpp diff --git a/package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Umbrella.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Umbrella.hpp similarity index 100% rename from package/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Umbrella.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLite-Swift-Cxx-Umbrella.hpp diff --git a/package/nitrogen/generated/ios/RNNitroSQLiteAutolinking.mm b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLiteAutolinking.mm similarity index 100% rename from package/nitrogen/generated/ios/RNNitroSQLiteAutolinking.mm rename to packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLiteAutolinking.mm diff --git a/package/nitrogen/generated/ios/RNNitroSQLiteAutolinking.swift b/packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLiteAutolinking.swift similarity index 100% rename from package/nitrogen/generated/ios/RNNitroSQLiteAutolinking.swift rename to packages/react-native-nitro-sqlite/nitrogen/generated/ios/RNNitroSQLiteAutolinking.swift diff --git a/package/nitrogen/generated/shared/c++/BatchQueryCommand.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/BatchQueryCommand.hpp similarity index 100% rename from package/nitrogen/generated/shared/c++/BatchQueryCommand.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/BatchQueryCommand.hpp diff --git a/package/nitrogen/generated/shared/c++/BatchQueryResult.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/BatchQueryResult.hpp similarity index 100% rename from package/nitrogen/generated/shared/c++/BatchQueryResult.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/BatchQueryResult.hpp diff --git a/package/nitrogen/generated/shared/c++/ColumnType.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/ColumnType.hpp similarity index 100% rename from package/nitrogen/generated/shared/c++/ColumnType.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/ColumnType.hpp diff --git a/package/nitrogen/generated/shared/c++/FileLoadResult.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/FileLoadResult.hpp similarity index 100% rename from package/nitrogen/generated/shared/c++/FileLoadResult.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/FileLoadResult.hpp diff --git a/package/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.cpp similarity index 100% rename from package/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.cpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.cpp diff --git a/package/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.hpp similarity index 100% rename from package/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteOnLoadSpec.hpp diff --git a/package/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.cpp similarity index 100% rename from package/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.cpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.cpp diff --git a/package/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.hpp similarity index 100% rename from package/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteQueryResultSpec.hpp diff --git a/package/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.cpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.cpp similarity index 100% rename from package/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.cpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.cpp diff --git a/package/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.hpp similarity index 100% rename from package/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/HybridNitroSQLiteSpec.hpp diff --git a/package/nitrogen/generated/shared/c++/NitroSQLiteQueryColumnMetadata.hpp b/packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/NitroSQLiteQueryColumnMetadata.hpp similarity index 100% rename from package/nitrogen/generated/shared/c++/NitroSQLiteQueryColumnMetadata.hpp rename to packages/react-native-nitro-sqlite/nitrogen/generated/shared/c++/NitroSQLiteQueryColumnMetadata.hpp diff --git a/package/package.json b/packages/react-native-nitro-sqlite/package.json similarity index 98% rename from package/package.json rename to packages/react-native-nitro-sqlite/package.json index 156e9921..2992fb19 100644 --- a/package/package.json +++ b/packages/react-native-nitro-sqlite/package.json @@ -126,7 +126,7 @@ [ "typescript", { - "tsc": "../node_modules/.bin/tsc", + "tsc": "../../node_modules/.bin/tsc", "project": "tsconfig.build.json", "esm": true } diff --git a/package/react-native.config.js b/packages/react-native-nitro-sqlite/react-native.config.js similarity index 100% rename from package/react-native.config.js rename to packages/react-native-nitro-sqlite/react-native.config.js diff --git a/package/src/DatabaseQueue.ts b/packages/react-native-nitro-sqlite/src/DatabaseQueue.ts similarity index 100% rename from package/src/DatabaseQueue.ts rename to packages/react-native-nitro-sqlite/src/DatabaseQueue.ts diff --git a/package/src/NitroSQLiteError.ts b/packages/react-native-nitro-sqlite/src/NitroSQLiteError.ts similarity index 100% rename from package/src/NitroSQLiteError.ts rename to packages/react-native-nitro-sqlite/src/NitroSQLiteError.ts diff --git a/package/src/OnLoad.android.ts b/packages/react-native-nitro-sqlite/src/OnLoad.android.ts similarity index 100% rename from package/src/OnLoad.android.ts rename to packages/react-native-nitro-sqlite/src/OnLoad.android.ts diff --git a/package/src/OnLoad.ts b/packages/react-native-nitro-sqlite/src/OnLoad.ts similarity index 100% rename from package/src/OnLoad.ts rename to packages/react-native-nitro-sqlite/src/OnLoad.ts diff --git a/package/src/index.ts b/packages/react-native-nitro-sqlite/src/index.ts similarity index 100% rename from package/src/index.ts rename to packages/react-native-nitro-sqlite/src/index.ts diff --git a/package/src/nitro.ts b/packages/react-native-nitro-sqlite/src/nitro.ts similarity index 100% rename from package/src/nitro.ts rename to packages/react-native-nitro-sqlite/src/nitro.ts diff --git a/package/src/operations/execute.ts b/packages/react-native-nitro-sqlite/src/operations/execute.ts similarity index 100% rename from package/src/operations/execute.ts rename to packages/react-native-nitro-sqlite/src/operations/execute.ts diff --git a/package/src/operations/executeBatch.ts b/packages/react-native-nitro-sqlite/src/operations/executeBatch.ts similarity index 100% rename from package/src/operations/executeBatch.ts rename to packages/react-native-nitro-sqlite/src/operations/executeBatch.ts diff --git a/package/src/operations/session.ts b/packages/react-native-nitro-sqlite/src/operations/session.ts similarity index 100% rename from package/src/operations/session.ts rename to packages/react-native-nitro-sqlite/src/operations/session.ts diff --git a/package/src/operations/transaction.ts b/packages/react-native-nitro-sqlite/src/operations/transaction.ts similarity index 100% rename from package/src/operations/transaction.ts rename to packages/react-native-nitro-sqlite/src/operations/transaction.ts diff --git a/package/src/specs/NitroSQLite.nitro.ts b/packages/react-native-nitro-sqlite/src/specs/NitroSQLite.nitro.ts similarity index 100% rename from package/src/specs/NitroSQLite.nitro.ts rename to packages/react-native-nitro-sqlite/src/specs/NitroSQLite.nitro.ts diff --git a/package/src/specs/NitroSQLiteOnLoad.nitro.ts b/packages/react-native-nitro-sqlite/src/specs/NitroSQLiteOnLoad.nitro.ts similarity index 100% rename from package/src/specs/NitroSQLiteOnLoad.nitro.ts rename to packages/react-native-nitro-sqlite/src/specs/NitroSQLiteOnLoad.nitro.ts diff --git a/package/src/specs/NitroSQLiteQueryResult.nitro.ts b/packages/react-native-nitro-sqlite/src/specs/NitroSQLiteQueryResult.nitro.ts similarity index 100% rename from package/src/specs/NitroSQLiteQueryResult.nitro.ts rename to packages/react-native-nitro-sqlite/src/specs/NitroSQLiteQueryResult.nitro.ts diff --git a/package/src/typeORM.ts b/packages/react-native-nitro-sqlite/src/typeORM.ts similarity index 100% rename from package/src/typeORM.ts rename to packages/react-native-nitro-sqlite/src/typeORM.ts diff --git a/package/src/types.ts b/packages/react-native-nitro-sqlite/src/types.ts similarity index 100% rename from package/src/types.ts rename to packages/react-native-nitro-sqlite/src/types.ts diff --git a/package/tsconfig.build.json b/packages/react-native-nitro-sqlite/tsconfig.build.json similarity index 73% rename from package/tsconfig.build.json rename to packages/react-native-nitro-sqlite/tsconfig.build.json index 9a3228e0..01dff735 100644 --- a/package/tsconfig.build.json +++ b/packages/react-native-nitro-sqlite/tsconfig.build.json @@ -1,5 +1,5 @@ { - "extends": "../config/tsconfig.json", + "extends": "../../config/tsconfig.json", "include": ["src/**/*.ts", "src/**/*.tsx"], "compilerOptions": { "rootDir": "src", diff --git a/package/tsconfig.json b/packages/react-native-nitro-sqlite/tsconfig.json similarity index 68% rename from package/tsconfig.json rename to packages/react-native-nitro-sqlite/tsconfig.json index 0aaa0249..810346ee 100644 --- a/package/tsconfig.json +++ b/packages/react-native-nitro-sqlite/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../config/tsconfig.json", + "extends": "../../config/tsconfig.json", "include": ["src"], "compilerOptions": { "rootDir": "src", diff --git a/scripts/clang-format.sh b/scripts/clang-format.sh index b9322ab1..42ef4c94 100755 --- a/scripts/clang-format.sh +++ b/scripts/clang-format.sh @@ -1,7 +1,7 @@ #!/bin/bash CPP_DIRS=( - "package/cpp" + "packages/react-native-nitro-sqlite/cpp" ) if which clang-format >/dev/null; then diff --git a/scripts/release.sh b/scripts/release.sh index 0a8259fc..2588be0e 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -2,7 +2,7 @@ echo "Starting the release process..." echo "Provided options: $@" echo "Publishing react-native-nitro-sqlite to NPM" -cd package +cd packages/react-native-nitro-sqlite bun release $@ echo "Creating a Git bump commit and GitHub release" diff --git a/tsconfig.json b/tsconfig.json index 118e7b29..e66a37db 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "files": [], "references": [ - { "path": "./package/tsconfig.json" }, + { "path": "./packages/react-native-nitro-sqlite/tsconfig.json" }, { "path": "./example/tsconfig.json" } ] }