diff --git a/package-lock.json b/package-lock.json index 81b65bc4541f23..2c7cf600f1cc78 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10412,6 +10412,18 @@ "@wordpress/url": "file:packages/url", "lodash": "^4.17.15", "node-fetch": "^1.7.3" + }, + "dependencies": { + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "dev": true, + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + } } }, "@wordpress/e2e-tests": { @@ -11024,7 +11036,19 @@ } }, "@wordpress/react-native-aztec": { - "version": "file:packages/react-native-aztec" + "version": "file:packages/react-native-aztec", + "dependencies": { + "prop-types": { + "version": "15.6.0", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", + "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "requires": { + "fbjs": "^0.8.16", + "loose-envify": "^1.3.1", + "object-assign": "^4.1.1" + } + } + } }, "@wordpress/react-native-bridge": { "version": "file:packages/react-native-bridge", @@ -11071,11 +11095,6 @@ "version": "241213.1.0", "resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-241213.1.0.tgz", "integrity": "sha512-AH8NYyMNLNhcUEF97QbMxPNLNW+oiSBlvm1rsMNzgJ1d5TQzdh/AOJGsxeeESp3m9YIWGLCgUvGTVoVLs0p68A==" - }, - "node-fetch": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", - "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" } } }, @@ -22224,6 +22243,17 @@ "requires": { "node-fetch": "^1.0.1", "whatwg-fetch": ">=0.10.0" + }, + "dependencies": { + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + } } }, "isstream": { @@ -27485,6 +27515,12 @@ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, + "react-refresh": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.2.tgz", + "integrity": "sha512-kv5QlFFSZWo7OlJFNYbxRtY66JImuP2LcrFgyJfQaf85gSP+byzG21UbDQEYjU7f//ny8rwiEkO6py2Y+fEgAQ==", + "dev": true + }, "require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", @@ -28955,13 +28991,9 @@ } }, "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, "node-fetch-npm": { "version": "2.0.2", diff --git a/packages/react-native-editor/RNTAztecView.podspec b/packages/react-native-aztec/RNTAztecView.podspec similarity index 67% rename from packages/react-native-editor/RNTAztecView.podspec rename to packages/react-native-aztec/RNTAztecView.podspec index d309cfe0ab9361..3560c7fcfa0269 100644 --- a/packages/react-native-editor/RNTAztecView.podspec +++ b/packages/react-native-aztec/RNTAztecView.podspec @@ -7,11 +7,11 @@ Pod::Spec.new do |s| s.version = package['version'] s.summary = 'Aztec editor for React Native' s.license = package['license'] - s.homepage = 'https://github.com/wordpress-mobile/gutenberg-mobile' + s.homepage = package['homepage'] s.authors = 'Automattic' - s.source = { :git => 'https://github.com/wordpress-mobile/gutenberg-mobile.git' } - s.source_files = 'react-native-aztec/ios/RNTAztecView/*.{h,m,swift}' - s.public_header_files = 'react-native-aztec/ios/RNTAztecView/*.h' + s.source = { :git => 'https://github.com/WordPress/gutenberg.git' } + s.source_files = 'ios/RNTAztecView/*.{h,m,swift}' + s.public_header_files = 'ios/RNTAztecView/*.h' s.requires_arc = true s.platforms = { :ios => "11.0" } s.swift_version = '5.0' diff --git a/packages/react-native-editor/Gutenberg.podspec b/packages/react-native-bridge/Gutenberg.podspec similarity index 66% rename from packages/react-native-editor/Gutenberg.podspec rename to packages/react-native-bridge/Gutenberg.podspec index 9a853429db0fba..80348a1fe154a0 100644 --- a/packages/react-native-editor/Gutenberg.podspec +++ b/packages/react-native-bridge/Gutenberg.podspec @@ -1,6 +1,6 @@ -package = JSON.parse(File.read(File.join(__dir__, 'package.json'))) +package = JSON.parse(File.read(File.join(File.expand_path('../..'), 'package.json'))) # Use the same RN version that the JS tools use -react_native_version = package['dependencies']['react-native'] +react_native_version = package['devDependencies']['react-native'] # Extract the tagged version if package.json points to a tag react_native_version = react_native_version.split("#v").last if react_native_version.include? "#v" @@ -8,12 +8,12 @@ Pod::Spec.new do |s| s.name = 'Gutenberg' s.version = package['version'] s.summary = 'Printing since 1440' - s.homepage = 'https://github.com/wordpress-mobile/gutenberg-mobile' + s.homepage = package['homepage'] s.license = package['license'] s.authors = 'Automattic' s.platform = :ios, '11.0' - s.source = { :git => 'https://github.com/wordpress-mobile/gutenberg-mobile.git' } - s.source_files = 'react-native-gutenberg-bridge/ios/*.{h,m,swift}' + s.source = { :git => 'https://github.com/WordPress/gutenberg.git' } + s.source_files = 'ios/*.{h,m,swift}' s.requires_arc = true s.preserve_paths = 'bundle/ios/*' s.swift_version = '5.0' diff --git a/packages/react-native-editor/ios/Podfile b/packages/react-native-editor/ios/Podfile index 3a8062d0c33b92..b5ea90975dfd00 100644 --- a/packages/react-native-editor/ios/Podfile +++ b/packages/react-native-editor/ios/Podfile @@ -2,43 +2,43 @@ project 'gutenberg.xcodeproj' # Uncomment the next line to define a global platform for your project platform :ios, '11.0' -require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' +require_relative '../../../node_modules/@react-native-community/cli-platform-ios/native_modules' target 'gutenberg' do # Comment the next line if you don't want to use dynamic frameworks use_frameworks! # Pods for gutenberg - pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector" - pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec" - pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired" - pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety" - pod 'React', :path => '../node_modules/react-native/' - pod 'React-Core', :path => '../node_modules/react-native/' - pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules' - pod 'React-Core/DevSupport', :path => '../node_modules/react-native/' - pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' - pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' - pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' - pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image' - pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS' - pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network' - pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings' - pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text' - pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration' - pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/' - pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact' - pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' - pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' - pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' - pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon" - pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon" - pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga' - pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' - pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' - pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' - pod 'RNTAztecView', :path => '../RNTAztecView.podspec' - pod 'Gutenberg', :path => '../Gutenberg.podspec' + pod 'FBLazyVector', :path => "../../../node_modules/react-native/Libraries/FBLazyVector" + pod 'FBReactNativeSpec', :path => "../../../node_modules/react-native/Libraries/FBReactNativeSpec" + pod 'RCTRequired', :path => "../../../node_modules/react-native/Libraries/RCTRequired" + pod 'RCTTypeSafety', :path => "../../../node_modules/react-native/Libraries/TypeSafety" + pod 'React', :path => '../../../node_modules/react-native/' + pod 'React-Core', :path => '../../../node_modules/react-native/' + pod 'React-CoreModules', :path => '../../../node_modules/react-native/React/CoreModules' + pod 'React-Core/DevSupport', :path => '../../../node_modules/react-native/' + pod 'React-RCTActionSheet', :path => '../../../node_modules/react-native/Libraries/ActionSheetIOS' + pod 'React-RCTAnimation', :path => '../../../node_modules/react-native/Libraries/NativeAnimation' + pod 'React-RCTBlob', :path => '../../../node_modules/react-native/Libraries/Blob' + pod 'React-RCTImage', :path => '../../../node_modules/react-native/Libraries/Image' + pod 'React-RCTLinking', :path => '../../../node_modules/react-native/Libraries/LinkingIOS' + pod 'React-RCTNetwork', :path => '../../../node_modules/react-native/Libraries/Network' + pod 'React-RCTSettings', :path => '../../../node_modules/react-native/Libraries/Settings' + pod 'React-RCTText', :path => '../../../node_modules/react-native/Libraries/Text' + pod 'React-RCTVibration', :path => '../../../node_modules/react-native/Libraries/Vibration' + pod 'React-Core/RCTWebSocket', :path => '../../../node_modules/react-native/' + pod 'React-cxxreact', :path => '../../../node_modules/react-native/ReactCommon/cxxreact' + pod 'React-jsi', :path => '../../../node_modules/react-native/ReactCommon/jsi' + pod 'React-jsiexecutor', :path => '../../../node_modules/react-native/ReactCommon/jsiexecutor' + pod 'React-jsinspector', :path => '../../../node_modules/react-native/ReactCommon/jsinspector' + pod 'ReactCommon/jscallinvoker', :path => "../../../node_modules/react-native/ReactCommon" + pod 'ReactCommon/turbomodule/core', :path => "../../../node_modules/react-native/ReactCommon" + pod 'Yoga', :path => '../../../node_modules/react-native/ReactCommon/yoga' + pod 'DoubleConversion', :podspec => '../../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' + pod 'glog', :podspec => '../../../node_modules/react-native/third-party-podspecs/glog.podspec' + pod 'Folly', :podspec => '../../../node_modules/react-native/third-party-podspecs/Folly.podspec' + pod 'RNTAztecView', :path => '../../react-native-aztec/RNTAztecView.podspec' + pod 'Gutenberg', :path => '../../react-native-bridge/Gutenberg.podspec' target 'gutenbergTests' do inherit! :search_paths diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock index 1f3941eec2a5a8..9ae849cd4aa4f7 100644 --- a/packages/react-native-editor/ios/Podfile.lock +++ b/packages/react-native-editor/ios/Podfile.lock @@ -21,7 +21,7 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - Gutenberg (1.23.0): + - Gutenberg (7.7.1): - React (= 0.61.5) - React-CoreModules (= 0.61.5) - React-RCTImage (= 0.61.5) @@ -239,50 +239,50 @@ PODS: - React - RNSVG (9.13.6-gb): - React - - RNTAztecView (1.23.0): + - RNTAztecView (0.1.11): - React-Core - WordPress-Aztec-iOS (= 1.16.0) - WordPress-Aztec-iOS (1.16.0) - Yoga (1.14.0) DEPENDENCIES: - - BVLinearGradient (from `../node_modules/react-native-linear-gradient`) - - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - Gutenberg (from `../Gutenberg.podspec`) - - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - - React (from `../node_modules/react-native/`) - - React-Core (from `../node_modules/react-native/`) - - React-Core/DevSupport (from `../node_modules/react-native/`) - - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) - - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - - react-native-keyboard-aware-scroll-view (from `../node_modules/react-native-keyboard-aware-scroll-view`) - - react-native-safe-area (from `../node_modules/react-native-safe-area`) - - "react-native-slider (from `../node_modules/@react-native-community/slider`)" - - react-native-video (from `../node_modules/react-native-video`) - - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) - - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) - - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) - - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) - - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) - - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) - - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - - ReactCommon/jscallinvoker (from `../node_modules/react-native/ReactCommon`) - - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - - ReactNativeDarkMode (from `../node_modules/react-native-dark-mode`) - - RNSVG (from `../node_modules/react-native-svg`) - - RNTAztecView (from `../RNTAztecView.podspec`) - - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) + - BVLinearGradient (from `../../../node_modules/react-native-linear-gradient`) + - DoubleConversion (from `../../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) + - FBLazyVector (from `../../../node_modules/react-native/Libraries/FBLazyVector`) + - FBReactNativeSpec (from `../../../node_modules/react-native/Libraries/FBReactNativeSpec`) + - Folly (from `../../../node_modules/react-native/third-party-podspecs/Folly.podspec`) + - glog (from `../../../node_modules/react-native/third-party-podspecs/glog.podspec`) + - Gutenberg (from `../../react-native-bridge/Gutenberg.podspec`) + - RCTRequired (from `../../../node_modules/react-native/Libraries/RCTRequired`) + - RCTTypeSafety (from `../../../node_modules/react-native/Libraries/TypeSafety`) + - React (from `../../../node_modules/react-native/`) + - React-Core (from `../../../node_modules/react-native/`) + - React-Core/DevSupport (from `../../../node_modules/react-native/`) + - React-Core/RCTWebSocket (from `../../../node_modules/react-native/`) + - React-CoreModules (from `../../../node_modules/react-native/React/CoreModules`) + - React-cxxreact (from `../../../node_modules/react-native/ReactCommon/cxxreact`) + - React-jsi (from `../../../node_modules/react-native/ReactCommon/jsi`) + - React-jsiexecutor (from `../../../node_modules/react-native/ReactCommon/jsiexecutor`) + - React-jsinspector (from `../../../node_modules/react-native/ReactCommon/jsinspector`) + - react-native-keyboard-aware-scroll-view (from `../../../node_modules/react-native-keyboard-aware-scroll-view`) + - react-native-safe-area (from `../../../node_modules/react-native-safe-area`) + - "react-native-slider (from `../../../node_modules/@react-native-community/slider`)" + - react-native-video (from `../../../node_modules/react-native-video`) + - React-RCTActionSheet (from `../../../node_modules/react-native/Libraries/ActionSheetIOS`) + - React-RCTAnimation (from `../../../node_modules/react-native/Libraries/NativeAnimation`) + - React-RCTBlob (from `../../../node_modules/react-native/Libraries/Blob`) + - React-RCTImage (from `../../../node_modules/react-native/Libraries/Image`) + - React-RCTLinking (from `../../../node_modules/react-native/Libraries/LinkingIOS`) + - React-RCTNetwork (from `../../../node_modules/react-native/Libraries/Network`) + - React-RCTSettings (from `../../../node_modules/react-native/Libraries/Settings`) + - React-RCTText (from `../../../node_modules/react-native/Libraries/Text`) + - React-RCTVibration (from `../../../node_modules/react-native/Libraries/Vibration`) + - ReactCommon/jscallinvoker (from `../../../node_modules/react-native/ReactCommon`) + - ReactCommon/turbomodule/core (from `../../../node_modules/react-native/ReactCommon`) + - ReactNativeDarkMode (from `../../../node_modules/react-native-dark-mode`) + - RNSVG (from `../../../node_modules/react-native-svg`) + - RNTAztecView (from `../../react-native-aztec/RNTAztecView.podspec`) + - Yoga (from `../../../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: trunk: @@ -291,73 +291,73 @@ SPEC REPOS: EXTERNAL SOURCES: BVLinearGradient: - :path: "../node_modules/react-native-linear-gradient" + :path: "../../../node_modules/react-native-linear-gradient" DoubleConversion: - :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" + :podspec: "../../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" FBLazyVector: - :path: "../node_modules/react-native/Libraries/FBLazyVector" + :path: "../../../node_modules/react-native/Libraries/FBLazyVector" FBReactNativeSpec: - :path: "../node_modules/react-native/Libraries/FBReactNativeSpec" + :path: "../../../node_modules/react-native/Libraries/FBReactNativeSpec" Folly: - :podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec" + :podspec: "../../../node_modules/react-native/third-party-podspecs/Folly.podspec" glog: - :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + :podspec: "../../../node_modules/react-native/third-party-podspecs/glog.podspec" Gutenberg: - :path: "../Gutenberg.podspec" + :path: "../../react-native-bridge/Gutenberg.podspec" RCTRequired: - :path: "../node_modules/react-native/Libraries/RCTRequired" + :path: "../../../node_modules/react-native/Libraries/RCTRequired" RCTTypeSafety: - :path: "../node_modules/react-native/Libraries/TypeSafety" + :path: "../../../node_modules/react-native/Libraries/TypeSafety" React: - :path: "../node_modules/react-native/" + :path: "../../../node_modules/react-native/" React-Core: - :path: "../node_modules/react-native/" + :path: "../../../node_modules/react-native/" React-CoreModules: - :path: "../node_modules/react-native/React/CoreModules" + :path: "../../../node_modules/react-native/React/CoreModules" React-cxxreact: - :path: "../node_modules/react-native/ReactCommon/cxxreact" + :path: "../../../node_modules/react-native/ReactCommon/cxxreact" React-jsi: - :path: "../node_modules/react-native/ReactCommon/jsi" + :path: "../../../node_modules/react-native/ReactCommon/jsi" React-jsiexecutor: - :path: "../node_modules/react-native/ReactCommon/jsiexecutor" + :path: "../../../node_modules/react-native/ReactCommon/jsiexecutor" React-jsinspector: - :path: "../node_modules/react-native/ReactCommon/jsinspector" + :path: "../../../node_modules/react-native/ReactCommon/jsinspector" react-native-keyboard-aware-scroll-view: - :path: "../node_modules/react-native-keyboard-aware-scroll-view" + :path: "../../../node_modules/react-native-keyboard-aware-scroll-view" react-native-safe-area: - :path: "../node_modules/react-native-safe-area" + :path: "../../../node_modules/react-native-safe-area" react-native-slider: - :path: "../node_modules/@react-native-community/slider" + :path: "../../../node_modules/@react-native-community/slider" react-native-video: - :path: "../node_modules/react-native-video" + :path: "../../../node_modules/react-native-video" React-RCTActionSheet: - :path: "../node_modules/react-native/Libraries/ActionSheetIOS" + :path: "../../../node_modules/react-native/Libraries/ActionSheetIOS" React-RCTAnimation: - :path: "../node_modules/react-native/Libraries/NativeAnimation" + :path: "../../../node_modules/react-native/Libraries/NativeAnimation" React-RCTBlob: - :path: "../node_modules/react-native/Libraries/Blob" + :path: "../../../node_modules/react-native/Libraries/Blob" React-RCTImage: - :path: "../node_modules/react-native/Libraries/Image" + :path: "../../../node_modules/react-native/Libraries/Image" React-RCTLinking: - :path: "../node_modules/react-native/Libraries/LinkingIOS" + :path: "../../../node_modules/react-native/Libraries/LinkingIOS" React-RCTNetwork: - :path: "../node_modules/react-native/Libraries/Network" + :path: "../../../node_modules/react-native/Libraries/Network" React-RCTSettings: - :path: "../node_modules/react-native/Libraries/Settings" + :path: "../../../node_modules/react-native/Libraries/Settings" React-RCTText: - :path: "../node_modules/react-native/Libraries/Text" + :path: "../../../node_modules/react-native/Libraries/Text" React-RCTVibration: - :path: "../node_modules/react-native/Libraries/Vibration" + :path: "../../../node_modules/react-native/Libraries/Vibration" ReactCommon: - :path: "../node_modules/react-native/ReactCommon" + :path: "../../../node_modules/react-native/ReactCommon" ReactNativeDarkMode: - :path: "../node_modules/react-native-dark-mode" + :path: "../../../node_modules/react-native-dark-mode" RNSVG: - :path: "../node_modules/react-native-svg" + :path: "../../../node_modules/react-native-svg" RNTAztecView: - :path: "../RNTAztecView.podspec" + :path: "../../react-native-aztec/RNTAztecView.podspec" Yoga: - :path: "../node_modules/react-native/ReactCommon/yoga" + :path: "../../../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c @@ -367,7 +367,7 @@ SPEC CHECKSUMS: FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - Gutenberg: fd94d54ccf8605564288cc6ef0f762da70f18b01 + Gutenberg: 947a15dae17e75ac0b022ac51b5cb5d8b58f6409 RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1 RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320 React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78 @@ -380,7 +380,7 @@ SPEC CHECKSUMS: react-native-keyboard-aware-scroll-view: ffa9152671fec9a571197ed2d02e0fcb90206e60 react-native-safe-area: e8230b0017d76c00de6b01e2412dcf86b127c6a3 react-native-slider: f81b89fa0c1f9a65742d33f889a194ca6653a985 - react-native-video: 331eaf96cb034fedcc27f4f6ada3ac3cf6c0a78a + react-native-video: a1aeeb872d4408ff2f1a2a780a49ff44bdeb9172 React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76 React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360 React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72 @@ -393,10 +393,10 @@ SPEC CHECKSUMS: ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348 RNSVG: 68a534a5db06dcbdaebfd5079349191598caef7b - RNTAztecView: 48948d6a92e3202dca86fbb3c579b0b3065c89fd + RNTAztecView: 4e64576a03d9e578ad6ee091811a74b33ddbe35b WordPress-Aztec-iOS: 64a2989d25befb5ce086fac440315f696026ffd5 Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b -PODFILE CHECKSUM: 2ca635b0121a10753500623fbaee9edd0fe6ef92 +PODFILE CHECKSUM: 6f29befa4340201780fd76791bfdf5e85ce42be8 COCOAPODS: 1.8.4 diff --git a/packages/react-native-editor/ios/gutenberg.xcodeproj/project.pbxproj b/packages/react-native-editor/ios/gutenberg.xcodeproj/project.pbxproj index 65235a15f1143c..686f78266ee481 100644 --- a/packages/react-native-editor/ios/gutenberg.xcodeproj/project.pbxproj +++ b/packages/react-native-editor/ios/gutenberg.xcodeproj/project.pbxproj @@ -452,7 +452,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; + shellScript = "export NODE_BINARY=node\n../../../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; 06CE89E9A162D62B604C3B6C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json index 53ad49440bfeec..2528f6e492c5ce 100644 --- a/packages/react-native-editor/package.json +++ b/packages/react-native-editor/package.json @@ -63,7 +63,7 @@ }, "scripts": { "start": "react-native start", - "start:reset": "npm run clean:runtime && npm run start --reset-cache", + "start:reset": "npm run clean:runtime && npm run start -- --reset-cache", "start:debug": "node --inspect-brk node_modules/.bin/react-native start", "patch-metro-no-file-watch": "cp ../../node_modules/metro/src/node-haste/DependencyGraph.js ./ && cp DependencyGraph.js.patched ../../node_modules/metro/src/node-haste/DependencyGraph.js", "un-patch-metro-no-file-watch": "mv ./DependencyGraph.js ../../node_modules/metro/src/node-haste/DependencyGraph.js", @@ -97,7 +97,6 @@ "preios:carthage:update": "cd ../react-native-aztec && npm run update-aztec-ios", "preios:xcode10": "cd ../../node_modules/react-native && ./scripts/ios-install-third-party.sh && cd third-party/glog-0.3.5 && [ -f libglog.pc ] || ../../scripts/ios-configure-glog.sh", "ios": "react-native run-ios", - "ios:fast": "react-native run-ios", "test": "cross-env NODE_ENV=test jest --verbose --config ./jest.config.js", "test:debug": "cross-env NODE_ENV=test node --inspect-brk jest --runInBand --verbose --config ../../test/native/jest.config.js", "device-tests": "cross-env NODE_ENV=test jest --no-cache --maxWorkers=3 --reporters=default --reporters=jest-junit --verbose --config ../../test/native/jest_ui.config.js",