revert: load web js sdk localy

growingio · Oct 14, 2024 · c818268 · c818268
1 parent d3782fe
commit c818268
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 35 deletions.
diff --git a/GrowingAnalytics.podspec b/GrowingAnalytics.podspec
@@ -47,10 +47,7 @@ GrowingAnalytics具备自动采集基本的用户行为事件，比如访问和
     trackerCore.dependency 'GrowingUtils/TrackerCore', '~> 1.2.3'
     trackerCore.source_files = 'GrowingTrackerCore/**/*{.h,.m,.c,.cpp,.mm}'
     trackerCore.public_header_files = 'GrowingTrackerCore/Public/*.h'
-    trackerCore.ios.resource_bundles = {'GrowingAnalytics' => [
-      'Resources/iOS/GrowingAnalytics.bundle/PrivacyInfo.xcprivacy', 
-      'Resources/iOS/GrowingAnalytics.bundle/gdp-full.js'
-    ]}
+    trackerCore.ios.resource_bundles = {'GrowingAnalytics' => ['Resources/iOS/GrowingAnalytics.bundle/PrivacyInfo.xcprivacy']}
     trackerCore.osx.resource_bundles = {'GrowingAnalytics' => ['Resources/macOS/GrowingAnalytics.bundle/PrivacyInfo.xcprivacy']}
     trackerCore.watchos.resource_bundles = {'GrowingAnalytics' => ['Resources/watchOS/GrowingAnalytics.bundle/PrivacyInfo.xcprivacy']}
     trackerCore.tvos.resource_bundles = {'GrowingAnalytics' => ['Resources/tvOS/GrowingAnalytics.bundle/PrivacyInfo.xcprivacy']}

diff --git a/Modules/Hybrid/GrowingWKWebViewJavascriptBridge.m b/Modules/Hybrid/GrowingWKWebViewJavascriptBridge.m
@@ -33,10 +33,6 @@
 #import "Modules/Hybrid/GrowingWebViewJavascriptBridgeConfiguration.h"
 #import "Modules/Hybrid/Public/GrowingHybridModule.h"
 
-#if SWIFT_PACKAGE
-@import GrowingBundle;
-#endif
-
 static NSString *const kGrowingWKWebViewJavascriptBridge = @"GrowingWKWebViewJavascriptBridge";
 
 @interface GrowingWKWebViewJavascriptBridge () <WKScriptMessageHandler>
@@ -128,34 +124,13 @@ + (WKUserScript *)bridgeJsUserScriptWithConfig:(GrowingWebViewJavascriptBridgeCo
 }
 
 + (WKUserScript *)javaScriptSdkInjectJsUserScriptWithConfig:(GrowingWebViewJavascriptBridgeConfiguration *)config {
-    //    NSBundle *bundle = [self resourcesBundle];
-    //    NSString *filePath = [bundle pathForResource:@"gdp-full" ofType:@"js"];
-    //    NSString *webJSContent = [NSString stringWithContentsOfFile:filePath
-    //                                                       encoding:NSUTF8StringEncoding
-    //                                                          error:nil];
-    //    webJSContent =
-    //        [webJSContent stringByAppendingFormat:@"gdp('init', '%@', '%@');", config.accountId, config.dataSourceId];
-    //    WKUserScript *userScript = [[WKUserScript alloc] initWithSource:webJSContent
-    //                                                       injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
-    //                                                    forMainFrameOnly:NO];
     WKUserScript *userScript = [[WKUserScript alloc]
           initWithSource:[GrowingWKWebViewJavascriptBridge_JS createJavascriptSdkInjectJsWithNativeConfiguration:config]
            injectionTime:WKUserScriptInjectionTimeAtDocumentEnd
         forMainFrameOnly:NO];
     return userScript;
 }
 
-+ (NSBundle *)resourcesBundle {
-#if SWIFT_PACKAGE
-    return GrowingBundleWrapper_SWIFTPM_MODULE_BUNDLE();
-#else
-    NSBundle *bundle = [NSBundle bundleForClass:self.class];
-    NSString *bundleName = @"GrowingAnalytics.bundle";
-    NSString *path = [bundle.resourcePath stringByAppendingPathComponent:bundleName];
-    return [NSBundle bundleWithPath:path];
-#endif
-}
-
 - (void)userContentController:(WKUserContentController *)userContentController
       didReceiveScriptMessage:(WKScriptMessage *)message {
     if ([GrowingWKWebViewJavascriptBridge webViewDontTrackCheck:message.webView]) {

diff --git a/Package.swift b/Package.swift
@@ -151,10 +151,7 @@ extension Target {
     enum Resources {
         static let bundle = target(name: .bundle,
                                    path: .Path.bundle,
-                                   resources: [
-                                       .copy("Resources/GrowingAnalytics.bundle/PrivacyInfo.xcprivacy"),
-                                       .copy("Resources/GrowingAnalytics.bundle/gdp-full.js"),
-                                   ])
+                                   resources: [.copy("Resources/GrowingAnalytics.bundle/PrivacyInfo.xcprivacy")])
 
         static let bundle_macOS = target(name: .bundle_macOS,
                                          path: .Path.bundle_macOS,

diff --git a/Resources/iOS/GrowingAnalytics.bundle/gdp-full.js b/Resources/iOS/GrowingAnalytics.bundle/gdp-full.js
diff --git a/Services/Database/FMDB/GrowingFMDatabaseQueue.m b/Services/Database/FMDB/GrowingFMDatabaseQueue.m
@@ -189,7 +189,7 @@ - (void)inDatabase:(void (^)(GrowingFMDatabase *db))block {
 #if defined(DEBUG) && DEBUG
             NSSet *openSetCopy = FMG3DBReturnAutoreleased([[db valueForKey:@"_openResultSets"] copy]);
             for (NSValue *rsInWrappedInATastyValueMeal in openSetCopy) {
-                GrowingFMResultSet *rs = (GrowingFMResultSet *)[rsInWrappedInATastyValueMeal pointerValue];
+//                GrowingFMResultSet *rs = (GrowingFMResultSet *)[rsInWrappedInATastyValueMeal pointerValue];
 //                NSLog(@"query: '%@'", [rs query]);
             }
 #endif