From 4289a71e493ccf60f474596a8547811232ef734c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E3=81=AA=20=E5=AE=87=E5=AE=99=E9=A3=9B?= =?UTF-8?q?=E8=A1=8C=E5=A3=AB?= <50376577+TheLonelyAstronaut@users.noreply.github.com> Date: Wed, 10 May 2023 00:16:13 +0300 Subject: [PATCH 1/8] Update withWatermelon.js --- build/withWatermelon.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/withWatermelon.js b/build/withWatermelon.js index 8f7668e..860ace4 100644 --- a/build/withWatermelon.js +++ b/build/withWatermelon.js @@ -79,7 +79,7 @@ const withCocoaPods = (config) => { slicedContent[0] += `\n pod 'WatermelonDB', :path => '../node_modules/@nozbe/watermelondb' pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi', :modular_headers => true - pod 'simdjson', path: '../node_modules/@nozbe/simdjson'\n\n `; + pod 'simdjson', path: '../node_modules/@nozbe/simdjson', :modular_headers => true\n\n `; await fs.writeFile(filePath, slicedContent.join(patchKey)); } else { From f1fba140f9c2066a17d440252c5f2e38da9b027d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E3=81=AA=20=E5=AE=87=E5=AE=99=E9=A3=9B?= =?UTF-8?q?=E8=A1=8C=E5=A3=AB?= <50376577+TheLonelyAstronaut@users.noreply.github.com> Date: Wed, 10 May 2023 00:21:53 +0300 Subject: [PATCH 2/8] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 07a6f4d..a33d987 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@morrowdigital/watermelondb-expo-plugin", - "version": "2.1.0", + "version": "2.1.1", "main": "build/withWatermelon.js", "types": "build/withWatermelon.d.ts", "license": "MIT", From 94c2616a483bdebe17dc64bef38a52b7154d53a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E3=81=AA=20=E5=AE=87=E5=AE=99=E9=A3=9B?= =?UTF-8?q?=E8=A1=8C=E5=A3=AB?= <50376577+TheLonelyAstronaut@users.noreply.github.com> Date: Wed, 10 May 2023 00:24:16 +0300 Subject: [PATCH 3/8] Update package.json --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index a33d987..459eae1 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,10 @@ "main": "build/withWatermelon.js", "types": "build/withWatermelon.d.ts", "license": "MIT", - "git": "https://github.com/morrowdigital/watermelondb-expo-plugin.git", - "homepage": "https://github.com/morrowdigital/watermelondb-expo-plugin#readme", + "git": "https://github.com/TheLonelyAstronaut/watermelondb-expo-plugin.git", + "homepage": "https://github.com/TheLonelyAstronaut/watermelondb-expo-plugin#readme", "bugs": { - "url": "https://github.com/morrowdigital/watermelondb-expo-plugin/issues" + "url": "https://github.com/TheLonelyAstronaut/watermelondb-expo-plugin/issues" }, "keywords": [ "watermelondb", @@ -39,7 +39,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/morrowdigital/watermelondb-expo-plugin.git" + "url": "git+https://github.com/TheLonelyAstronaut/watermelondb-expo-plugin.git" }, "author": "Morrow" } From d1315c65c54e2b00be85ab481069016268c780b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E3=81=AA=20=E5=AE=87=E5=AE=99=E9=A3=9B?= =?UTF-8?q?=E8=A1=8C=E5=A3=AB?= <50376577+TheLonelyAstronaut@users.noreply.github.com> Date: Wed, 10 May 2023 00:26:30 +0300 Subject: [PATCH 4/8] Update withWatermelon.ts --- src/withWatermelon.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/withWatermelon.ts b/src/withWatermelon.ts index 14943db..d174071 100644 --- a/src/withWatermelon.ts +++ b/src/withWatermelon.ts @@ -108,7 +108,7 @@ const withCocoaPods = (config: ExportedConfigWithProps) => { slicedContent[0] += `\n pod 'WatermelonDB', :path => '../node_modules/@nozbe/watermelondb' pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi', :modular_headers => true - pod 'simdjson', path: '../node_modules/@nozbe/simdjson'\n\n `; + pod 'simdjson', path: '../node_modules/@nozbe/simdjson', :modular_headers => true\n\n `; await fs.writeFile(filePath, slicedContent.join(patchKey)); } else { throw new Error("Please make sure you have watermelondb installed"); From 07c14a79d5d9118afae75d33840fb857805fa111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E3=81=AA=20=E5=AE=87=E5=AE=99=E9=A3=9B?= =?UTF-8?q?=E8=A1=8C=E5=A3=AB?= <50376577+TheLonelyAstronaut@users.noreply.github.com> Date: Wed, 10 May 2023 00:26:54 +0300 Subject: [PATCH 5/8] Update package.json --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 459eae1..a33d987 100644 --- a/package.json +++ b/package.json @@ -4,10 +4,10 @@ "main": "build/withWatermelon.js", "types": "build/withWatermelon.d.ts", "license": "MIT", - "git": "https://github.com/TheLonelyAstronaut/watermelondb-expo-plugin.git", - "homepage": "https://github.com/TheLonelyAstronaut/watermelondb-expo-plugin#readme", + "git": "https://github.com/morrowdigital/watermelondb-expo-plugin.git", + "homepage": "https://github.com/morrowdigital/watermelondb-expo-plugin#readme", "bugs": { - "url": "https://github.com/TheLonelyAstronaut/watermelondb-expo-plugin/issues" + "url": "https://github.com/morrowdigital/watermelondb-expo-plugin/issues" }, "keywords": [ "watermelondb", @@ -39,7 +39,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/TheLonelyAstronaut/watermelondb-expo-plugin.git" + "url": "git+https://github.com/morrowdigital/watermelondb-expo-plugin.git" }, "author": "Morrow" } From 82e206a627026f2243c127cc3fa699f60e490467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E3=81=AA=20=E5=AE=87=E5=AE=99=E9=A3=9B?= =?UTF-8?q?=E8=A1=8C=E5=A3=AB?= <50376577+TheLonelyAstronaut@users.noreply.github.com> Date: Wed, 10 May 2023 06:58:35 +0300 Subject: [PATCH 6/8] Update withWatermelon.ts --- src/withWatermelon.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/withWatermelon.ts b/src/withWatermelon.ts index d174071..bc76ac8 100644 --- a/src/withWatermelon.ts +++ b/src/withWatermelon.ts @@ -52,10 +52,7 @@ function setAppDelegate(config: ExportedConfigWithProps) { `#import #import #import -#import - -// Silence warning -#import "../../node_modules/@nozbe/watermelondb/native/ios/WatermelonDB/SupportingFiles/Bridging.h"\n +#import "\n ` + contents; await fs.writeFile(filePath, updated); From 8cf03e58e8bca27350da32e3e4911209fb9faa8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E3=81=AA=20=E5=AE=87=E5=AE=99=E9=A3=9B?= =?UTF-8?q?=E8=A1=8C=E5=A3=AB?= <50376577+TheLonelyAstronaut@users.noreply.github.com> Date: Wed, 10 May 2023 06:59:14 +0300 Subject: [PATCH 7/8] Update withWatermelon.ts --- src/withWatermelon.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/withWatermelon.ts b/src/withWatermelon.ts index bc76ac8..fb00928 100644 --- a/src/withWatermelon.ts +++ b/src/withWatermelon.ts @@ -52,7 +52,7 @@ function setAppDelegate(config: ExportedConfigWithProps) { `#import #import #import -#import "\n +#import \n ` + contents; await fs.writeFile(filePath, updated); From 2c17b0ceb21a42b4a46682372c62006be51af64f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E3=81=AA=20=E5=AE=87=E5=AE=99=E9=A3=9B?= =?UTF-8?q?=E8=A1=8C=E5=A3=AB?= <50376577+TheLonelyAstronaut@users.noreply.github.com> Date: Wed, 10 May 2023 07:06:49 +0300 Subject: [PATCH 8/8] Update withWatermelon.ts --- src/withWatermelon.ts | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/src/withWatermelon.ts b/src/withWatermelon.ts index fb00928..4fc7f6d 100644 --- a/src/withWatermelon.ts +++ b/src/withWatermelon.ts @@ -38,30 +38,6 @@ function setAndroidMainApplication(config: ExportedConfigWithProps) { ]); } -/** - * Platform: iOS - * */ -function setAppDelegate(config: ExportedConfigWithProps) { - return withDangerousMod(config, [ - "ios", - async (config) => { - const filePath = getPlatformProjectFilePath(config, 'AppDelegate.h') - const contents = await fs.readFile(filePath, "utf-8"); - - let updated = - `#import -#import -#import -#import \n - ` + contents; - - await fs.writeFile(filePath, updated); - - return config; - }, - ]); -} - function setWmelonBridgingHeader(config: ExportedConfigWithProps) { return withDangerousMod(config, [ "ios", @@ -167,7 +143,6 @@ export default (config, options) => { // config = setAppSettingBuildGradle(config); // config = setAppBuildGradle(config); config = setAndroidMainApplication(config); - config = setAppDelegate(config); config = setWmelonBridgingHeader(config); config = withCocoaPods(config); if (options?.excludeSimulatorArchitectures ?? true) {