From 3c9c39649cf8a79e7c3a306d55e9bf5ef82a5f4d Mon Sep 17 00:00:00 2001 From: Chip Snyder Date: Wed, 16 Jun 2021 16:58:50 -0400 Subject: [PATCH] Migrate Core Data changes to 126 and re-add rawFeatures --- Podfile | 2 +- Podfile.lock | 184 +-- ...ockEditorSettings+CoreDataProperties.swift | 4 + ...itorSettings+GutenbergEditorSettings.swift | 2 + .../WordPress.xcdatamodeld/.xccurrentversion | 2 +- .../WordPress 126.xcdatamodel/contents | 1052 +++++++++++++++++ WordPress/WordPress.xcodeproj/project.pbxproj | 25 +- .../BlockEditorSettingsServiceTests.swift | 2 + ...itor-v1-settings-success-NotThemeJSON.json | 331 ++++-- ...-editor-v1-settings-success-ThemeJSON.json | 545 ++++++--- 10 files changed, 1784 insertions(+), 365 deletions(-) create mode 100644 WordPress/Classes/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents diff --git a/Podfile b/Podfile index 95e24d5f6408..ecbfc12dda46 100644 --- a/Podfile +++ b/Podfile @@ -166,7 +166,7 @@ abstract_target 'Apps' do ## Gutenberg (React Native) ## ===================== ## - gutenberg :tag => 'v1.56.0-alpha1' + gutenberg :commit => '074f93540c9b953c8a1a8089a9544b4a9b443b9c' ## Third party libraries ## ===================== diff --git a/Podfile.lock b/Podfile.lock index 6674483eb979..4d79a8088381 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -490,18 +490,18 @@ DEPENDENCIES: - AppCenter (= 4.1.1) - AppCenter/Distribute (= 4.1.1) - Automattic-Tracks-iOS (~> 0.8.5) - - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/BVLinearGradient.podspec.json`) + - BVLinearGradient (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/BVLinearGradient.podspec.json`) - Charts (~> 3.2.2) - CocoaLumberjack (~> 3.0) - CropViewController (= 2.5.3) - Down (~> 0.6.6) - - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/FBLazyVector.podspec.json`) - - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`) + - FBLazyVector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/FBLazyVector.podspec.json`) + - FBReactNativeSpec (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json`) - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gifu (= 3.2.0) - - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/glog.podspec.json`) + - glog (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/glog.podspec.json`) - Gridicons (~> 1.1.0) - - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.56.0-alpha1`) + - Gutenberg (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `074f93540c9b953c8a1a8089a9544b4a9b443b9c`) - JTAppleCalendar (~> 8.0.2) - Kanvas (~> 1.2.7) - MediaEditor (~> 1.2.1) @@ -511,44 +511,44 @@ DEPENDENCIES: - "NSURL+IDN (~> 0.4)" - OCMock (~> 3.4.3) - OHHTTPStubs/Swift (~> 9.1.0) - - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RCT-Folly.podspec.json`) - - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RCTRequired.podspec.json`) - - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RCTTypeSafety.podspec.json`) + - RCT-Folly (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RCT-Folly.podspec.json`) + - RCTRequired (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RCTRequired.podspec.json`) + - RCTTypeSafety (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RCTTypeSafety.podspec.json`) - Reachability (= 3.2) - - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React.podspec.json`) - - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-callinvoker.podspec.json`) - - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-Core.podspec.json`) - - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-CoreModules.podspec.json`) - - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-cxxreact.podspec.json`) - - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-jsi.podspec.json`) - - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-jsiexecutor.podspec.json`) - - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-jsinspector.podspec.json`) - - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-blur.podspec.json`) - - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-get-random-values.podspec.json`) - - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) - - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-safe-area.podspec.json`) - - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-safe-area-context.podspec.json`) - - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-slider.podspec.json`) - - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-video.podspec.json`) - - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-perflogger.podspec.json`) - - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTActionSheet.podspec.json`) - - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTAnimation.podspec.json`) - - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTBlob.podspec.json`) - - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTImage.podspec.json`) - - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTLinking.podspec.json`) - - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTNetwork.podspec.json`) - - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTSettings.podspec.json`) - - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTText.podspec.json`) - - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTVibration.podspec.json`) - - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-runtimeexecutor.podspec.json`) - - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/ReactCommon.podspec.json`) - - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/ReactNativeDarkMode.podspec.json`) - - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNCMaskedView.podspec.json`) - - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNGestureHandler.podspec.json`) - - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNReanimated.podspec.json`) - - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNScreens.podspec.json`) - - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNSVG.podspec.json`) - - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, tag `v1.56.0-alpha1`) + - React (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React.podspec.json`) + - React-callinvoker (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-callinvoker.podspec.json`) + - React-Core (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-Core.podspec.json`) + - React-CoreModules (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-CoreModules.podspec.json`) + - React-cxxreact (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-cxxreact.podspec.json`) + - React-jsi (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-jsi.podspec.json`) + - React-jsiexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-jsiexecutor.podspec.json`) + - React-jsinspector (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-jsinspector.podspec.json`) + - react-native-blur (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-blur.podspec.json`) + - react-native-get-random-values (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-get-random-values.podspec.json`) + - react-native-keyboard-aware-scroll-view (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json`) + - react-native-safe-area (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-safe-area.podspec.json`) + - react-native-safe-area-context (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-safe-area-context.podspec.json`) + - react-native-slider (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-slider.podspec.json`) + - react-native-video (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-video.podspec.json`) + - React-perflogger (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-perflogger.podspec.json`) + - React-RCTActionSheet (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTActionSheet.podspec.json`) + - React-RCTAnimation (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTAnimation.podspec.json`) + - React-RCTBlob (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTBlob.podspec.json`) + - React-RCTImage (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTImage.podspec.json`) + - React-RCTLinking (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTLinking.podspec.json`) + - React-RCTNetwork (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTNetwork.podspec.json`) + - React-RCTSettings (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTSettings.podspec.json`) + - React-RCTText (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTText.podspec.json`) + - React-RCTVibration (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTVibration.podspec.json`) + - React-runtimeexecutor (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-runtimeexecutor.podspec.json`) + - ReactCommon (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/ReactCommon.podspec.json`) + - ReactNativeDarkMode (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/ReactNativeDarkMode.podspec.json`) + - RNCMaskedView (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNCMaskedView.podspec.json`) + - RNGestureHandler (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNGestureHandler.podspec.json`) + - RNReanimated (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNReanimated.podspec.json`) + - RNScreens (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNScreens.podspec.json`) + - RNSVG (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNSVG.podspec.json`) + - RNTAztecView (from `https://github.com/wordpress-mobile/gutenberg-mobile.git`, commit `074f93540c9b953c8a1a8089a9544b4a9b443b9c`) - Starscream (= 3.0.6) - SVProgressHUD (= 2.2.5) - WordPress-Editor-iOS (~> 1.19.4) @@ -558,7 +558,7 @@ DEPENDENCIES: - WordPressShared (~> 1.16.0) - WordPressUI (~> 1.12.1-beta) - WPMediaPicker (~> 1.7.2) - - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/Yoga.podspec.json`) + - Yoga (from `https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/Yoga.podspec.json`) - ZendeskSupportSDK (= 5.2.0) - ZIPFoundation (~> 0.9.8) @@ -620,114 +620,120 @@ SPEC REPOS: EXTERNAL SOURCES: BVLinearGradient: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/BVLinearGradient.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/BVLinearGradient.podspec.json FBLazyVector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/FBLazyVector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/FBLazyVector.podspec.json FBReactNativeSpec: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/FBReactNativeSpec/FBReactNativeSpec.podspec.json FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 glog: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/glog.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/glog.podspec.json Gutenberg: + :commit: 074f93540c9b953c8a1a8089a9544b4a9b443b9c :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true - :tag: v1.56.0-alpha1 RCT-Folly: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RCT-Folly.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RCT-Folly.podspec.json RCTRequired: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RCTRequired.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RCTRequired.podspec.json RCTTypeSafety: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RCTTypeSafety.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RCTTypeSafety.podspec.json React: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React.podspec.json React-callinvoker: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-callinvoker.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-callinvoker.podspec.json React-Core: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-Core.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-Core.podspec.json React-CoreModules: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-CoreModules.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-CoreModules.podspec.json React-cxxreact: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-cxxreact.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-cxxreact.podspec.json React-jsi: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-jsi.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-jsi.podspec.json React-jsiexecutor: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-jsiexecutor.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-jsiexecutor.podspec.json React-jsinspector: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-jsinspector.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-jsinspector.podspec.json react-native-blur: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-blur.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-blur.podspec.json react-native-get-random-values: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-get-random-values.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-get-random-values.podspec.json react-native-keyboard-aware-scroll-view: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json react-native-safe-area: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-safe-area.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-safe-area.podspec.json react-native-safe-area-context: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-safe-area-context.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-safe-area-context.podspec.json react-native-slider: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-slider.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-slider.podspec.json react-native-video: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/react-native-video.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/react-native-video.podspec.json React-perflogger: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-perflogger.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-perflogger.podspec.json React-RCTActionSheet: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTActionSheet.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTActionSheet.podspec.json React-RCTAnimation: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTAnimation.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTAnimation.podspec.json React-RCTBlob: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTBlob.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTBlob.podspec.json React-RCTImage: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTImage.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTImage.podspec.json React-RCTLinking: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTLinking.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTLinking.podspec.json React-RCTNetwork: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTNetwork.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTNetwork.podspec.json React-RCTSettings: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTSettings.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTSettings.podspec.json React-RCTText: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTText.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTText.podspec.json React-RCTVibration: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-RCTVibration.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-RCTVibration.podspec.json React-runtimeexecutor: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/React-runtimeexecutor.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/React-runtimeexecutor.podspec.json ReactCommon: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/ReactCommon.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/ReactCommon.podspec.json ReactNativeDarkMode: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/ReactNativeDarkMode.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/ReactNativeDarkMode.podspec.json RNCMaskedView: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNCMaskedView.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNCMaskedView.podspec.json RNGestureHandler: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNGestureHandler.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNGestureHandler.podspec.json RNReanimated: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNReanimated.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNReanimated.podspec.json RNScreens: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNScreens.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNScreens.podspec.json RNSVG: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/RNSVG.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/RNSVG.podspec.json RNTAztecView: + :commit: 074f93540c9b953c8a1a8089a9544b4a9b443b9c :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true - :tag: v1.56.0-alpha1 + WordPressKit: + :branch: gutenberg/issue/3163-gss + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git Yoga: - :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.56.0-alpha1/third-party-podspecs/Yoga.podspec.json + :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/074f93540c9b953c8a1a8089a9544b4a9b443b9c/third-party-podspecs/Yoga.podspec.json CHECKOUT OPTIONS: FSInteractiveMap: :git: https://github.com/wordpress-mobile/FSInteractiveMap.git :tag: 0.2.0 Gutenberg: + :commit: 074f93540c9b953c8a1a8089a9544b4a9b443b9c :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true - :tag: v1.56.0-alpha1 react-native-blur: :commit: 9d2d744a5171f3a77564a43f87c2cfb3fbcf597e :git: https://github.com/react-native-community/react-native-blur.git RNTAztecView: + :commit: 074f93540c9b953c8a1a8089a9544b4a9b443b9c :git: https://github.com/wordpress-mobile/gutenberg-mobile.git :submodules: true - :tag: v1.56.0-alpha1 + WordPressKit: + :commit: cb854d7db08840b7bfeeb81d424926ddd23a6842 + :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git SPEC CHECKSUMS: 1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794 @@ -828,6 +834,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: e100a7a0a1bb5d7d43abbde3338727d985a4986d ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e -PODFILE CHECKSUM: 06e96ab71c38e95d03feab07db771d7b6e457616 +PODFILE CHECKSUM: d525b8844b4011b4a963f2c9c0fc99a59aea9b0b COCOAPODS: 1.10.1 diff --git a/WordPress/Classes/Models/BlockEditorSettings+CoreDataProperties.swift b/WordPress/Classes/Models/BlockEditorSettings+CoreDataProperties.swift index d8cca3072a08..7bdbeb71fd69 100644 --- a/WordPress/Classes/Models/BlockEditorSettings+CoreDataProperties.swift +++ b/WordPress/Classes/Models/BlockEditorSettings+CoreDataProperties.swift @@ -24,6 +24,10 @@ extension BlockEditorSettings { /// @NSManaged public var rawStyles: String? + /// Stores the raw JSON string that comes from the Global Styles Setting Request. + /// + @NSManaged public var rawFeatures: String? + /// Stores a set of attributes describing values that are represented with arrays in the API request. /// Available types are defined in `BlockEditorSettingElementTypes` /// diff --git a/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift b/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift index 1a8803b59cfc..8fbc10e0077d 100644 --- a/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift +++ b/WordPress/Classes/Models/BlockEditorSettings+GutenbergEditorSettings.swift @@ -48,6 +48,8 @@ extension BlockEditorSettings { self.lastUpdated = Date() self.checksum = remoteSettings.checksum self.rawStyles = remoteSettings.rawStyles + self.rawFeatures = remoteSettings.rawFeatures + var parsedElements = Set() remoteSettings.colors?.enumerated().forEach({ (index, color) in diff --git a/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion b/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion index 2de0cee01314..838c132f0d94 100644 --- a/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion +++ b/WordPress/Classes/WordPress.xcdatamodeld/.xccurrentversion @@ -3,6 +3,6 @@ _XCCurrentVersionName - WordPress 125.xcdatamodel + WordPress 126.xcdatamodel diff --git a/WordPress/Classes/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents b/WordPress/Classes/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents new file mode 100644 index 000000000000..5d47f229b28a --- /dev/null +++ b/WordPress/Classes/WordPress.xcdatamodeld/WordPress 126.xcdatamodel/contents @@ -0,0 +1,1052 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 6f815deb2a5f..2043170fcb9e 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -360,7 +360,7 @@ 24B1AE3124FEC79900B9F334 /* RemoteFeatureFlagTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24B1AE3024FEC79900B9F334 /* RemoteFeatureFlagTests.swift */; }; 24C69A8B2612421900312D9A /* UserSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24C69A8A2612421900312D9A /* UserSettingsTests.swift */; }; 24C69AC22612467C00312D9A /* UserSettingsTestsObjc.m in Sources */ = {isa = PBXBuildFile; fileRef = 24C69AC12612467C00312D9A /* UserSettingsTestsObjc.m */; }; - 24CE2EB1258D687A0000C297 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 24CE2EB0258D687A0000C297 /* SwiftPackageProductDependency */; }; + 24CE2EB1258D687A0000C297 /* WordPressFlux in Frameworks */ = {isa = PBXBuildFile; productRef = 24CE2EB0258D687A0000C297 /* WordPressFlux */; }; 24F3789825E6E62100A27BB7 /* NSManagedObject+Lookup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24F3789725E6E62100A27BB7 /* NSManagedObject+Lookup.swift */; }; 2611CC62A62F9E6BC25350FE /* Pods_WordPressScreenshotGeneration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB390AA9C94F16E78184E9D1 /* Pods_WordPressScreenshotGeneration.framework */; }; 26D66DEC36ACF7442186B07D /* Pods_WordPressThisWeekWidget.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 979B445A45E13F3289F2E99E /* Pods_WordPressThisWeekWidget.framework */; }; @@ -4193,7 +4193,7 @@ FABB26322602FC2C00C8785C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 296890770FE971DC00770264 /* Security.framework */; }; FABB26332602FC2C00C8785C /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83F3E25F11275E07004CD686 /* MapKit.framework */; }; FABB26342602FC2C00C8785C /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83F3E2D211276371004CD686 /* CoreLocation.framework */; }; - FABB26352602FC2C00C8785C /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = FABB1FA62602FC2C00C8785C /* SwiftPackageProductDependency */; }; + FABB26352602FC2C00C8785C /* WordPressFlux in Frameworks */ = {isa = PBXBuildFile; productRef = FABB1FA62602FC2C00C8785C /* WordPressFlux */; }; FABB26362602FC2C00C8785C /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8355D7D811D260AA00A61362 /* CoreData.framework */; }; FABB26372602FC2C00C8785C /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 834CE7331256D0DE0046A4A3 /* CFNetwork.framework */; }; FABB26382602FC2C00C8785C /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83043E54126FA31400EC9953 /* MessageUI.framework */; }; @@ -5302,7 +5302,6 @@ 46365555260E1DE5006398E4 /* WordPress 118.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 118.xcdatamodel"; sourceTree = ""; }; 464688D6255C71D200ECA61C /* SiteDesignPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteDesignPreviewViewController.swift; sourceTree = ""; }; 464688D7255C71D200ECA61C /* TemplatePreviewViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TemplatePreviewViewController.xib; sourceTree = ""; }; - 4655B6E9264EEEC9003F90AC /* WordPress 125.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 125.xcdatamodel"; sourceTree = ""; }; 465B097924C877E500336B6C /* GutenbergLightNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GutenbergLightNavigationController.swift; sourceTree = ""; }; 465F89F6263B690C00F4C950 /* wp-block-editor-v1-settings-success-NotThemeJSON.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "wp-block-editor-v1-settings-success-NotThemeJSON.json"; sourceTree = ""; }; 465F8A09263B692600F4C950 /* wp-block-editor-v1-settings-success-ThemeJSON.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "wp-block-editor-v1-settings-success-ThemeJSON.json"; sourceTree = ""; }; @@ -5310,6 +5309,7 @@ 466653492501552A00165DD4 /* LayoutPreviewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutPreviewViewController.swift; sourceTree = ""; }; 467D3DF925E4436000EB9CB0 /* SitePromptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SitePromptView.swift; sourceTree = ""; }; 467D3E0B25E4436D00EB9CB0 /* SitePromptView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SitePromptView.xib; sourceTree = ""; }; + 46875345267A919000B0E58F /* WordPress 126.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 126.xcdatamodel"; sourceTree = ""; }; 469CE06B24BCED75003BDC8B /* CategorySectionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategorySectionTableViewCell.swift; sourceTree = ""; }; 469CE06C24BCED75003BDC8B /* CategorySectionTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CategorySectionTableViewCell.xib; sourceTree = ""; }; 469CE06F24BCFB04003BDC8B /* CollapsableHeaderCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollapsableHeaderCollectionViewCell.swift; sourceTree = ""; }; @@ -7527,7 +7527,7 @@ 296890780FE971DC00770264 /* Security.framework in Frameworks */, 83F3E26011275E07004CD686 /* MapKit.framework in Frameworks */, 83F3E2D311276371004CD686 /* CoreLocation.framework in Frameworks */, - 24CE2EB1258D687A0000C297 /* BuildFile in Frameworks */, + 24CE2EB1258D687A0000C297 /* WordPressFlux in Frameworks */, 8355D7D911D260AA00A61362 /* CoreData.framework in Frameworks */, 834CE7341256D0DE0046A4A3 /* CFNetwork.framework in Frameworks */, 83043E55126FA31400EC9953 /* MessageUI.framework in Frameworks */, @@ -7671,7 +7671,7 @@ FABB26322602FC2C00C8785C /* Security.framework in Frameworks */, FABB26332602FC2C00C8785C /* MapKit.framework in Frameworks */, FABB26342602FC2C00C8785C /* CoreLocation.framework in Frameworks */, - FABB26352602FC2C00C8785C /* BuildFile in Frameworks */, + FABB26352602FC2C00C8785C /* WordPressFlux in Frameworks */, FABB26362602FC2C00C8785C /* CoreData.framework in Frameworks */, FABB26372602FC2C00C8785C /* CFNetwork.framework in Frameworks */, FABB26382602FC2C00C8785C /* MessageUI.framework in Frameworks */, @@ -8326,7 +8326,7 @@ path = Classes; sourceTree = ""; }; - 29B97314FDCFA39411CA2CEA = { + 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( F14B5F6F208E648200439554 /* config */, @@ -14365,7 +14365,7 @@ ); name = WordPress; packageProductDependencies = ( - 24CE2EB0258D687A0000C297 /* SwiftPackageProductDependency */, + 24CE2EB0258D687A0000C297 /* WordPressFlux */, ); productName = WordPress; productReference = 1D6058910D05DD3D006BFB54 /* WordPress.app */; @@ -14621,7 +14621,7 @@ ); name = Jetpack; packageProductDependencies = ( - FABB1FA62602FC2C00C8785C /* SwiftPackageProductDependency */, + FABB1FA62602FC2C00C8785C /* WordPressFlux */, ); productName = WordPress; productReference = FABB26522602FC2C00C8785C /* Jetpack.app */; @@ -14856,7 +14856,7 @@ bg, sk, ); - mainGroup = 29B97314FDCFA39411CA2CEA; + mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; projectRoot = ""; @@ -24569,11 +24569,11 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 24CE2EB0258D687A0000C297 /* SwiftPackageProductDependency */ = { + 24CE2EB0258D687A0000C297 /* WordPressFlux */ = { isa = XCSwiftPackageProductDependency; productName = WordPressFlux; }; - FABB1FA62602FC2C00C8785C /* SwiftPackageProductDependency */ = { + FABB1FA62602FC2C00C8785C /* WordPressFlux */ = { isa = XCSwiftPackageProductDependency; productName = WordPressFlux; }; @@ -24595,6 +24595,7 @@ E125443B12BF5A7200D87A0A /* WordPress.xcdatamodeld */ = { isa = XCVersionGroup; children = ( + 46875345267A919000B0E58F /* WordPress 126.xcdatamodel */, E6EE8807266ABE9F009BC219 /* WordPress 125.xcdatamodel */, 984FB2B22646001E00878DE0 /* WordPress 124.xcdatamodel */, 9804E0B42639D88C00532095 /* WordPress 123.xcdatamodel */, @@ -24721,7 +24722,7 @@ 8350E15911D28B4A00A7B073 /* WordPress.xcdatamodel */, E125443D12BF5A7200D87A0A /* WordPress 2.xcdatamodel */, ); - currentVersion = E6EE8807266ABE9F009BC219 /* WordPress 125.xcdatamodel */; + currentVersion = 46875345267A919000B0E58F /* WordPress 126.xcdatamodel */; name = WordPress.xcdatamodeld; path = Classes/WordPress.xcdatamodeld; sourceTree = ""; diff --git a/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift b/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift index b830fd84a532..470443486188 100644 --- a/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift +++ b/WordPress/WordPressTest/BlockEditorSettingsServiceTests.swift @@ -197,8 +197,10 @@ class BlockEditorSettingsServiceTests: XCTestCase { if isGlobalStyles { XCTAssertNotNil(self.blog.blockEditorSettings?.rawStyles) + XCTAssertNotNil(self.blog.blockEditorSettings?.rawFeatures) } else { XCTAssertNil(self.blog.blockEditorSettings?.rawStyles) + XCTAssertNil(self.blog.blockEditorSettings?.rawFeatures) } XCTAssertGreaterThan(self.blog.blockEditorSettings!.colors!.count, 0) XCTAssertGreaterThan(self.blog.blockEditorSettings!.gradients!.count, 0) diff --git a/WordPress/WordPressTest/Test Data/wp-block-editor-v1-settings-success-NotThemeJSON.json b/WordPress/WordPressTest/Test Data/wp-block-editor-v1-settings-success-NotThemeJSON.json index 23b83ff2e5bd..06c877b01355 100644 --- a/WordPress/WordPressTest/Test Data/wp-block-editor-v1-settings-success-NotThemeJSON.json +++ b/WordPress/WordPressTest/Test Data/wp-block-editor-v1-settings-success-NotThemeJSON.json @@ -8,6 +8,7 @@ "png": "image/png", "bmp": "image/bmp", "tiff|tif": "image/tiff", + "webp": "image/webp", "ico": "image/x-icon", "heic": "image/heic", "asf|asx": "video/x-ms-asf", @@ -132,9 +133,9 @@ "icon": null } ], - "disableCustomColors": true, - "disableCustomFontSizes": true, - "disableCustomGradients": true, + "disableCustomColors": false, + "disableCustomFontSizes": false, + "disableCustomGradients": false, "enableCustomLineHeight": false, "enableCustomSpacing": false, "enableCustomUnits": false, @@ -178,78 +179,6 @@ ], "maxUploadFileSize": 536870912, "colors": [ - { - "name": "Black", - "slug": "black", - "color": "#000000", - "origin": "core" - }, - { - "name": "Cyan bluish gray", - "slug": "cyan-bluish-gray", - "color": "#abb8c3", - "origin": "core" - }, - { - "name": "White", - "slug": "white", - "color": "#ffffff", - "origin": "core" - }, - { - "name": "Pale pink", - "slug": "pale-pink", - "color": "#f78da7", - "origin": "core" - }, - { - "name": "Vivid red", - "slug": "vivid-red", - "color": "#cf2e2e", - "origin": "core" - }, - { - "name": "Luminous vivid orange", - "slug": "luminous-vivid-orange", - "color": "#ff6900", - "origin": "core" - }, - { - "name": "Luminous vivid amber", - "slug": "luminous-vivid-amber", - "color": "#fcb900", - "origin": "core" - }, - { - "name": "Light green cyan", - "slug": "light-green-cyan", - "color": "#7bdcb5", - "origin": "core" - }, - { - "name": "Vivid green cyan", - "slug": "vivid-green-cyan", - "color": "#00d084", - "origin": "core" - }, - { - "name": "Pale cyan blue", - "slug": "pale-cyan-blue", - "color": "#8ed1fc", - "origin": "core" - }, - { - "name": "Vivid cyan blue", - "slug": "vivid-cyan-blue", - "color": "#0693e3", - "origin": "core" - }, - { - "name": "Vivid purple", - "slug": "vivid-purple", - "color": "#9b51e0", - "origin": "core" - }, { "name": "Accent Color", "slug": "accent", @@ -302,8 +231,166 @@ "slug": "larger" } ], + "styles": [], + "supportsTemplateMode": true, + "supportsLayout": false, "__experimentalFeatures": { "color": { + "palette": { + "core": [ + { + "name": "Black", + "slug": "black", + "color": "#000000" + }, + { + "name": "Cyan bluish gray", + "slug": "cyan-bluish-gray", + "color": "#abb8c3" + }, + { + "name": "White", + "slug": "white", + "color": "#ffffff" + }, + { + "name": "Pale pink", + "slug": "pale-pink", + "color": "#f78da7" + }, + { + "name": "Vivid red", + "slug": "vivid-red", + "color": "#cf2e2e" + }, + { + "name": "Luminous vivid orange", + "slug": "luminous-vivid-orange", + "color": "#ff6900" + }, + { + "name": "Luminous vivid amber", + "slug": "luminous-vivid-amber", + "color": "#fcb900" + }, + { + "name": "Light green cyan", + "slug": "light-green-cyan", + "color": "#7bdcb5" + }, + { + "name": "Vivid green cyan", + "slug": "vivid-green-cyan", + "color": "#00d084" + }, + { + "name": "Pale cyan blue", + "slug": "pale-cyan-blue", + "color": "#8ed1fc" + }, + { + "name": "Vivid cyan blue", + "slug": "vivid-cyan-blue", + "color": "#0693e3" + }, + { + "name": "Vivid purple", + "slug": "vivid-purple", + "color": "#9b51e0" + } + ], + "theme": [ + { + "name": "Accent Color", + "slug": "accent", + "color": "#cd2653" + }, + { + "name": "Primary", + "slug": "primary", + "color": "#000000" + }, + { + "name": "Secondary", + "slug": "secondary", + "color": "#6d6d6d" + }, + { + "name": "Subtle Background", + "slug": "subtle-background", + "color": "#dcd7ca" + }, + { + "name": "Background Color", + "slug": "background", + "color": "#f5efe0" + } + ] + }, + "gradients": { + "core": [ + { + "name": "Vivid cyan blue to vivid purple", + "gradient": "linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)", + "slug": "vivid-cyan-blue-to-vivid-purple" + }, + { + "name": "Light green cyan to vivid green cyan", + "gradient": "linear-gradient(135deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)", + "slug": "light-green-cyan-to-vivid-green-cyan" + }, + { + "name": "Luminous vivid amber to luminous vivid orange", + "gradient": "linear-gradient(135deg,rgba(252,185,0,1) 0%,rgba(255,105,0,1) 100%)", + "slug": "luminous-vivid-amber-to-luminous-vivid-orange" + }, + { + "name": "Luminous vivid orange to vivid red", + "gradient": "linear-gradient(135deg,rgba(255,105,0,1) 0%,rgb(207,46,46) 100%)", + "slug": "luminous-vivid-orange-to-vivid-red" + }, + { + "name": "Very light gray to cyan bluish gray", + "gradient": "linear-gradient(135deg,rgb(238,238,238) 0%,rgb(169,184,195) 100%)", + "slug": "very-light-gray-to-cyan-bluish-gray" + }, + { + "name": "Cool to warm spectrum", + "gradient": "linear-gradient(135deg,rgb(74,234,220) 0%,rgb(151,120,209) 20%,rgb(207,42,186) 40%,rgb(238,44,130) 60%,rgb(251,105,98) 80%,rgb(254,248,76) 100%)", + "slug": "cool-to-warm-spectrum" + }, + { + "name": "Blush light purple", + "gradient": "linear-gradient(135deg,rgb(255,206,236) 0%,rgb(152,150,240) 100%)", + "slug": "blush-light-purple" + }, + { + "name": "Blush bordeaux", + "gradient": "linear-gradient(135deg,rgb(254,205,165) 0%,rgb(254,45,45) 50%,rgb(107,0,62) 100%)", + "slug": "blush-bordeaux" + }, + { + "name": "Luminous dusk", + "gradient": "linear-gradient(135deg,rgb(255,203,112) 0%,rgb(199,81,192) 50%,rgb(65,88,208) 100%)", + "slug": "luminous-dusk" + }, + { + "name": "Pale ocean", + "gradient": "linear-gradient(135deg,rgb(255,245,203) 0%,rgb(182,227,212) 50%,rgb(51,167,181) 100%)", + "slug": "pale-ocean" + }, + { + "name": "Electric grass", + "gradient": "linear-gradient(135deg,rgb(202,248,128) 0%,rgb(113,206,126) 100%)", + "slug": "electric-grass" + }, + { + "name": "Midnight", + "gradient": "linear-gradient(135deg,rgb(2,3,129) 0%,rgb(40,116,252) 100%)", + "slug": "midnight" + } + ] + }, "duotone": [ { "name": "Dark grayscale", @@ -377,7 +464,63 @@ "customFontStyle": true, "customFontWeight": true, "customTextTransforms": true, - "customTextDecorations": true + "customTextDecorations": true, + "customLetterSpacing": true, + "fontSizes": { + "core": [ + { + "name": "Small", + "slug": "small", + "size": "13px" + }, + { + "name": "Normal", + "slug": "normal", + "size": "16px" + }, + { + "name": "Medium", + "slug": "medium", + "size": "20px" + }, + { + "name": "Large", + "slug": "large", + "size": "36px" + }, + { + "name": "Huge", + "slug": "huge", + "size": "42px" + } + ], + "theme": [ + { + "name": "Small", + "shortName": "S", + "size": "18px", + "slug": "small" + }, + { + "name": "Regular", + "shortName": "M", + "size": "21px", + "slug": "normal" + }, + { + "name": "Large", + "shortName": "L", + "size": "26.25px", + "slug": "large" + }, + { + "name": "Larger", + "shortName": "XL", + "size": "32px", + "slug": "larger" + } + ] + } }, "spacing": { "customMargin": false @@ -400,74 +543,62 @@ { "name": "Vivid cyan blue to vivid purple", "gradient": "linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)", - "slug": "vivid-cyan-blue-to-vivid-purple", - "origin": "core" + "slug": "vivid-cyan-blue-to-vivid-purple" }, { "name": "Light green cyan to vivid green cyan", "gradient": "linear-gradient(135deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)", - "slug": "light-green-cyan-to-vivid-green-cyan", - "origin": "core" + "slug": "light-green-cyan-to-vivid-green-cyan" }, { "name": "Luminous vivid amber to luminous vivid orange", "gradient": "linear-gradient(135deg,rgba(252,185,0,1) 0%,rgba(255,105,0,1) 100%)", - "slug": "luminous-vivid-amber-to-luminous-vivid-orange", - "origin": "core" + "slug": "luminous-vivid-amber-to-luminous-vivid-orange" }, { "name": "Luminous vivid orange to vivid red", "gradient": "linear-gradient(135deg,rgba(255,105,0,1) 0%,rgb(207,46,46) 100%)", - "slug": "luminous-vivid-orange-to-vivid-red", - "origin": "core" + "slug": "luminous-vivid-orange-to-vivid-red" }, { "name": "Very light gray to cyan bluish gray", "gradient": "linear-gradient(135deg,rgb(238,238,238) 0%,rgb(169,184,195) 100%)", - "slug": "very-light-gray-to-cyan-bluish-gray", - "origin": "core" + "slug": "very-light-gray-to-cyan-bluish-gray" }, { "name": "Cool to warm spectrum", "gradient": "linear-gradient(135deg,rgb(74,234,220) 0%,rgb(151,120,209) 20%,rgb(207,42,186) 40%,rgb(238,44,130) 60%,rgb(251,105,98) 80%,rgb(254,248,76) 100%)", - "slug": "cool-to-warm-spectrum", - "origin": "core" + "slug": "cool-to-warm-spectrum" }, { "name": "Blush light purple", "gradient": "linear-gradient(135deg,rgb(255,206,236) 0%,rgb(152,150,240) 100%)", - "slug": "blush-light-purple", - "origin": "core" + "slug": "blush-light-purple" }, { "name": "Blush bordeaux", "gradient": "linear-gradient(135deg,rgb(254,205,165) 0%,rgb(254,45,45) 50%,rgb(107,0,62) 100%)", - "slug": "blush-bordeaux", - "origin": "core" + "slug": "blush-bordeaux" }, { "name": "Luminous dusk", "gradient": "linear-gradient(135deg,rgb(255,203,112) 0%,rgb(199,81,192) 50%,rgb(65,88,208) 100%)", - "slug": "luminous-dusk", - "origin": "core" + "slug": "luminous-dusk" }, { "name": "Pale ocean", "gradient": "linear-gradient(135deg,rgb(255,245,203) 0%,rgb(182,227,212) 50%,rgb(51,167,181) 100%)", - "slug": "pale-ocean", - "origin": "core" + "slug": "pale-ocean" }, { "name": "Electric grass", "gradient": "linear-gradient(135deg,rgb(202,248,128) 0%,rgb(113,206,126) 100%)", - "slug": "electric-grass", - "origin": "core" + "slug": "electric-grass" }, { "name": "Midnight", "gradient": "linear-gradient(135deg,rgb(2,3,129) 0%,rgb(40,116,252) 100%)", - "slug": "midnight", - "origin": "core" + "slug": "midnight" } ] } diff --git a/WordPress/WordPressTest/Test Data/wp-block-editor-v1-settings-success-ThemeJSON.json b/WordPress/WordPressTest/Test Data/wp-block-editor-v1-settings-success-ThemeJSON.json index 5a1ec69b1938..56b4bc92dc6d 100644 --- a/WordPress/WordPressTest/Test Data/wp-block-editor-v1-settings-success-ThemeJSON.json +++ b/WordPress/WordPressTest/Test Data/wp-block-editor-v1-settings-success-ThemeJSON.json @@ -8,6 +8,7 @@ "png": "image/png", "bmp": "image/bmp", "tiff|tif": "image/tiff", + "webp": "image/webp", "ico": "image/x-icon", "heic": "image/heic", "asf|asx": "video/x-ms-asf", @@ -132,9 +133,9 @@ "icon": null } ], - "disableCustomColors": true, - "disableCustomFontSizes": true, - "disableCustomGradients": true, + "disableCustomColors": false, + "disableCustomFontSizes": false, + "disableCustomGradients": false, "enableCustomLineHeight": true, "enableCustomSpacing": true, "enableCustomUnits": true, @@ -177,6 +178,32 @@ } ], "maxUploadFileSize": 536870912, + "defaultTemplatePartAreas": [ + { + "area": "uncategorized", + "label": "General", + "description": "General templates often perform a specific role like displaying post content, and are not tied to any particular area.", + "icon": "layout", + "area_tag": "div" + }, + { + "area": "header", + "label": "Header", + "description": "The Header template defines a page area that typically contains a title, logo, and main navigation.", + "icon": "header", + "area_tag": "header" + }, + { + "area": "footer", + "label": "Footer", + "description": "The Footer template defines a page area that typically contains site credits, social links, or any other combination of blocks.", + "icon": "footer", + "area_tag": "footer" + } + ], + "styles": [], + "supportsTemplateMode": true, + "supportsLayout": true, "__experimentalStyles": { "color": { "background": "var(--wp--preset--color--green)", @@ -239,6 +266,19 @@ "lineHeight": 1.4 } }, + "core/button": { + "border": { + "radius": "0px" + }, + "color": { + "background": "var(--wp--preset--color--gray)", + "text": "var(--wp--preset--color--green)" + }, + "typography": { + "fontSize": "var(--wp--preset--font-size--normal)", + "fontWeight": 500 + } + }, "core/post-author": { "typography": { "fontSize": "var(--wp--preset--font-size--extra-small)", @@ -251,17 +291,261 @@ "lineHeight": "var(--wp--custom--line-height--body)" } }, + "core/post-terms": { + "typography": { + "fontSize": "var(--wp--preset--font-size--extra-small)", + "lineHeight": "var(--wp--custom--line-height--body)" + } + }, "core/site-title": { "typography": { "fontSize": "var(--wp--preset--font-size--large)", "fontWeight": "var(--wp--custom--font-weight--normal)", "textTransform": "uppercase" } + }, + "core/code": { + "spacing": { + "padding": { + "top": "var(--wp--custom--spacing--unit)", + "bottom": "var(--wp--custom--spacing--unit)", + "left": "var(--wp--custom--spacing--unit)", + "right": "var(--wp--custom--spacing--unit)" + } + }, + "border": { + "radius": "0px", + "color": "var(--wp--preset--color--dark-gray)", + "style": "solid", + "width": "1.5px" + } } } }, "__experimentalFeatures": { "color": { + "palette": { + "core": [ + { + "name": "Black", + "slug": "black", + "color": "#000000" + }, + { + "name": "Cyan bluish gray", + "slug": "cyan-bluish-gray", + "color": "#abb8c3" + }, + { + "name": "White", + "slug": "white", + "color": "#ffffff" + }, + { + "name": "Pale pink", + "slug": "pale-pink", + "color": "#f78da7" + }, + { + "name": "Vivid red", + "slug": "vivid-red", + "color": "#cf2e2e" + }, + { + "name": "Luminous vivid orange", + "slug": "luminous-vivid-orange", + "color": "#ff6900" + }, + { + "name": "Luminous vivid amber", + "slug": "luminous-vivid-amber", + "color": "#fcb900" + }, + { + "name": "Light green cyan", + "slug": "light-green-cyan", + "color": "#7bdcb5" + }, + { + "name": "Vivid green cyan", + "slug": "vivid-green-cyan", + "color": "#00d084" + }, + { + "name": "Pale cyan blue", + "slug": "pale-cyan-blue", + "color": "#8ed1fc" + }, + { + "name": "Vivid cyan blue", + "slug": "vivid-cyan-blue", + "color": "#0693e3" + }, + { + "name": "Vivid purple", + "slug": "vivid-purple", + "color": "#9b51e0" + } + ], + "theme": [ + { + "slug": "black", + "color": "#000000", + "name": "Black" + }, + { + "slug": "dark-gray", + "color": "#28303D", + "name": "Dark Gray" + }, + { + "slug": "gray", + "color": "#39414D", + "name": "Gray" + }, + { + "slug": "green", + "color": "#D1E4DD", + "name": "Green" + }, + { + "slug": "blue", + "color": "#D1DFE4", + "name": "Blue" + }, + { + "slug": "purple", + "color": "#D1D1E4", + "name": "Purple" + }, + { + "slug": "red", + "color": "#E4D1D1", + "name": "Red" + }, + { + "slug": "orange", + "color": "#E4DAD1", + "name": "Orange" + }, + { + "slug": "yellow", + "color": "#EEEADD", + "name": "Yellow" + }, + { + "slug": "white", + "color": "#FFFFFF", + "name": "White" + } + ] + }, + "gradients": { + "core": [ + { + "name": "Vivid cyan blue to vivid purple", + "gradient": "linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)", + "slug": "vivid-cyan-blue-to-vivid-purple" + }, + { + "name": "Light green cyan to vivid green cyan", + "gradient": "linear-gradient(135deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)", + "slug": "light-green-cyan-to-vivid-green-cyan" + }, + { + "name": "Luminous vivid amber to luminous vivid orange", + "gradient": "linear-gradient(135deg,rgba(252,185,0,1) 0%,rgba(255,105,0,1) 100%)", + "slug": "luminous-vivid-amber-to-luminous-vivid-orange" + }, + { + "name": "Luminous vivid orange to vivid red", + "gradient": "linear-gradient(135deg,rgba(255,105,0,1) 0%,rgb(207,46,46) 100%)", + "slug": "luminous-vivid-orange-to-vivid-red" + }, + { + "name": "Very light gray to cyan bluish gray", + "gradient": "linear-gradient(135deg,rgb(238,238,238) 0%,rgb(169,184,195) 100%)", + "slug": "very-light-gray-to-cyan-bluish-gray" + }, + { + "name": "Cool to warm spectrum", + "gradient": "linear-gradient(135deg,rgb(74,234,220) 0%,rgb(151,120,209) 20%,rgb(207,42,186) 40%,rgb(238,44,130) 60%,rgb(251,105,98) 80%,rgb(254,248,76) 100%)", + "slug": "cool-to-warm-spectrum" + }, + { + "name": "Blush light purple", + "gradient": "linear-gradient(135deg,rgb(255,206,236) 0%,rgb(152,150,240) 100%)", + "slug": "blush-light-purple" + }, + { + "name": "Blush bordeaux", + "gradient": "linear-gradient(135deg,rgb(254,205,165) 0%,rgb(254,45,45) 50%,rgb(107,0,62) 100%)", + "slug": "blush-bordeaux" + }, + { + "name": "Luminous dusk", + "gradient": "linear-gradient(135deg,rgb(255,203,112) 0%,rgb(199,81,192) 50%,rgb(65,88,208) 100%)", + "slug": "luminous-dusk" + }, + { + "name": "Pale ocean", + "gradient": "linear-gradient(135deg,rgb(255,245,203) 0%,rgb(182,227,212) 50%,rgb(51,167,181) 100%)", + "slug": "pale-ocean" + }, + { + "name": "Electric grass", + "gradient": "linear-gradient(135deg,rgb(202,248,128) 0%,rgb(113,206,126) 100%)", + "slug": "electric-grass" + }, + { + "name": "Midnight", + "gradient": "linear-gradient(135deg,rgb(2,3,129) 0%,rgb(40,116,252) 100%)", + "slug": "midnight" + } + ], + "theme": [ + { + "slug": "purple-to-yellow", + "gradient": "linear-gradient(160deg, var(--wp--preset--color--purple), var(--wp--preset--color--yellow))", + "name": "Purple to Yellow" + }, + { + "slug": "yellow-to-purple", + "gradient": "linear-gradient(160deg, var(--wp--preset--color--yellow), var(--wp--preset--color--purple))", + "name": "Yellow to Purple" + }, + { + "slug": "green-to-yellow", + "gradient": "linear-gradient(160deg, var(--wp--preset--color--green), var(--wp--preset--color--yellow))", + "name": "Green to Yellow" + }, + { + "slug": "yellow-to-green", + "gradient": "linear-gradient(160deg, var(--wp--preset--color--yellow), var(--wp--preset--color--green))", + "name": "Yellow to Green" + }, + { + "slug": "red-to-yellow", + "gradient": "linear-gradient(160deg, var(--wp--preset--color--red), var(--wp--preset--color--yellow))", + "name": "Red to Yellow" + }, + { + "slug": "yellow-to-red", + "gradient": "linear-gradient(160deg, var(--wp--preset--color--yellow), var(--wp--preset--color--red))", + "name": "Yellow to Red" + }, + { + "slug": "purple-to-red", + "gradient": "linear-gradient(160deg, var(--wp--preset--color--purple), var(--wp--preset--color--red))", + "name": "Purple to Red" + }, + { + "slug": "red-to-purple", + "gradient": "linear-gradient(160deg, var(--wp--preset--color--red), var(--wp--preset--color--purple))", + "name": "Red to Purple" + } + ] + }, "duotone": [ { "name": "Dark grayscale", @@ -336,38 +620,107 @@ "customFontWeight": true, "customTextTransforms": true, "customTextDecorations": true, - "fontFamilies": [ - { - "fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif", - "slug": "system-font", - "name": "System Font" - }, - { - "fontFamily": "Helvetica Neue, Helvetica, Arial, sans-serif", - "slug": "helvetica-arial" - }, - { - "fontFamily": "Geneva, Tahoma, Verdana, sans-serif", - "slug": "geneva-verdana" - }, - { - "fontFamily": "Cambria, Georgia, serif", - "slug": "cambria-georgia" - }, - { - "fontFamily": "Hoefler Text, Baskerville Old Face, Garamond, Times New Roman, serif", - "slug": "hoefler-times-new-roman" - } - ] + "customLetterSpacing": true, + "fontSizes": { + "core": [ + { + "name": "Small", + "slug": "small", + "size": "13px" + }, + { + "name": "Normal", + "slug": "normal", + "size": "16px" + }, + { + "name": "Medium", + "slug": "medium", + "size": "20px" + }, + { + "name": "Large", + "slug": "large", + "size": "36px" + }, + { + "name": "Huge", + "slug": "huge", + "size": "42px" + } + ], + "theme": [ + { + "slug": "extra-small", + "size": "16px", + "name": "Extra small" + }, + { + "slug": "small", + "size": "18px", + "name": "Small" + }, + { + "slug": "normal", + "size": "20px", + "name": "Normal" + }, + { + "slug": "large", + "size": "24px", + "name": "Large" + }, + { + "slug": "extra-large", + "size": "40px", + "name": "Extra large" + }, + { + "slug": "huge", + "size": "96px", + "name": "Huge" + }, + { + "slug": "gigantic", + "size": "144px", + "name": "Gigantic" + } + ] + }, + "fontFamilies": { + "theme": [ + { + "fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif", + "slug": "system-font", + "name": "System Font" + }, + { + "fontFamily": "Helvetica Neue, Helvetica, Arial, sans-serif", + "slug": "helvetica-arial" + }, + { + "fontFamily": "Geneva, Tahoma, Verdana, sans-serif", + "slug": "geneva-verdana" + }, + { + "fontFamily": "Cambria, Georgia, serif", + "slug": "cambria-georgia" + }, + { + "fontFamily": "Hoefler Text, Baskerville Old Face, Garamond, Times New Roman, serif", + "slug": "hoefler-times-new-roman" + } + ] + } }, "spacing": { "customMargin": false }, "border": { - "customColor": false, - "customRadius": false, - "customStyle": false, - "customWidth": false + "customColor": true, + "customRadius": true, + "customStyle": true, + "customWidth": true }, "blocks": { "core/button": { @@ -399,66 +752,6 @@ } }, "colors": [ - { - "name": "Cyan bluish gray", - "slug": "cyan-bluish-gray", - "color": "#abb8c3", - "origin": "core" - }, - { - "name": "Pale pink", - "slug": "pale-pink", - "color": "#f78da7", - "origin": "core" - }, - { - "name": "Vivid red", - "slug": "vivid-red", - "color": "#cf2e2e", - "origin": "core" - }, - { - "name": "Luminous vivid orange", - "slug": "luminous-vivid-orange", - "color": "#ff6900", - "origin": "core" - }, - { - "name": "Luminous vivid amber", - "slug": "luminous-vivid-amber", - "color": "#fcb900", - "origin": "core" - }, - { - "name": "Light green cyan", - "slug": "light-green-cyan", - "color": "#7bdcb5", - "origin": "core" - }, - { - "name": "Vivid green cyan", - "slug": "vivid-green-cyan", - "color": "#00d084", - "origin": "core" - }, - { - "name": "Pale cyan blue", - "slug": "pale-cyan-blue", - "color": "#8ed1fc", - "origin": "core" - }, - { - "name": "Vivid cyan blue", - "slug": "vivid-cyan-blue", - "color": "#0693e3", - "origin": "core" - }, - { - "name": "Vivid purple", - "slug": "vivid-purple", - "color": "#9b51e0", - "origin": "core" - }, { "slug": "black", "color": "#000000", @@ -511,78 +804,6 @@ } ], "gradients": [ - { - "name": "Vivid cyan blue to vivid purple", - "gradient": "linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)", - "slug": "vivid-cyan-blue-to-vivid-purple", - "origin": "core" - }, - { - "name": "Light green cyan to vivid green cyan", - "gradient": "linear-gradient(135deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)", - "slug": "light-green-cyan-to-vivid-green-cyan", - "origin": "core" - }, - { - "name": "Luminous vivid amber to luminous vivid orange", - "gradient": "linear-gradient(135deg,rgba(252,185,0,1) 0%,rgba(255,105,0,1) 100%)", - "slug": "luminous-vivid-amber-to-luminous-vivid-orange", - "origin": "core" - }, - { - "name": "Luminous vivid orange to vivid red", - "gradient": "linear-gradient(135deg,rgba(255,105,0,1) 0%,rgb(207,46,46) 100%)", - "slug": "luminous-vivid-orange-to-vivid-red", - "origin": "core" - }, - { - "name": "Very light gray to cyan bluish gray", - "gradient": "linear-gradient(135deg,rgb(238,238,238) 0%,rgb(169,184,195) 100%)", - "slug": "very-light-gray-to-cyan-bluish-gray", - "origin": "core" - }, - { - "name": "Cool to warm spectrum", - "gradient": "linear-gradient(135deg,rgb(74,234,220) 0%,rgb(151,120,209) 20%,rgb(207,42,186) 40%,rgb(238,44,130) 60%,rgb(251,105,98) 80%,rgb(254,248,76) 100%)", - "slug": "cool-to-warm-spectrum", - "origin": "core" - }, - { - "name": "Blush light purple", - "gradient": "linear-gradient(135deg,rgb(255,206,236) 0%,rgb(152,150,240) 100%)", - "slug": "blush-light-purple", - "origin": "core" - }, - { - "name": "Blush bordeaux", - "gradient": "linear-gradient(135deg,rgb(254,205,165) 0%,rgb(254,45,45) 50%,rgb(107,0,62) 100%)", - "slug": "blush-bordeaux", - "origin": "core" - }, - { - "name": "Luminous dusk", - "gradient": "linear-gradient(135deg,rgb(255,203,112) 0%,rgb(199,81,192) 50%,rgb(65,88,208) 100%)", - "slug": "luminous-dusk", - "origin": "core" - }, - { - "name": "Pale ocean", - "gradient": "linear-gradient(135deg,rgb(255,245,203) 0%,rgb(182,227,212) 50%,rgb(51,167,181) 100%)", - "slug": "pale-ocean", - "origin": "core" - }, - { - "name": "Electric grass", - "gradient": "linear-gradient(135deg,rgb(202,248,128) 0%,rgb(113,206,126) 100%)", - "slug": "electric-grass", - "origin": "core" - }, - { - "name": "Midnight", - "gradient": "linear-gradient(135deg,rgb(2,3,129) 0%,rgb(40,116,252) 100%)", - "slug": "midnight", - "origin": "core" - }, { "slug": "purple-to-yellow", "gradient": "linear-gradient(160deg, var(--wp--preset--color--purple), var(--wp--preset--color--yellow))",