From 0d78bba7feb59271cd638d5497ad4e87028893f4 Mon Sep 17 00:00:00 2001 From: James Ide Date: Wed, 11 Jan 2017 12:33:42 -0800 Subject: [PATCH] Stop copying unused JS files into the Pods folder Summary: Currently the podspec copies JS files along with the associated Obj-C files (ex: PushNotifications.m and PushNotifications.js are copied together). However the packager looks at `node_modules`, not `Pods`, for the JS source files so these copied JS source files (plus JS unit tests) were always ignored and are cruft. This is documented as a breaking change but I suspect it won't affect most (if any) configurations. For this to have been useful, you would have had to have had been running the packager under `Pods/..some path to RN../cli.js` instead of with `npm start` or `node_modules/react-native/cli.js`. Closes https://github.com/facebook/react-native/pull/11761 Differential Revision: D4404934 fbshipit-source-id: a9f372a74f7acb962581f929647e82eae185c5ba --- React.podspec | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/React.podspec b/React.podspec index fbd9f6afe..5eac3dbcd 100644 --- a/React.podspec +++ b/React.podspec @@ -28,7 +28,7 @@ Pod::Spec.new do |s| s.platform = :ios, "8.0" s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" } s.header_dir = 'React' - s.preserve_paths = "cli.js", "Libraries/**/*.js", "lint", "linter.js", "node_modules", "package.json", "packager", "PATENTS", "react-native-cli" + s.preserve_paths = "package.json", "LICENSE", "LICENSE-CustomComponents", "PATENTS" s.subspec 'Core' do |ss| ss.dependency 'React/yoga' @@ -63,19 +63,16 @@ Pod::Spec.new do |s| s.subspec 'ART' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/ART/**/*.{h,m}" - ss.preserve_paths = "Libraries/ART/**/*.js" end s.subspec 'RCTActionSheet' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/ActionSheetIOS/*.{h,m}" - ss.preserve_paths = "Libraries/ActionSheetIOS/*.js" end s.subspec 'RCTAdSupport' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/AdSupport/*.{h,m}" - ss.preserve_paths = "Libraries/AdSupport/*.js" end s.subspec 'RCTAnimation' do |ss| @@ -87,56 +84,47 @@ Pod::Spec.new do |s| ss.dependency 'React/Core' ss.dependency 'React/RCTImage' ss.source_files = "Libraries/CameraRoll/*.{h,m}" - ss.preserve_paths = "Libraries/CameraRoll/*.js" end s.subspec 'RCTGeolocation' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/Geolocation/*.{h,m}" - ss.preserve_paths = "Libraries/Geolocation/*.js" end s.subspec 'RCTImage' do |ss| ss.dependency 'React/Core' ss.dependency 'React/RCTNetwork' ss.source_files = "Libraries/Image/*.{h,m}" - ss.preserve_paths = "Libraries/Image/*.js" end s.subspec 'RCTNetwork' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/Network/*.{h,m,mm}" - ss.preserve_paths = "Libraries/Network/*.js" end s.subspec 'RCTPushNotification' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/PushNotificationIOS/*.{h,m}" - ss.preserve_paths = "Libraries/PushNotificationIOS/*.js" end s.subspec 'RCTSettings' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/Settings/*.{h,m}" - ss.preserve_paths = "Libraries/Settings/*.js" end s.subspec 'RCTText' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/Text/*.{h,m}" - ss.preserve_paths = "Libraries/Text/*.js" end s.subspec 'RCTVibration' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/Vibration/*.{h,m}" - ss.preserve_paths = "Libraries/Vibration/*.js" end s.subspec 'RCTWebSocket' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/WebSocket/*.{h,m}" - ss.preserve_paths = "Libraries/WebSocket/*.js" end s.subspec 'RCTLinkingIOS' do |ss| @@ -147,7 +135,6 @@ Pod::Spec.new do |s| s.subspec 'RCTTest' do |ss| ss.dependency 'React/Core' ss.source_files = "Libraries/RCTTest/**/*.{h,m}" - ss.preserve_paths = "Libraries/RCTTest/**/*.js" ss.frameworks = "XCTest" end end