From 952e72e6a485413023c88b4cb3cc25494d74e9e5 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 14 Aug 2023 13:28:10 -0400 Subject: [PATCH 01/15] docs: Update documentation to reference new Appium server start script --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1ddeaa7182..ed4062f166 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ To run a single test instead of the entire suite, use `npm run device-tests:loca `TEST_RN_PLATFORM=ios npm run device-tests:local gutenberg-editor-paragraph.test` -Note: You might experience problems that seem to be related to the tests starting the Appium server, e.g. errors that say `Connection Refused`, `Connection Reset` or `The requested environment is not available`. For now, you can manually start the Appium server via [Appium Inspector](https://github.com/appium/appium-inspector/) or the CLI, then change the port number in the tests while (optionally) commenting out related code in the `beforeAll` and `afterAll` block. +Note: You might experience problems that seem to be related to the tests starting the Appium server, e.g. errors that say `Connection Refused`, `Connection Reset` or `The requested environment is not available`. If so, you can manually start the Appium server via `npm run native appium:start`, and (optionally) comment out related code in the `beforeAll` and `afterAll` block. For a more detailed outline of the UI tests and how to get started writing one, please visit the [UI Test documentation](https://github.com/WordPress/gutenberg/blob/HEAD/packages/react-native-editor/__device-tests__/README.md) and our [contributing guide](https://github.com/WordPress/gutenberg/blob/HEAD/packages/react-native-editor/__device-tests__/CONTRIBUTING.md). From 72859afcc1a45ba4a9bb8087b825336b74d3b1cf Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 14 Aug 2023 14:29:04 -0400 Subject: [PATCH 02/15] build: Update Gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index 77b25b01db..ee86c7591e 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit 77b25b01db3b29a9f8aa2bde5a235219dc8d17ae +Subproject commit ee86c7591e8f0dd534d0b707bc75d2b6b7fa2af2 From 9c26e8917cdb6f0f92c70fd88b7117bd34e82959 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 16 Aug 2023 16:11:30 +1000 Subject: [PATCH 03/15] Generate assets for XCFramework in its folder and add to project --- ios-xcframework/.gitignore | 3 + .../project.pbxproj | 416 ++++++++++++++++++ package.json | 2 +- 3 files changed, 420 insertions(+), 1 deletion(-) diff --git a/ios-xcframework/.gitignore b/ios-xcframework/.gitignore index e32dacb257..1f0f2e8aa6 100644 --- a/ios-xcframework/.gitignore +++ b/ios-xcframework/.gitignore @@ -17,3 +17,6 @@ build # This file takes precedence over .xcode.env. # Developers can use it to set a custom value without having to update .xcode.env after every `pod install` .xcode.env.local + +# This folder is generated at build-time by the `bundle:ios:text` command from the package.json +Gutenberg/Resources/assets/ diff --git a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj index f3a7a3987e..d7fabcc8b2 100644 --- a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj +++ b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj @@ -25,6 +25,68 @@ 3F12364D29F6B21300AF54A4 /* editor-behavior-overrides.js in Resources */ = {isa = PBXBuildFile; fileRef = 3F12364429F6B21300AF54A4 /* editor-behavior-overrides.js */; }; 3F12364E29F6B21300AF54A4 /* local-storage-overrides.json in Resources */ = {isa = PBXBuildFile; fileRef = 3F12364529F6B21300AF54A4 /* local-storage-overrides.json */; }; 3F12365029F6B23300AF54A4 /* supported-blocks.json in Resources */ = {isa = PBXBuildFile; fileRef = 3F12364F29F6B23300AF54A4 /* supported-blocks.json */; }; + 3F8D0D092A8C9FFB008A5891 /* back-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CBD2A8C9FFA008A5891 /* back-icon@3x.png */; }; + 3F8D0D0A2A8C9FFB008A5891 /* back-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CBE2A8C9FFA008A5891 /* back-icon@2x.png */; }; + 3F8D0D0B2A8C9FFB008A5891 /* back-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CBF2A8C9FFA008A5891 /* back-icon.png */; }; + 3F8D0D0C2A8C9FFB008A5891 /* back-icon-mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CC02A8C9FFA008A5891 /* back-icon-mask.png */; }; + 3F8D0D0D2A8C9FFB008A5891 /* rich-text-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CC72A8C9FFA008A5891 /* rich-text-dark.png */; }; + 3F8D0D0E2A8C9FFB008A5891 /* move-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CC82A8C9FFA008A5891 /* move-dark.png */; }; + 3F8D0D0F2A8C9FFB008A5891 /* add-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CC92A8C9FFA008A5891 /* add-dark@3x.png */; }; + 3F8D0D102A8C9FFB008A5891 /* rich-text-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCA2A8C9FFA008A5891 /* rich-text-light@2x.png */; }; + 3F8D0D112A8C9FFB008A5891 /* rich-text-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCB2A8C9FFA008A5891 /* rich-text-light@3x.png */; }; + 3F8D0D122A8C9FFB008A5891 /* add-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCC2A8C9FFA008A5891 /* add-dark@2x.png */; }; + 3F8D0D132A8C9FFB008A5891 /* options-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCD2A8C9FFB008A5891 /* options-dark@3x.png */; }; + 3F8D0D142A8C9FFB008A5891 /* move-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCE2A8C9FFB008A5891 /* move-light@3x.png */; }; + 3F8D0D152A8C9FFB008A5891 /* block-layout-collage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCF2A8C9FFB008A5891 /* block-layout-collage@2x.png */; }; + 3F8D0D162A8C9FFB008A5891 /* settings-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD02A8C9FFB008A5891 /* settings-light.png */; }; + 3F8D0D172A8C9FFB008A5891 /* add-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD12A8C9FFB008A5891 /* add-light.png */; }; + 3F8D0D182A8C9FFB008A5891 /* embed-media-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD22A8C9FFB008A5891 /* embed-media-dark@2x.png */; }; + 3F8D0D192A8C9FFB008A5891 /* embed-media-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD32A8C9FFB008A5891 /* embed-media-dark@3x.png */; }; + 3F8D0D1A2A8C9FFB008A5891 /* block-layout-collage@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD42A8C9FFB008A5891 /* block-layout-collage@3x.png */; }; + 3F8D0D1B2A8C9FFB008A5891 /* options-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD52A8C9FFB008A5891 /* options-dark@2x.png */; }; + 3F8D0D1C2A8C9FFB008A5891 /* move-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD62A8C9FFB008A5891 /* move-light@2x.png */; }; + 3F8D0D1D2A8C9FFB008A5891 /* move-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD72A8C9FFB008A5891 /* move-dark@3x.png */; }; + 3F8D0D1E2A8C9FFB008A5891 /* build-layouts-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD82A8C9FFB008A5891 /* build-layouts-dark.png */; }; + 3F8D0D1F2A8C9FFB008A5891 /* settings-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD92A8C9FFB008A5891 /* settings-dark@3x.png */; }; + 3F8D0D202A8C9FFB008A5891 /* build-layouts-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDA2A8C9FFB008A5891 /* build-layouts-dark@3x.png */; }; + 3F8D0D212A8C9FFB008A5891 /* build-layouts-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDB2A8C9FFB008A5891 /* build-layouts-light.png */; }; + 3F8D0D222A8C9FFB008A5891 /* build-layouts-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDC2A8C9FFB008A5891 /* build-layouts-dark@2x.png */; }; + 3F8D0D232A8C9FFB008A5891 /* options-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDD2A8C9FFB008A5891 /* options-dark.png */; }; + 3F8D0D242A8C9FFB008A5891 /* settings-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDE2A8C9FFB008A5891 /* settings-dark@2x.png */; }; + 3F8D0D252A8C9FFB008A5891 /* rich-text-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDF2A8C9FFB008A5891 /* rich-text-light.png */; }; + 3F8D0D262A8C9FFB008A5891 /* move-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE02A8C9FFB008A5891 /* move-dark@2x.png */; }; + 3F8D0D272A8C9FFB008A5891 /* options-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE12A8C9FFB008A5891 /* options-light.png */; }; + 3F8D0D282A8C9FFB008A5891 /* build-layouts-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE22A8C9FFB008A5891 /* build-layouts-light@2x.png */; }; + 3F8D0D292A8C9FFB008A5891 /* drag-and-drop-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE32A8C9FFB008A5891 /* drag-and-drop-dark@2x.png */; }; + 3F8D0D2A2A8C9FFB008A5891 /* settings-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE42A8C9FFB008A5891 /* settings-light@3x.png */; }; + 3F8D0D2B2A8C9FFB008A5891 /* drag-and-drop-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE52A8C9FFB008A5891 /* drag-and-drop-dark.png */; }; + 3F8D0D2C2A8C9FFB008A5891 /* embed-media-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE62A8C9FFB008A5891 /* embed-media-dark.png */; }; + 3F8D0D2D2A8C9FFB008A5891 /* rich-text-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE72A8C9FFB008A5891 /* rich-text-dark@2x.png */; }; + 3F8D0D2E2A8C9FFB008A5891 /* options-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE82A8C9FFB008A5891 /* options-light@2x.png */; }; + 3F8D0D2F2A8C9FFB008A5891 /* drag-and-drop-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE92A8C9FFB008A5891 /* drag-and-drop-light@3x.png */; }; + 3F8D0D302A8C9FFB008A5891 /* embed-media-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEA2A8C9FFB008A5891 /* embed-media-light@3x.png */; }; + 3F8D0D312A8C9FFB008A5891 /* add-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEB2A8C9FFB008A5891 /* add-light@3x.png */; }; + 3F8D0D322A8C9FFB008A5891 /* embed-media-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEC2A8C9FFB008A5891 /* embed-media-light.png */; }; + 3F8D0D332A8C9FFB008A5891 /* add-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CED2A8C9FFB008A5891 /* add-light@2x.png */; }; + 3F8D0D342A8C9FFB008A5891 /* embed-media-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEE2A8C9FFB008A5891 /* embed-media-light@2x.png */; }; + 3F8D0D352A8C9FFB008A5891 /* drag-and-drop-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEF2A8C9FFB008A5891 /* drag-and-drop-light@2x.png */; }; + 3F8D0D362A8C9FFB008A5891 /* move-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF02A8C9FFB008A5891 /* move-light.png */; }; + 3F8D0D372A8C9FFB008A5891 /* rich-text-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF12A8C9FFB008A5891 /* rich-text-dark@3x.png */; }; + 3F8D0D382A8C9FFB008A5891 /* options-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF22A8C9FFB008A5891 /* options-light@3x.png */; }; + 3F8D0D392A8C9FFB008A5891 /* settings-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF32A8C9FFB008A5891 /* settings-dark.png */; }; + 3F8D0D3A2A8C9FFB008A5891 /* drag-and-drop-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF42A8C9FFB008A5891 /* drag-and-drop-light.png */; }; + 3F8D0D3B2A8C9FFB008A5891 /* settings-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF52A8C9FFB008A5891 /* settings-light@2x.png */; }; + 3F8D0D3C2A8C9FFB008A5891 /* add-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF62A8C9FFB008A5891 /* add-dark.png */; }; + 3F8D0D3D2A8C9FFB008A5891 /* block-layout-collage.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF72A8C9FFB008A5891 /* block-layout-collage.png */; }; + 3F8D0D3E2A8C9FFB008A5891 /* build-layouts-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF82A8C9FFB008A5891 /* build-layouts-light@3x.png */; }; + 3F8D0D3F2A8C9FFB008A5891 /* drag-and-drop-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF92A8C9FFB008A5891 /* drag-and-drop-dark@3x.png */; }; + 3F8D0D402A8C9FFB008A5891 /* tiled-gallery_example-2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D012A8C9FFB008A5891 /* tiled-gallery_example-2.jpg */; }; + 3F8D0D412A8C9FFB008A5891 /* tiled-gallery_example-3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D022A8C9FFB008A5891 /* tiled-gallery_example-3.jpg */; }; + 3F8D0D422A8C9FFB008A5891 /* tiled-gallery_example-1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D032A8C9FFB008A5891 /* tiled-gallery_example-1.jpg */; }; + 3F8D0D432A8C9FFB008A5891 /* tiled-gallery_example-4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D042A8C9FFB008A5891 /* tiled-gallery_example-4.jpg */; }; + 3F8D0D442A8C9FFB008A5891 /* tiled-gallery_example-5.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D052A8C9FFB008A5891 /* tiled-gallery_example-5.jpg */; }; + 3F8D0D452A8C9FFB008A5891 /* tiled-gallery_example-6.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D062A8C9FFB008A5891 /* tiled-gallery_example-6.jpg */; }; + 3F8D0D462A8C9FFB008A5891 /* story_example-1.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D082A8C9FFB008A5891 /* story_example-1.png */; }; 3FA0C5812A1C8C9700600A9A /* App.js in Resources */ = {isa = PBXBuildFile; fileRef = 3FA0C5802A1C8C9700600A9A /* App.js */; }; 3FC7862B2A53047D00A0DDAF /* hermes.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FC7862A2A53047D00A0DDAF /* hermes.xcframework */; }; 3FE06AC329F3F61300F752AD /* Gutenberg.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FE06AC229F3F61300F752AD /* Gutenberg.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -56,6 +118,68 @@ 3F12364429F6B21300AF54A4 /* editor-behavior-overrides.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = "editor-behavior-overrides.js"; path = "../../../gutenberg/packages/react-native-bridge/common/gutenberg-web-single-block/editor-behavior-overrides.js"; sourceTree = ""; }; 3F12364529F6B21300AF54A4 /* local-storage-overrides.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "local-storage-overrides.json"; path = "../../../gutenberg/packages/react-native-bridge/common/gutenberg-web-single-block/local-storage-overrides.json"; sourceTree = ""; }; 3F12364F29F6B23300AF54A4 /* supported-blocks.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "supported-blocks.json"; path = "../../../src/block-support/supported-blocks.json"; sourceTree = ""; }; + 3F8D0CBD2A8C9FFA008A5891 /* back-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@3x.png"; sourceTree = ""; }; + 3F8D0CBE2A8C9FFA008A5891 /* back-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@2x.png"; sourceTree = ""; }; + 3F8D0CBF2A8C9FFA008A5891 /* back-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon.png"; sourceTree = ""; }; + 3F8D0CC02A8C9FFA008A5891 /* back-icon-mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon-mask.png"; sourceTree = ""; }; + 3F8D0CC72A8C9FFA008A5891 /* rich-text-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-dark.png"; sourceTree = ""; }; + 3F8D0CC82A8C9FFA008A5891 /* move-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-dark.png"; sourceTree = ""; }; + 3F8D0CC92A8C9FFA008A5891 /* add-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-dark@3x.png"; sourceTree = ""; }; + 3F8D0CCA2A8C9FFA008A5891 /* rich-text-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-light@2x.png"; sourceTree = ""; }; + 3F8D0CCB2A8C9FFA008A5891 /* rich-text-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-light@3x.png"; sourceTree = ""; }; + 3F8D0CCC2A8C9FFA008A5891 /* add-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-dark@2x.png"; sourceTree = ""; }; + 3F8D0CCD2A8C9FFB008A5891 /* options-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-dark@3x.png"; sourceTree = ""; }; + 3F8D0CCE2A8C9FFB008A5891 /* move-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-light@3x.png"; sourceTree = ""; }; + 3F8D0CCF2A8C9FFB008A5891 /* block-layout-collage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "block-layout-collage@2x.png"; sourceTree = ""; }; + 3F8D0CD02A8C9FFB008A5891 /* settings-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-light.png"; sourceTree = ""; }; + 3F8D0CD12A8C9FFB008A5891 /* add-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-light.png"; sourceTree = ""; }; + 3F8D0CD22A8C9FFB008A5891 /* embed-media-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-dark@2x.png"; sourceTree = ""; }; + 3F8D0CD32A8C9FFB008A5891 /* embed-media-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-dark@3x.png"; sourceTree = ""; }; + 3F8D0CD42A8C9FFB008A5891 /* block-layout-collage@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "block-layout-collage@3x.png"; sourceTree = ""; }; + 3F8D0CD52A8C9FFB008A5891 /* options-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-dark@2x.png"; sourceTree = ""; }; + 3F8D0CD62A8C9FFB008A5891 /* move-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-light@2x.png"; sourceTree = ""; }; + 3F8D0CD72A8C9FFB008A5891 /* move-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-dark@3x.png"; sourceTree = ""; }; + 3F8D0CD82A8C9FFB008A5891 /* build-layouts-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-dark.png"; sourceTree = ""; }; + 3F8D0CD92A8C9FFB008A5891 /* settings-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-dark@3x.png"; sourceTree = ""; }; + 3F8D0CDA2A8C9FFB008A5891 /* build-layouts-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-dark@3x.png"; sourceTree = ""; }; + 3F8D0CDB2A8C9FFB008A5891 /* build-layouts-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-light.png"; sourceTree = ""; }; + 3F8D0CDC2A8C9FFB008A5891 /* build-layouts-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-dark@2x.png"; sourceTree = ""; }; + 3F8D0CDD2A8C9FFB008A5891 /* options-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-dark.png"; sourceTree = ""; }; + 3F8D0CDE2A8C9FFB008A5891 /* settings-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-dark@2x.png"; sourceTree = ""; }; + 3F8D0CDF2A8C9FFB008A5891 /* rich-text-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-light.png"; sourceTree = ""; }; + 3F8D0CE02A8C9FFB008A5891 /* move-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-dark@2x.png"; sourceTree = ""; }; + 3F8D0CE12A8C9FFB008A5891 /* options-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-light.png"; sourceTree = ""; }; + 3F8D0CE22A8C9FFB008A5891 /* build-layouts-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-light@2x.png"; sourceTree = ""; }; + 3F8D0CE32A8C9FFB008A5891 /* drag-and-drop-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-dark@2x.png"; sourceTree = ""; }; + 3F8D0CE42A8C9FFB008A5891 /* settings-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-light@3x.png"; sourceTree = ""; }; + 3F8D0CE52A8C9FFB008A5891 /* drag-and-drop-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-dark.png"; sourceTree = ""; }; + 3F8D0CE62A8C9FFB008A5891 /* embed-media-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-dark.png"; sourceTree = ""; }; + 3F8D0CE72A8C9FFB008A5891 /* rich-text-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-dark@2x.png"; sourceTree = ""; }; + 3F8D0CE82A8C9FFB008A5891 /* options-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-light@2x.png"; sourceTree = ""; }; + 3F8D0CE92A8C9FFB008A5891 /* drag-and-drop-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-light@3x.png"; sourceTree = ""; }; + 3F8D0CEA2A8C9FFB008A5891 /* embed-media-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-light@3x.png"; sourceTree = ""; }; + 3F8D0CEB2A8C9FFB008A5891 /* add-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-light@3x.png"; sourceTree = ""; }; + 3F8D0CEC2A8C9FFB008A5891 /* embed-media-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-light.png"; sourceTree = ""; }; + 3F8D0CED2A8C9FFB008A5891 /* add-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-light@2x.png"; sourceTree = ""; }; + 3F8D0CEE2A8C9FFB008A5891 /* embed-media-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-light@2x.png"; sourceTree = ""; }; + 3F8D0CEF2A8C9FFB008A5891 /* drag-and-drop-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-light@2x.png"; sourceTree = ""; }; + 3F8D0CF02A8C9FFB008A5891 /* move-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-light.png"; sourceTree = ""; }; + 3F8D0CF12A8C9FFB008A5891 /* rich-text-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-dark@3x.png"; sourceTree = ""; }; + 3F8D0CF22A8C9FFB008A5891 /* options-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-light@3x.png"; sourceTree = ""; }; + 3F8D0CF32A8C9FFB008A5891 /* settings-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-dark.png"; sourceTree = ""; }; + 3F8D0CF42A8C9FFB008A5891 /* drag-and-drop-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-light.png"; sourceTree = ""; }; + 3F8D0CF52A8C9FFB008A5891 /* settings-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-light@2x.png"; sourceTree = ""; }; + 3F8D0CF62A8C9FFB008A5891 /* add-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-dark.png"; sourceTree = ""; }; + 3F8D0CF72A8C9FFB008A5891 /* block-layout-collage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "block-layout-collage.png"; sourceTree = ""; }; + 3F8D0CF82A8C9FFB008A5891 /* build-layouts-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-light@3x.png"; sourceTree = ""; }; + 3F8D0CF92A8C9FFB008A5891 /* drag-and-drop-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-dark@3x.png"; sourceTree = ""; }; + 3F8D0D012A8C9FFB008A5891 /* tiled-gallery_example-2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-2.jpg"; sourceTree = ""; }; + 3F8D0D022A8C9FFB008A5891 /* tiled-gallery_example-3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-3.jpg"; sourceTree = ""; }; + 3F8D0D032A8C9FFB008A5891 /* tiled-gallery_example-1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-1.jpg"; sourceTree = ""; }; + 3F8D0D042A8C9FFB008A5891 /* tiled-gallery_example-4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-4.jpg"; sourceTree = ""; }; + 3F8D0D052A8C9FFB008A5891 /* tiled-gallery_example-5.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-5.jpg"; sourceTree = ""; }; + 3F8D0D062A8C9FFB008A5891 /* tiled-gallery_example-6.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-6.jpg"; sourceTree = ""; }; + 3F8D0D082A8C9FFB008A5891 /* story_example-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "story_example-1.png"; sourceTree = ""; }; 3FA0C5802A1C8C9700600A9A /* App.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = App.js; path = ../../../bundle/ios/App.js; sourceTree = ""; }; 3FC7862A2A53047D00A0DDAF /* hermes.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = hermes.xcframework; path = "Pods/hermes-engine/destroot/Library/Frameworks/universal/hermes.xcframework"; sourceTree = ""; }; 3FE06ABF29F3F61300F752AD /* Gutenberg.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Gutenberg.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -87,6 +211,7 @@ 3F12363C29F6B1E900AF54A4 /* Resources */ = { isa = PBXGroup; children = ( + 3F8D0CB62A8C9FFA008A5891 /* assets */, 3FA0C5802A1C8C9700600A9A /* App.js */, 3F12363F29F6B21300AF54A4 /* content-functions.js */, 3F12364429F6B21300AF54A4 /* editor-behavior-overrides.js */, @@ -102,6 +227,235 @@ path = Resources; sourceTree = ""; }; + 3F8D0CB62A8C9FFA008A5891 /* assets */ = { + isa = PBXGroup; + children = ( + 3F8D0CB72A8C9FFA008A5891 /* gutenberg */, + 3F8D0CFA2A8C9FFB008A5891 /* jetpack */, + ); + path = assets; + sourceTree = ""; + }; + 3F8D0CB72A8C9FFA008A5891 /* gutenberg */ = { + isa = PBXGroup; + children = ( + 3F8D0CB82A8C9FFA008A5891 /* node_modules */, + 3F8D0CC12A8C9FFA008A5891 /* packages */, + ); + path = gutenberg; + sourceTree = ""; + }; + 3F8D0CB82A8C9FFA008A5891 /* node_modules */ = { + isa = PBXGroup; + children = ( + 3F8D0CB92A8C9FFA008A5891 /* @react-navigation */, + ); + path = node_modules; + sourceTree = ""; + }; + 3F8D0CB92A8C9FFA008A5891 /* @react-navigation */ = { + isa = PBXGroup; + children = ( + 3F8D0CBA2A8C9FFA008A5891 /* elements */, + ); + path = "@react-navigation"; + sourceTree = ""; + }; + 3F8D0CBA2A8C9FFA008A5891 /* elements */ = { + isa = PBXGroup; + children = ( + 3F8D0CBB2A8C9FFA008A5891 /* src */, + ); + path = elements; + sourceTree = ""; + }; + 3F8D0CBB2A8C9FFA008A5891 /* src */ = { + isa = PBXGroup; + children = ( + 3F8D0CBC2A8C9FFA008A5891 /* assets */, + ); + path = src; + sourceTree = ""; + }; + 3F8D0CBC2A8C9FFA008A5891 /* assets */ = { + isa = PBXGroup; + children = ( + 3F8D0CBD2A8C9FFA008A5891 /* back-icon@3x.png */, + 3F8D0CBE2A8C9FFA008A5891 /* back-icon@2x.png */, + 3F8D0CBF2A8C9FFA008A5891 /* back-icon.png */, + 3F8D0CC02A8C9FFA008A5891 /* back-icon-mask.png */, + ); + path = assets; + sourceTree = ""; + }; + 3F8D0CC12A8C9FFA008A5891 /* packages */ = { + isa = PBXGroup; + children = ( + 3F8D0CC22A8C9FFA008A5891 /* editor */, + ); + path = packages; + sourceTree = ""; + }; + 3F8D0CC22A8C9FFA008A5891 /* editor */ = { + isa = PBXGroup; + children = ( + 3F8D0CC32A8C9FFA008A5891 /* src */, + ); + path = editor; + sourceTree = ""; + }; + 3F8D0CC32A8C9FFA008A5891 /* src */ = { + isa = PBXGroup; + children = ( + 3F8D0CC42A8C9FFA008A5891 /* components */, + ); + path = src; + sourceTree = ""; + }; + 3F8D0CC42A8C9FFA008A5891 /* components */ = { + isa = PBXGroup; + children = ( + 3F8D0CC52A8C9FFA008A5891 /* editor-help */, + ); + path = components; + sourceTree = ""; + }; + 3F8D0CC52A8C9FFA008A5891 /* editor-help */ = { + isa = PBXGroup; + children = ( + 3F8D0CC62A8C9FFA008A5891 /* images */, + ); + path = "editor-help"; + sourceTree = ""; + }; + 3F8D0CC62A8C9FFA008A5891 /* images */ = { + isa = PBXGroup; + children = ( + 3F8D0CC72A8C9FFA008A5891 /* rich-text-dark.png */, + 3F8D0CC82A8C9FFA008A5891 /* move-dark.png */, + 3F8D0CC92A8C9FFA008A5891 /* add-dark@3x.png */, + 3F8D0CCA2A8C9FFA008A5891 /* rich-text-light@2x.png */, + 3F8D0CCB2A8C9FFA008A5891 /* rich-text-light@3x.png */, + 3F8D0CCC2A8C9FFA008A5891 /* add-dark@2x.png */, + 3F8D0CCD2A8C9FFB008A5891 /* options-dark@3x.png */, + 3F8D0CCE2A8C9FFB008A5891 /* move-light@3x.png */, + 3F8D0CCF2A8C9FFB008A5891 /* block-layout-collage@2x.png */, + 3F8D0CD02A8C9FFB008A5891 /* settings-light.png */, + 3F8D0CD12A8C9FFB008A5891 /* add-light.png */, + 3F8D0CD22A8C9FFB008A5891 /* embed-media-dark@2x.png */, + 3F8D0CD32A8C9FFB008A5891 /* embed-media-dark@3x.png */, + 3F8D0CD42A8C9FFB008A5891 /* block-layout-collage@3x.png */, + 3F8D0CD52A8C9FFB008A5891 /* options-dark@2x.png */, + 3F8D0CD62A8C9FFB008A5891 /* move-light@2x.png */, + 3F8D0CD72A8C9FFB008A5891 /* move-dark@3x.png */, + 3F8D0CD82A8C9FFB008A5891 /* build-layouts-dark.png */, + 3F8D0CD92A8C9FFB008A5891 /* settings-dark@3x.png */, + 3F8D0CDA2A8C9FFB008A5891 /* build-layouts-dark@3x.png */, + 3F8D0CDB2A8C9FFB008A5891 /* build-layouts-light.png */, + 3F8D0CDC2A8C9FFB008A5891 /* build-layouts-dark@2x.png */, + 3F8D0CDD2A8C9FFB008A5891 /* options-dark.png */, + 3F8D0CDE2A8C9FFB008A5891 /* settings-dark@2x.png */, + 3F8D0CDF2A8C9FFB008A5891 /* rich-text-light.png */, + 3F8D0CE02A8C9FFB008A5891 /* move-dark@2x.png */, + 3F8D0CE12A8C9FFB008A5891 /* options-light.png */, + 3F8D0CE22A8C9FFB008A5891 /* build-layouts-light@2x.png */, + 3F8D0CE32A8C9FFB008A5891 /* drag-and-drop-dark@2x.png */, + 3F8D0CE42A8C9FFB008A5891 /* settings-light@3x.png */, + 3F8D0CE52A8C9FFB008A5891 /* drag-and-drop-dark.png */, + 3F8D0CE62A8C9FFB008A5891 /* embed-media-dark.png */, + 3F8D0CE72A8C9FFB008A5891 /* rich-text-dark@2x.png */, + 3F8D0CE82A8C9FFB008A5891 /* options-light@2x.png */, + 3F8D0CE92A8C9FFB008A5891 /* drag-and-drop-light@3x.png */, + 3F8D0CEA2A8C9FFB008A5891 /* embed-media-light@3x.png */, + 3F8D0CEB2A8C9FFB008A5891 /* add-light@3x.png */, + 3F8D0CEC2A8C9FFB008A5891 /* embed-media-light.png */, + 3F8D0CED2A8C9FFB008A5891 /* add-light@2x.png */, + 3F8D0CEE2A8C9FFB008A5891 /* embed-media-light@2x.png */, + 3F8D0CEF2A8C9FFB008A5891 /* drag-and-drop-light@2x.png */, + 3F8D0CF02A8C9FFB008A5891 /* move-light.png */, + 3F8D0CF12A8C9FFB008A5891 /* rich-text-dark@3x.png */, + 3F8D0CF22A8C9FFB008A5891 /* options-light@3x.png */, + 3F8D0CF32A8C9FFB008A5891 /* settings-dark.png */, + 3F8D0CF42A8C9FFB008A5891 /* drag-and-drop-light.png */, + 3F8D0CF52A8C9FFB008A5891 /* settings-light@2x.png */, + 3F8D0CF62A8C9FFB008A5891 /* add-dark.png */, + 3F8D0CF72A8C9FFB008A5891 /* block-layout-collage.png */, + 3F8D0CF82A8C9FFB008A5891 /* build-layouts-light@3x.png */, + 3F8D0CF92A8C9FFB008A5891 /* drag-and-drop-dark@3x.png */, + ); + path = images; + sourceTree = ""; + }; + 3F8D0CFA2A8C9FFB008A5891 /* jetpack */ = { + isa = PBXGroup; + children = ( + 3F8D0CFB2A8C9FFB008A5891 /* projects */, + ); + path = jetpack; + sourceTree = ""; + }; + 3F8D0CFB2A8C9FFB008A5891 /* projects */ = { + isa = PBXGroup; + children = ( + 3F8D0CFC2A8C9FFB008A5891 /* plugins */, + ); + path = projects; + sourceTree = ""; + }; + 3F8D0CFC2A8C9FFB008A5891 /* plugins */ = { + isa = PBXGroup; + children = ( + 3F8D0CFD2A8C9FFB008A5891 /* jetpack */, + ); + path = plugins; + sourceTree = ""; + }; + 3F8D0CFD2A8C9FFB008A5891 /* jetpack */ = { + isa = PBXGroup; + children = ( + 3F8D0CFE2A8C9FFB008A5891 /* extensions */, + ); + path = jetpack; + sourceTree = ""; + }; + 3F8D0CFE2A8C9FFB008A5891 /* extensions */ = { + isa = PBXGroup; + children = ( + 3F8D0CFF2A8C9FFB008A5891 /* blocks */, + ); + path = extensions; + sourceTree = ""; + }; + 3F8D0CFF2A8C9FFB008A5891 /* blocks */ = { + isa = PBXGroup; + children = ( + 3F8D0D002A8C9FFB008A5891 /* tiled-gallery */, + 3F8D0D072A8C9FFB008A5891 /* story */, + ); + path = blocks; + sourceTree = ""; + }; + 3F8D0D002A8C9FFB008A5891 /* tiled-gallery */ = { + isa = PBXGroup; + children = ( + 3F8D0D012A8C9FFB008A5891 /* tiled-gallery_example-2.jpg */, + 3F8D0D022A8C9FFB008A5891 /* tiled-gallery_example-3.jpg */, + 3F8D0D032A8C9FFB008A5891 /* tiled-gallery_example-1.jpg */, + 3F8D0D042A8C9FFB008A5891 /* tiled-gallery_example-4.jpg */, + 3F8D0D052A8C9FFB008A5891 /* tiled-gallery_example-5.jpg */, + 3F8D0D062A8C9FFB008A5891 /* tiled-gallery_example-6.jpg */, + ); + path = "tiled-gallery"; + sourceTree = ""; + }; + 3F8D0D072A8C9FFB008A5891 /* story */ = { + isa = PBXGroup; + children = ( + 3F8D0D082A8C9FFB008A5891 /* story_example-1.png */, + ); + path = story; + sourceTree = ""; + }; 3FE06AB329F3F46B00F752AD = { isa = PBXGroup; children = ( @@ -243,22 +597,84 @@ buildActionMask = 2147483647; files = ( 3FE06AD329F3F6DA00F752AD /* Project-Debug.xcconfig in Resources */, + 3F8D0D432A8C9FFB008A5891 /* tiled-gallery_example-4.jpg in Resources */, + 3F8D0D342A8C9FFB008A5891 /* embed-media-light@2x.png in Resources */, + 3F8D0D162A8C9FFB008A5891 /* settings-light.png in Resources */, + 3F8D0D2A2A8C9FFB008A5891 /* settings-light@3x.png in Resources */, + 3F8D0D122A8C9FFB008A5891 /* add-dark@2x.png in Resources */, + 3F8D0D0E2A8C9FFB008A5891 /* move-dark.png in Resources */, + 3F8D0D192A8C9FFB008A5891 /* embed-media-dark@3x.png in Resources */, + 3F8D0D1E2A8C9FFB008A5891 /* build-layouts-dark.png in Resources */, 3F12364E29F6B21300AF54A4 /* local-storage-overrides.json in Resources */, + 3F8D0D102A8C9FFB008A5891 /* rich-text-light@2x.png in Resources */, 3FE06ACE29F3F6DA00F752AD /* Gutenberg-Debug.xcconfig in Resources */, + 3F8D0D112A8C9FFB008A5891 /* rich-text-light@3x.png in Resources */, + 3F8D0D2D2A8C9FFB008A5891 /* rich-text-dark@2x.png in Resources */, + 3F8D0D1F2A8C9FFB008A5891 /* settings-dark@3x.png in Resources */, 3F12364829F6B21300AF54A4 /* content-functions.js in Resources */, + 3F8D0D462A8C9FFB008A5891 /* story_example-1.png in Resources */, + 3F8D0D322A8C9FFB008A5891 /* embed-media-light.png in Resources */, + 3F8D0D132A8C9FFB008A5891 /* options-dark@3x.png in Resources */, + 3F8D0D252A8C9FFB008A5891 /* rich-text-light.png in Resources */, + 3F8D0D0C2A8C9FFB008A5891 /* back-icon-mask.png in Resources */, 3F12364929F6B21300AF54A4 /* prevent-autosaves.js in Resources */, + 3F8D0D332A8C9FFB008A5891 /* add-light@2x.png in Resources */, + 3F8D0D302A8C9FFB008A5891 /* embed-media-light@3x.png in Resources */, 3FE06AD229F3F6DA00F752AD /* Gutenberg-Release.xcconfig in Resources */, + 3F8D0D0A2A8C9FFB008A5891 /* back-icon@2x.png in Resources */, + 3F8D0D2E2A8C9FFB008A5891 /* options-light@2x.png in Resources */, + 3F8D0D3A2A8C9FFB008A5891 /* drag-and-drop-light.png in Resources */, + 3F8D0D172A8C9FFB008A5891 /* add-light.png in Resources */, + 3F8D0D422A8C9FFB008A5891 /* tiled-gallery_example-1.jpg in Resources */, + 3F8D0D392A8C9FFB008A5891 /* settings-dark.png in Resources */, + 3F8D0D372A8C9FFB008A5891 /* rich-text-dark@3x.png in Resources */, + 3F8D0D292A8C9FFB008A5891 /* drag-and-drop-dark@2x.png in Resources */, + 3F8D0D1D2A8C9FFB008A5891 /* move-dark@3x.png in Resources */, + 3F8D0D282A8C9FFB008A5891 /* build-layouts-light@2x.png in Resources */, + 3F8D0D3E2A8C9FFB008A5891 /* build-layouts-light@3x.png in Resources */, + 3F8D0D3B2A8C9FFB008A5891 /* settings-light@2x.png in Resources */, + 3F8D0D412A8C9FFB008A5891 /* tiled-gallery_example-3.jpg in Resources */, 3FE06AD129F3F6DA00F752AD /* Project-Shared.xcconfig in Resources */, + 3F8D0D272A8C9FFB008A5891 /* options-light.png in Resources */, + 3F8D0D312A8C9FFB008A5891 /* add-light@3x.png in Resources */, + 3F8D0D222A8C9FFB008A5891 /* build-layouts-dark@2x.png in Resources */, 3FE06ACF29F3F6DA00F752AD /* Gutenberg-Shared.xcconfig in Resources */, 3F12364D29F6B21300AF54A4 /* editor-behavior-overrides.js in Resources */, 3FE06AD029F3F6DA00F752AD /* Project-Release.xcconfig in Resources */, + 3F8D0D0F2A8C9FFB008A5891 /* add-dark@3x.png in Resources */, + 3F8D0D452A8C9FFB008A5891 /* tiled-gallery_example-6.jpg in Resources */, + 3F8D0D202A8C9FFB008A5891 /* build-layouts-dark@3x.png in Resources */, + 3F8D0D182A8C9FFB008A5891 /* embed-media-dark@2x.png in Resources */, + 3F8D0D2B2A8C9FFB008A5891 /* drag-and-drop-dark.png in Resources */, 3F12364B29F6B21300AF54A4 /* gutenberg-observer.js in Resources */, + 3F8D0D092A8C9FFB008A5891 /* back-icon@3x.png in Resources */, + 3F8D0D142A8C9FFB008A5891 /* move-light@3x.png in Resources */, + 3F8D0D232A8C9FFB008A5891 /* options-dark.png in Resources */, + 3F8D0D3C2A8C9FFB008A5891 /* add-dark.png in Resources */, + 3F8D0D382A8C9FFB008A5891 /* options-light@3x.png in Resources */, 3F12364629F6B21300AF54A4 /* editor-style-overrides.css in Resources */, + 3F8D0D1A2A8C9FFB008A5891 /* block-layout-collage@3x.png in Resources */, + 3F8D0D352A8C9FFB008A5891 /* drag-and-drop-light@2x.png in Resources */, + 3F8D0D3F2A8C9FFB008A5891 /* drag-and-drop-dark@3x.png in Resources */, + 3F8D0D2C2A8C9FFB008A5891 /* embed-media-dark.png in Resources */, + 3F8D0D212A8C9FFB008A5891 /* build-layouts-light.png in Resources */, 3F12364A29F6B21300AF54A4 /* inject-css.js in Resources */, 3F12364C29F6B21300AF54A4 /* wp-bar-override.css in Resources */, 3F12365029F6B23300AF54A4 /* supported-blocks.json in Resources */, + 3F8D0D402A8C9FFB008A5891 /* tiled-gallery_example-2.jpg in Resources */, + 3F8D0D262A8C9FFB008A5891 /* move-dark@2x.png in Resources */, 3FA0C5812A1C8C9700600A9A /* App.js in Resources */, + 3F8D0D442A8C9FFB008A5891 /* tiled-gallery_example-5.jpg in Resources */, + 3F8D0D1B2A8C9FFB008A5891 /* options-dark@2x.png in Resources */, + 3F8D0D152A8C9FFB008A5891 /* block-layout-collage@2x.png in Resources */, + 3F8D0D242A8C9FFB008A5891 /* settings-dark@2x.png in Resources */, + 3F8D0D1C2A8C9FFB008A5891 /* move-light@2x.png in Resources */, 3F12364729F6B21300AF54A4 /* insert-block.js in Resources */, + 3F8D0D2F2A8C9FFB008A5891 /* drag-and-drop-light@3x.png in Resources */, + 3F8D0D0D2A8C9FFB008A5891 /* rich-text-dark.png in Resources */, + 3F8D0D3D2A8C9FFB008A5891 /* block-layout-collage.png in Resources */, + 3F8D0D0B2A8C9FFB008A5891 /* back-icon.png in Resources */, + 3F8D0D362A8C9FFB008A5891 /* move-light.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/package.json b/package.json index 45b7fd3e56..dc4d9f44f7 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "bundle:android:text": "mkdir -p bundle/android && npm run rn-bundle -- --platform android --dev false --entry-file ./index.js --assets-dest ./bundle/android --bundle-output ./bundle/android/App.text.js --sourcemap-output ./bundle/android/App.text.js.map", "bundle:android:bytecode": "./gutenberg/node_modules/react-native/sdks/hermesc/`node -e \"const platform=require('os').platform();console.log(platform === 'darwin' ? 'osx-bin' : (platform === 'linux' ? 'linux64-bin' : (platform === 'win32' ? 'win64-bin' : 'unsupported-os')));\"`/hermesc -emit-binary -O -out bundle/android/App.js bundle/android/App.text.js -output-source-map", "bundle:ios": "npm run bundle:ios:text && npm run bundle:ios:bytecode", - "bundle:ios:text": "mkdir -p bundle/ios && npm run rn-bundle -- --platform ios --dev false --entry-file ./index.js --assets-dest ./bundle/ios --bundle-output ./bundle/ios/App.text.js --sourcemap-output ./bundle/ios/App.text.js.map", + "bundle:ios:text": "mkdir -p bundle/ios && npm run rn-bundle -- --platform ios --dev false --entry-file ./index.js --assets-dest ./ios-xcframework/Gutenberg/Resources --bundle-output ./bundle/ios/App.text.js --sourcemap-output ./bundle/ios/App.text.js.map", "bundle:ios:bytecode": "./gutenberg/node_modules/react-native/sdks/hermesc/`node -e \"const platform=require('os').platform();console.log(platform === 'darwin' ? 'osx-bin' : (platform === 'linux' ? 'linux64-bin' : (platform === 'win32' ? 'win64-bin' : 'unsupported-os')));\"`/hermesc -emit-binary -O -out bundle/ios/App.js bundle/ios/App.text.js -output-source-map", "prewpandroid": "rm -Rf $TMPDIR/gbmobile-wpandroidfakernroot && mkdir $TMPDIR/gbmobile-wpandroidfakernroot && ln -s $(cd \"$(dirname \"../../../\")\"; pwd) $TMPDIR/gbmobile-wpandroidfakernroot/android", "wpandroid": "cd gutenberg && react-native run-android --root $TMPDIR/gbmobile-wpandroidfakernroot --variant wasabiDebug --appIdSuffix beta --appFolder WordPress --main-activity=ui.WPLaunchActivity", From b8070f1e960003a5ac9e073cdc99ac81c068a7e5 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 16 Aug 2023 16:57:15 +1000 Subject: [PATCH 04/15] Fix typo in Git cache Buildkite configuration --- .buildkite/cache-builder.yml | 2 +- .buildkite/pipeline.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/cache-builder.yml b/.buildkite/cache-builder.yml index e65d279dc6..0c7381dc11 100644 --- a/.buildkite/cache-builder.yml +++ b/.buildkite/cache-builder.yml @@ -10,7 +10,7 @@ x-common-params: - automattic/a8c-ci-toolkit#2.18.2 - automattic/git-s3-cache#1.1.4: bucket: a8c-repo-mirrors - repo: automattic/gutenber-mobile/ + repo: automattic/gutenberg-mobile/ steps: # Build the Git Repo cache diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index f02888bc1a..23455afdaa 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -3,7 +3,7 @@ x-common-params: automattic/git-s3-cache#1.1.4: # Ensure these settings match what's defined in cache-builder.yml bucket: a8c-repo-mirrors - repo: automattic/gutenber-mobile/ + repo: automattic/gutenberg-mobile/ - &publish-android-artifacts-docker-container docker#v3.8.0: image: "public.ecr.aws/automattic/android-build-image:v1.3.0" From 48f15881f9b2b1aabbf96805f3e83dfa89c98436 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 16 Aug 2023 17:07:42 +1000 Subject: [PATCH 05/15] Make bundled iOS assets available to the XCFramework CI step See failure in the previous build: https://buildkite.com/automattic/gutenberg-mobile/builds/6855#0189fcfe-517e-48bb-afc7-7884f997797d --- .buildkite/pipeline.yml | 2 ++ .buildkite/publish-react-native-ios-artifacts.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index f02888bc1a..d218992286 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -62,6 +62,8 @@ steps: echo "--- :arrow_up: Upload iOS bundle artifact" buildkite-agent artifact upload bundle/ios/App.js + tar -czvf ios-assets.tar.gz -C ios-xcframework/Gutenberg/Resources assets/ + buildkite-agent artifact upload ios-assets if [[ -n "$BUILDKITE_TAG" ]]; then echo "--- :arrow_up: Upload iOS source map" diff --git a/.buildkite/publish-react-native-ios-artifacts.sh b/.buildkite/publish-react-native-ios-artifacts.sh index ec3354a9dc..ab25c3370c 100755 --- a/.buildkite/publish-react-native-ios-artifacts.sh +++ b/.buildkite/publish-react-native-ios-artifacts.sh @@ -2,6 +2,8 @@ echo "--- :arrow_down: Download iOS JS bundle" buildkite-agent artifact download bundle/ios/App.js . +buildkite-agent artifact download ios-assets.tar.gz . +tar -xzvf assets.tar.gz -C ios-xcframework/Gutenberg/Resources/ echo '--- :node: Setup node_modules for RNReanimated' echo '--- :node: 1. Install nvm' From e5c1fc4badef330188643c39a748fe78e1f71006 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 16 Aug 2023 17:35:54 +1000 Subject: [PATCH 06/15] Embed XCFramework assets via folder reference Otherwise, they end up all flattened and the RN code, which looks for them based on the path they would have in a normal RN project, e.g.: `assets/gutenberg/packages/editor/src/components/editor-help/images/build-layouts-light@3x.png` --- .../project.pbxproj | 420 +----------------- 1 file changed, 4 insertions(+), 416 deletions(-) diff --git a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj index d7fabcc8b2..d07774900f 100644 --- a/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj +++ b/ios-xcframework/XCFrameworkScaffold.xcodeproj/project.pbxproj @@ -25,68 +25,7 @@ 3F12364D29F6B21300AF54A4 /* editor-behavior-overrides.js in Resources */ = {isa = PBXBuildFile; fileRef = 3F12364429F6B21300AF54A4 /* editor-behavior-overrides.js */; }; 3F12364E29F6B21300AF54A4 /* local-storage-overrides.json in Resources */ = {isa = PBXBuildFile; fileRef = 3F12364529F6B21300AF54A4 /* local-storage-overrides.json */; }; 3F12365029F6B23300AF54A4 /* supported-blocks.json in Resources */ = {isa = PBXBuildFile; fileRef = 3F12364F29F6B23300AF54A4 /* supported-blocks.json */; }; - 3F8D0D092A8C9FFB008A5891 /* back-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CBD2A8C9FFA008A5891 /* back-icon@3x.png */; }; - 3F8D0D0A2A8C9FFB008A5891 /* back-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CBE2A8C9FFA008A5891 /* back-icon@2x.png */; }; - 3F8D0D0B2A8C9FFB008A5891 /* back-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CBF2A8C9FFA008A5891 /* back-icon.png */; }; - 3F8D0D0C2A8C9FFB008A5891 /* back-icon-mask.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CC02A8C9FFA008A5891 /* back-icon-mask.png */; }; - 3F8D0D0D2A8C9FFB008A5891 /* rich-text-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CC72A8C9FFA008A5891 /* rich-text-dark.png */; }; - 3F8D0D0E2A8C9FFB008A5891 /* move-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CC82A8C9FFA008A5891 /* move-dark.png */; }; - 3F8D0D0F2A8C9FFB008A5891 /* add-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CC92A8C9FFA008A5891 /* add-dark@3x.png */; }; - 3F8D0D102A8C9FFB008A5891 /* rich-text-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCA2A8C9FFA008A5891 /* rich-text-light@2x.png */; }; - 3F8D0D112A8C9FFB008A5891 /* rich-text-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCB2A8C9FFA008A5891 /* rich-text-light@3x.png */; }; - 3F8D0D122A8C9FFB008A5891 /* add-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCC2A8C9FFA008A5891 /* add-dark@2x.png */; }; - 3F8D0D132A8C9FFB008A5891 /* options-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCD2A8C9FFB008A5891 /* options-dark@3x.png */; }; - 3F8D0D142A8C9FFB008A5891 /* move-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCE2A8C9FFB008A5891 /* move-light@3x.png */; }; - 3F8D0D152A8C9FFB008A5891 /* block-layout-collage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CCF2A8C9FFB008A5891 /* block-layout-collage@2x.png */; }; - 3F8D0D162A8C9FFB008A5891 /* settings-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD02A8C9FFB008A5891 /* settings-light.png */; }; - 3F8D0D172A8C9FFB008A5891 /* add-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD12A8C9FFB008A5891 /* add-light.png */; }; - 3F8D0D182A8C9FFB008A5891 /* embed-media-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD22A8C9FFB008A5891 /* embed-media-dark@2x.png */; }; - 3F8D0D192A8C9FFB008A5891 /* embed-media-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD32A8C9FFB008A5891 /* embed-media-dark@3x.png */; }; - 3F8D0D1A2A8C9FFB008A5891 /* block-layout-collage@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD42A8C9FFB008A5891 /* block-layout-collage@3x.png */; }; - 3F8D0D1B2A8C9FFB008A5891 /* options-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD52A8C9FFB008A5891 /* options-dark@2x.png */; }; - 3F8D0D1C2A8C9FFB008A5891 /* move-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD62A8C9FFB008A5891 /* move-light@2x.png */; }; - 3F8D0D1D2A8C9FFB008A5891 /* move-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD72A8C9FFB008A5891 /* move-dark@3x.png */; }; - 3F8D0D1E2A8C9FFB008A5891 /* build-layouts-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD82A8C9FFB008A5891 /* build-layouts-dark.png */; }; - 3F8D0D1F2A8C9FFB008A5891 /* settings-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CD92A8C9FFB008A5891 /* settings-dark@3x.png */; }; - 3F8D0D202A8C9FFB008A5891 /* build-layouts-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDA2A8C9FFB008A5891 /* build-layouts-dark@3x.png */; }; - 3F8D0D212A8C9FFB008A5891 /* build-layouts-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDB2A8C9FFB008A5891 /* build-layouts-light.png */; }; - 3F8D0D222A8C9FFB008A5891 /* build-layouts-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDC2A8C9FFB008A5891 /* build-layouts-dark@2x.png */; }; - 3F8D0D232A8C9FFB008A5891 /* options-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDD2A8C9FFB008A5891 /* options-dark.png */; }; - 3F8D0D242A8C9FFB008A5891 /* settings-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDE2A8C9FFB008A5891 /* settings-dark@2x.png */; }; - 3F8D0D252A8C9FFB008A5891 /* rich-text-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CDF2A8C9FFB008A5891 /* rich-text-light.png */; }; - 3F8D0D262A8C9FFB008A5891 /* move-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE02A8C9FFB008A5891 /* move-dark@2x.png */; }; - 3F8D0D272A8C9FFB008A5891 /* options-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE12A8C9FFB008A5891 /* options-light.png */; }; - 3F8D0D282A8C9FFB008A5891 /* build-layouts-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE22A8C9FFB008A5891 /* build-layouts-light@2x.png */; }; - 3F8D0D292A8C9FFB008A5891 /* drag-and-drop-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE32A8C9FFB008A5891 /* drag-and-drop-dark@2x.png */; }; - 3F8D0D2A2A8C9FFB008A5891 /* settings-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE42A8C9FFB008A5891 /* settings-light@3x.png */; }; - 3F8D0D2B2A8C9FFB008A5891 /* drag-and-drop-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE52A8C9FFB008A5891 /* drag-and-drop-dark.png */; }; - 3F8D0D2C2A8C9FFB008A5891 /* embed-media-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE62A8C9FFB008A5891 /* embed-media-dark.png */; }; - 3F8D0D2D2A8C9FFB008A5891 /* rich-text-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE72A8C9FFB008A5891 /* rich-text-dark@2x.png */; }; - 3F8D0D2E2A8C9FFB008A5891 /* options-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE82A8C9FFB008A5891 /* options-light@2x.png */; }; - 3F8D0D2F2A8C9FFB008A5891 /* drag-and-drop-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CE92A8C9FFB008A5891 /* drag-and-drop-light@3x.png */; }; - 3F8D0D302A8C9FFB008A5891 /* embed-media-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEA2A8C9FFB008A5891 /* embed-media-light@3x.png */; }; - 3F8D0D312A8C9FFB008A5891 /* add-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEB2A8C9FFB008A5891 /* add-light@3x.png */; }; - 3F8D0D322A8C9FFB008A5891 /* embed-media-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEC2A8C9FFB008A5891 /* embed-media-light.png */; }; - 3F8D0D332A8C9FFB008A5891 /* add-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CED2A8C9FFB008A5891 /* add-light@2x.png */; }; - 3F8D0D342A8C9FFB008A5891 /* embed-media-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEE2A8C9FFB008A5891 /* embed-media-light@2x.png */; }; - 3F8D0D352A8C9FFB008A5891 /* drag-and-drop-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CEF2A8C9FFB008A5891 /* drag-and-drop-light@2x.png */; }; - 3F8D0D362A8C9FFB008A5891 /* move-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF02A8C9FFB008A5891 /* move-light.png */; }; - 3F8D0D372A8C9FFB008A5891 /* rich-text-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF12A8C9FFB008A5891 /* rich-text-dark@3x.png */; }; - 3F8D0D382A8C9FFB008A5891 /* options-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF22A8C9FFB008A5891 /* options-light@3x.png */; }; - 3F8D0D392A8C9FFB008A5891 /* settings-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF32A8C9FFB008A5891 /* settings-dark.png */; }; - 3F8D0D3A2A8C9FFB008A5891 /* drag-and-drop-light.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF42A8C9FFB008A5891 /* drag-and-drop-light.png */; }; - 3F8D0D3B2A8C9FFB008A5891 /* settings-light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF52A8C9FFB008A5891 /* settings-light@2x.png */; }; - 3F8D0D3C2A8C9FFB008A5891 /* add-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF62A8C9FFB008A5891 /* add-dark.png */; }; - 3F8D0D3D2A8C9FFB008A5891 /* block-layout-collage.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF72A8C9FFB008A5891 /* block-layout-collage.png */; }; - 3F8D0D3E2A8C9FFB008A5891 /* build-layouts-light@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF82A8C9FFB008A5891 /* build-layouts-light@3x.png */; }; - 3F8D0D3F2A8C9FFB008A5891 /* drag-and-drop-dark@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0CF92A8C9FFB008A5891 /* drag-and-drop-dark@3x.png */; }; - 3F8D0D402A8C9FFB008A5891 /* tiled-gallery_example-2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D012A8C9FFB008A5891 /* tiled-gallery_example-2.jpg */; }; - 3F8D0D412A8C9FFB008A5891 /* tiled-gallery_example-3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D022A8C9FFB008A5891 /* tiled-gallery_example-3.jpg */; }; - 3F8D0D422A8C9FFB008A5891 /* tiled-gallery_example-1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D032A8C9FFB008A5891 /* tiled-gallery_example-1.jpg */; }; - 3F8D0D432A8C9FFB008A5891 /* tiled-gallery_example-4.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D042A8C9FFB008A5891 /* tiled-gallery_example-4.jpg */; }; - 3F8D0D442A8C9FFB008A5891 /* tiled-gallery_example-5.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D052A8C9FFB008A5891 /* tiled-gallery_example-5.jpg */; }; - 3F8D0D452A8C9FFB008A5891 /* tiled-gallery_example-6.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D062A8C9FFB008A5891 /* tiled-gallery_example-6.jpg */; }; - 3F8D0D462A8C9FFB008A5891 /* story_example-1.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D082A8C9FFB008A5891 /* story_example-1.png */; }; + 3F8D0D482A8CB297008A5891 /* assets in Resources */ = {isa = PBXBuildFile; fileRef = 3F8D0D472A8CB297008A5891 /* assets */; }; 3FA0C5812A1C8C9700600A9A /* App.js in Resources */ = {isa = PBXBuildFile; fileRef = 3FA0C5802A1C8C9700600A9A /* App.js */; }; 3FC7862B2A53047D00A0DDAF /* hermes.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FC7862A2A53047D00A0DDAF /* hermes.xcframework */; }; 3FE06AC329F3F61300F752AD /* Gutenberg.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FE06AC229F3F61300F752AD /* Gutenberg.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -118,68 +57,7 @@ 3F12364429F6B21300AF54A4 /* editor-behavior-overrides.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = "editor-behavior-overrides.js"; path = "../../../gutenberg/packages/react-native-bridge/common/gutenberg-web-single-block/editor-behavior-overrides.js"; sourceTree = ""; }; 3F12364529F6B21300AF54A4 /* local-storage-overrides.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "local-storage-overrides.json"; path = "../../../gutenberg/packages/react-native-bridge/common/gutenberg-web-single-block/local-storage-overrides.json"; sourceTree = ""; }; 3F12364F29F6B23300AF54A4 /* supported-blocks.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = "supported-blocks.json"; path = "../../../src/block-support/supported-blocks.json"; sourceTree = ""; }; - 3F8D0CBD2A8C9FFA008A5891 /* back-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@3x.png"; sourceTree = ""; }; - 3F8D0CBE2A8C9FFA008A5891 /* back-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon@2x.png"; sourceTree = ""; }; - 3F8D0CBF2A8C9FFA008A5891 /* back-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon.png"; sourceTree = ""; }; - 3F8D0CC02A8C9FFA008A5891 /* back-icon-mask.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-icon-mask.png"; sourceTree = ""; }; - 3F8D0CC72A8C9FFA008A5891 /* rich-text-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-dark.png"; sourceTree = ""; }; - 3F8D0CC82A8C9FFA008A5891 /* move-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-dark.png"; sourceTree = ""; }; - 3F8D0CC92A8C9FFA008A5891 /* add-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-dark@3x.png"; sourceTree = ""; }; - 3F8D0CCA2A8C9FFA008A5891 /* rich-text-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-light@2x.png"; sourceTree = ""; }; - 3F8D0CCB2A8C9FFA008A5891 /* rich-text-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-light@3x.png"; sourceTree = ""; }; - 3F8D0CCC2A8C9FFA008A5891 /* add-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-dark@2x.png"; sourceTree = ""; }; - 3F8D0CCD2A8C9FFB008A5891 /* options-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-dark@3x.png"; sourceTree = ""; }; - 3F8D0CCE2A8C9FFB008A5891 /* move-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-light@3x.png"; sourceTree = ""; }; - 3F8D0CCF2A8C9FFB008A5891 /* block-layout-collage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "block-layout-collage@2x.png"; sourceTree = ""; }; - 3F8D0CD02A8C9FFB008A5891 /* settings-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-light.png"; sourceTree = ""; }; - 3F8D0CD12A8C9FFB008A5891 /* add-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-light.png"; sourceTree = ""; }; - 3F8D0CD22A8C9FFB008A5891 /* embed-media-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-dark@2x.png"; sourceTree = ""; }; - 3F8D0CD32A8C9FFB008A5891 /* embed-media-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-dark@3x.png"; sourceTree = ""; }; - 3F8D0CD42A8C9FFB008A5891 /* block-layout-collage@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "block-layout-collage@3x.png"; sourceTree = ""; }; - 3F8D0CD52A8C9FFB008A5891 /* options-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-dark@2x.png"; sourceTree = ""; }; - 3F8D0CD62A8C9FFB008A5891 /* move-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-light@2x.png"; sourceTree = ""; }; - 3F8D0CD72A8C9FFB008A5891 /* move-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-dark@3x.png"; sourceTree = ""; }; - 3F8D0CD82A8C9FFB008A5891 /* build-layouts-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-dark.png"; sourceTree = ""; }; - 3F8D0CD92A8C9FFB008A5891 /* settings-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-dark@3x.png"; sourceTree = ""; }; - 3F8D0CDA2A8C9FFB008A5891 /* build-layouts-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-dark@3x.png"; sourceTree = ""; }; - 3F8D0CDB2A8C9FFB008A5891 /* build-layouts-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-light.png"; sourceTree = ""; }; - 3F8D0CDC2A8C9FFB008A5891 /* build-layouts-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-dark@2x.png"; sourceTree = ""; }; - 3F8D0CDD2A8C9FFB008A5891 /* options-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-dark.png"; sourceTree = ""; }; - 3F8D0CDE2A8C9FFB008A5891 /* settings-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-dark@2x.png"; sourceTree = ""; }; - 3F8D0CDF2A8C9FFB008A5891 /* rich-text-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-light.png"; sourceTree = ""; }; - 3F8D0CE02A8C9FFB008A5891 /* move-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-dark@2x.png"; sourceTree = ""; }; - 3F8D0CE12A8C9FFB008A5891 /* options-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-light.png"; sourceTree = ""; }; - 3F8D0CE22A8C9FFB008A5891 /* build-layouts-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-light@2x.png"; sourceTree = ""; }; - 3F8D0CE32A8C9FFB008A5891 /* drag-and-drop-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-dark@2x.png"; sourceTree = ""; }; - 3F8D0CE42A8C9FFB008A5891 /* settings-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-light@3x.png"; sourceTree = ""; }; - 3F8D0CE52A8C9FFB008A5891 /* drag-and-drop-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-dark.png"; sourceTree = ""; }; - 3F8D0CE62A8C9FFB008A5891 /* embed-media-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-dark.png"; sourceTree = ""; }; - 3F8D0CE72A8C9FFB008A5891 /* rich-text-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-dark@2x.png"; sourceTree = ""; }; - 3F8D0CE82A8C9FFB008A5891 /* options-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-light@2x.png"; sourceTree = ""; }; - 3F8D0CE92A8C9FFB008A5891 /* drag-and-drop-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-light@3x.png"; sourceTree = ""; }; - 3F8D0CEA2A8C9FFB008A5891 /* embed-media-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-light@3x.png"; sourceTree = ""; }; - 3F8D0CEB2A8C9FFB008A5891 /* add-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-light@3x.png"; sourceTree = ""; }; - 3F8D0CEC2A8C9FFB008A5891 /* embed-media-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-light.png"; sourceTree = ""; }; - 3F8D0CED2A8C9FFB008A5891 /* add-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-light@2x.png"; sourceTree = ""; }; - 3F8D0CEE2A8C9FFB008A5891 /* embed-media-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "embed-media-light@2x.png"; sourceTree = ""; }; - 3F8D0CEF2A8C9FFB008A5891 /* drag-and-drop-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-light@2x.png"; sourceTree = ""; }; - 3F8D0CF02A8C9FFB008A5891 /* move-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "move-light.png"; sourceTree = ""; }; - 3F8D0CF12A8C9FFB008A5891 /* rich-text-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "rich-text-dark@3x.png"; sourceTree = ""; }; - 3F8D0CF22A8C9FFB008A5891 /* options-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "options-light@3x.png"; sourceTree = ""; }; - 3F8D0CF32A8C9FFB008A5891 /* settings-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-dark.png"; sourceTree = ""; }; - 3F8D0CF42A8C9FFB008A5891 /* drag-and-drop-light.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-light.png"; sourceTree = ""; }; - 3F8D0CF52A8C9FFB008A5891 /* settings-light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "settings-light@2x.png"; sourceTree = ""; }; - 3F8D0CF62A8C9FFB008A5891 /* add-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "add-dark.png"; sourceTree = ""; }; - 3F8D0CF72A8C9FFB008A5891 /* block-layout-collage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "block-layout-collage.png"; sourceTree = ""; }; - 3F8D0CF82A8C9FFB008A5891 /* build-layouts-light@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "build-layouts-light@3x.png"; sourceTree = ""; }; - 3F8D0CF92A8C9FFB008A5891 /* drag-and-drop-dark@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "drag-and-drop-dark@3x.png"; sourceTree = ""; }; - 3F8D0D012A8C9FFB008A5891 /* tiled-gallery_example-2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-2.jpg"; sourceTree = ""; }; - 3F8D0D022A8C9FFB008A5891 /* tiled-gallery_example-3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-3.jpg"; sourceTree = ""; }; - 3F8D0D032A8C9FFB008A5891 /* tiled-gallery_example-1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-1.jpg"; sourceTree = ""; }; - 3F8D0D042A8C9FFB008A5891 /* tiled-gallery_example-4.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-4.jpg"; sourceTree = ""; }; - 3F8D0D052A8C9FFB008A5891 /* tiled-gallery_example-5.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-5.jpg"; sourceTree = ""; }; - 3F8D0D062A8C9FFB008A5891 /* tiled-gallery_example-6.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "tiled-gallery_example-6.jpg"; sourceTree = ""; }; - 3F8D0D082A8C9FFB008A5891 /* story_example-1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "story_example-1.png"; sourceTree = ""; }; + 3F8D0D472A8CB297008A5891 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = assets; path = Gutenberg/Resources/assets; sourceTree = ""; }; 3FA0C5802A1C8C9700600A9A /* App.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = App.js; path = ../../../bundle/ios/App.js; sourceTree = ""; }; 3FC7862A2A53047D00A0DDAF /* hermes.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = hermes.xcframework; path = "Pods/hermes-engine/destroot/Library/Frameworks/universal/hermes.xcframework"; sourceTree = ""; }; 3FE06ABF29F3F61300F752AD /* Gutenberg.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Gutenberg.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -211,7 +89,6 @@ 3F12363C29F6B1E900AF54A4 /* Resources */ = { isa = PBXGroup; children = ( - 3F8D0CB62A8C9FFA008A5891 /* assets */, 3FA0C5802A1C8C9700600A9A /* App.js */, 3F12363F29F6B21300AF54A4 /* content-functions.js */, 3F12364429F6B21300AF54A4 /* editor-behavior-overrides.js */, @@ -227,238 +104,10 @@ path = Resources; sourceTree = ""; }; - 3F8D0CB62A8C9FFA008A5891 /* assets */ = { - isa = PBXGroup; - children = ( - 3F8D0CB72A8C9FFA008A5891 /* gutenberg */, - 3F8D0CFA2A8C9FFB008A5891 /* jetpack */, - ); - path = assets; - sourceTree = ""; - }; - 3F8D0CB72A8C9FFA008A5891 /* gutenberg */ = { - isa = PBXGroup; - children = ( - 3F8D0CB82A8C9FFA008A5891 /* node_modules */, - 3F8D0CC12A8C9FFA008A5891 /* packages */, - ); - path = gutenberg; - sourceTree = ""; - }; - 3F8D0CB82A8C9FFA008A5891 /* node_modules */ = { - isa = PBXGroup; - children = ( - 3F8D0CB92A8C9FFA008A5891 /* @react-navigation */, - ); - path = node_modules; - sourceTree = ""; - }; - 3F8D0CB92A8C9FFA008A5891 /* @react-navigation */ = { - isa = PBXGroup; - children = ( - 3F8D0CBA2A8C9FFA008A5891 /* elements */, - ); - path = "@react-navigation"; - sourceTree = ""; - }; - 3F8D0CBA2A8C9FFA008A5891 /* elements */ = { - isa = PBXGroup; - children = ( - 3F8D0CBB2A8C9FFA008A5891 /* src */, - ); - path = elements; - sourceTree = ""; - }; - 3F8D0CBB2A8C9FFA008A5891 /* src */ = { - isa = PBXGroup; - children = ( - 3F8D0CBC2A8C9FFA008A5891 /* assets */, - ); - path = src; - sourceTree = ""; - }; - 3F8D0CBC2A8C9FFA008A5891 /* assets */ = { - isa = PBXGroup; - children = ( - 3F8D0CBD2A8C9FFA008A5891 /* back-icon@3x.png */, - 3F8D0CBE2A8C9FFA008A5891 /* back-icon@2x.png */, - 3F8D0CBF2A8C9FFA008A5891 /* back-icon.png */, - 3F8D0CC02A8C9FFA008A5891 /* back-icon-mask.png */, - ); - path = assets; - sourceTree = ""; - }; - 3F8D0CC12A8C9FFA008A5891 /* packages */ = { - isa = PBXGroup; - children = ( - 3F8D0CC22A8C9FFA008A5891 /* editor */, - ); - path = packages; - sourceTree = ""; - }; - 3F8D0CC22A8C9FFA008A5891 /* editor */ = { - isa = PBXGroup; - children = ( - 3F8D0CC32A8C9FFA008A5891 /* src */, - ); - path = editor; - sourceTree = ""; - }; - 3F8D0CC32A8C9FFA008A5891 /* src */ = { - isa = PBXGroup; - children = ( - 3F8D0CC42A8C9FFA008A5891 /* components */, - ); - path = src; - sourceTree = ""; - }; - 3F8D0CC42A8C9FFA008A5891 /* components */ = { - isa = PBXGroup; - children = ( - 3F8D0CC52A8C9FFA008A5891 /* editor-help */, - ); - path = components; - sourceTree = ""; - }; - 3F8D0CC52A8C9FFA008A5891 /* editor-help */ = { - isa = PBXGroup; - children = ( - 3F8D0CC62A8C9FFA008A5891 /* images */, - ); - path = "editor-help"; - sourceTree = ""; - }; - 3F8D0CC62A8C9FFA008A5891 /* images */ = { - isa = PBXGroup; - children = ( - 3F8D0CC72A8C9FFA008A5891 /* rich-text-dark.png */, - 3F8D0CC82A8C9FFA008A5891 /* move-dark.png */, - 3F8D0CC92A8C9FFA008A5891 /* add-dark@3x.png */, - 3F8D0CCA2A8C9FFA008A5891 /* rich-text-light@2x.png */, - 3F8D0CCB2A8C9FFA008A5891 /* rich-text-light@3x.png */, - 3F8D0CCC2A8C9FFA008A5891 /* add-dark@2x.png */, - 3F8D0CCD2A8C9FFB008A5891 /* options-dark@3x.png */, - 3F8D0CCE2A8C9FFB008A5891 /* move-light@3x.png */, - 3F8D0CCF2A8C9FFB008A5891 /* block-layout-collage@2x.png */, - 3F8D0CD02A8C9FFB008A5891 /* settings-light.png */, - 3F8D0CD12A8C9FFB008A5891 /* add-light.png */, - 3F8D0CD22A8C9FFB008A5891 /* embed-media-dark@2x.png */, - 3F8D0CD32A8C9FFB008A5891 /* embed-media-dark@3x.png */, - 3F8D0CD42A8C9FFB008A5891 /* block-layout-collage@3x.png */, - 3F8D0CD52A8C9FFB008A5891 /* options-dark@2x.png */, - 3F8D0CD62A8C9FFB008A5891 /* move-light@2x.png */, - 3F8D0CD72A8C9FFB008A5891 /* move-dark@3x.png */, - 3F8D0CD82A8C9FFB008A5891 /* build-layouts-dark.png */, - 3F8D0CD92A8C9FFB008A5891 /* settings-dark@3x.png */, - 3F8D0CDA2A8C9FFB008A5891 /* build-layouts-dark@3x.png */, - 3F8D0CDB2A8C9FFB008A5891 /* build-layouts-light.png */, - 3F8D0CDC2A8C9FFB008A5891 /* build-layouts-dark@2x.png */, - 3F8D0CDD2A8C9FFB008A5891 /* options-dark.png */, - 3F8D0CDE2A8C9FFB008A5891 /* settings-dark@2x.png */, - 3F8D0CDF2A8C9FFB008A5891 /* rich-text-light.png */, - 3F8D0CE02A8C9FFB008A5891 /* move-dark@2x.png */, - 3F8D0CE12A8C9FFB008A5891 /* options-light.png */, - 3F8D0CE22A8C9FFB008A5891 /* build-layouts-light@2x.png */, - 3F8D0CE32A8C9FFB008A5891 /* drag-and-drop-dark@2x.png */, - 3F8D0CE42A8C9FFB008A5891 /* settings-light@3x.png */, - 3F8D0CE52A8C9FFB008A5891 /* drag-and-drop-dark.png */, - 3F8D0CE62A8C9FFB008A5891 /* embed-media-dark.png */, - 3F8D0CE72A8C9FFB008A5891 /* rich-text-dark@2x.png */, - 3F8D0CE82A8C9FFB008A5891 /* options-light@2x.png */, - 3F8D0CE92A8C9FFB008A5891 /* drag-and-drop-light@3x.png */, - 3F8D0CEA2A8C9FFB008A5891 /* embed-media-light@3x.png */, - 3F8D0CEB2A8C9FFB008A5891 /* add-light@3x.png */, - 3F8D0CEC2A8C9FFB008A5891 /* embed-media-light.png */, - 3F8D0CED2A8C9FFB008A5891 /* add-light@2x.png */, - 3F8D0CEE2A8C9FFB008A5891 /* embed-media-light@2x.png */, - 3F8D0CEF2A8C9FFB008A5891 /* drag-and-drop-light@2x.png */, - 3F8D0CF02A8C9FFB008A5891 /* move-light.png */, - 3F8D0CF12A8C9FFB008A5891 /* rich-text-dark@3x.png */, - 3F8D0CF22A8C9FFB008A5891 /* options-light@3x.png */, - 3F8D0CF32A8C9FFB008A5891 /* settings-dark.png */, - 3F8D0CF42A8C9FFB008A5891 /* drag-and-drop-light.png */, - 3F8D0CF52A8C9FFB008A5891 /* settings-light@2x.png */, - 3F8D0CF62A8C9FFB008A5891 /* add-dark.png */, - 3F8D0CF72A8C9FFB008A5891 /* block-layout-collage.png */, - 3F8D0CF82A8C9FFB008A5891 /* build-layouts-light@3x.png */, - 3F8D0CF92A8C9FFB008A5891 /* drag-and-drop-dark@3x.png */, - ); - path = images; - sourceTree = ""; - }; - 3F8D0CFA2A8C9FFB008A5891 /* jetpack */ = { - isa = PBXGroup; - children = ( - 3F8D0CFB2A8C9FFB008A5891 /* projects */, - ); - path = jetpack; - sourceTree = ""; - }; - 3F8D0CFB2A8C9FFB008A5891 /* projects */ = { - isa = PBXGroup; - children = ( - 3F8D0CFC2A8C9FFB008A5891 /* plugins */, - ); - path = projects; - sourceTree = ""; - }; - 3F8D0CFC2A8C9FFB008A5891 /* plugins */ = { - isa = PBXGroup; - children = ( - 3F8D0CFD2A8C9FFB008A5891 /* jetpack */, - ); - path = plugins; - sourceTree = ""; - }; - 3F8D0CFD2A8C9FFB008A5891 /* jetpack */ = { - isa = PBXGroup; - children = ( - 3F8D0CFE2A8C9FFB008A5891 /* extensions */, - ); - path = jetpack; - sourceTree = ""; - }; - 3F8D0CFE2A8C9FFB008A5891 /* extensions */ = { - isa = PBXGroup; - children = ( - 3F8D0CFF2A8C9FFB008A5891 /* blocks */, - ); - path = extensions; - sourceTree = ""; - }; - 3F8D0CFF2A8C9FFB008A5891 /* blocks */ = { - isa = PBXGroup; - children = ( - 3F8D0D002A8C9FFB008A5891 /* tiled-gallery */, - 3F8D0D072A8C9FFB008A5891 /* story */, - ); - path = blocks; - sourceTree = ""; - }; - 3F8D0D002A8C9FFB008A5891 /* tiled-gallery */ = { - isa = PBXGroup; - children = ( - 3F8D0D012A8C9FFB008A5891 /* tiled-gallery_example-2.jpg */, - 3F8D0D022A8C9FFB008A5891 /* tiled-gallery_example-3.jpg */, - 3F8D0D032A8C9FFB008A5891 /* tiled-gallery_example-1.jpg */, - 3F8D0D042A8C9FFB008A5891 /* tiled-gallery_example-4.jpg */, - 3F8D0D052A8C9FFB008A5891 /* tiled-gallery_example-5.jpg */, - 3F8D0D062A8C9FFB008A5891 /* tiled-gallery_example-6.jpg */, - ); - path = "tiled-gallery"; - sourceTree = ""; - }; - 3F8D0D072A8C9FFB008A5891 /* story */ = { - isa = PBXGroup; - children = ( - 3F8D0D082A8C9FFB008A5891 /* story_example-1.png */, - ); - path = story; - sourceTree = ""; - }; 3FE06AB329F3F46B00F752AD = { isa = PBXGroup; children = ( + 3F8D0D472A8CB297008A5891 /* assets */, 3FE06AC729F3F6DA00F752AD /* Config */, 3FE06AC129F3F61300F752AD /* Gutenberg */, 3FE06AC029F3F61300F752AD /* Products */, @@ -596,85 +245,24 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3F8D0D482A8CB297008A5891 /* assets in Resources */, 3FE06AD329F3F6DA00F752AD /* Project-Debug.xcconfig in Resources */, - 3F8D0D432A8C9FFB008A5891 /* tiled-gallery_example-4.jpg in Resources */, - 3F8D0D342A8C9FFB008A5891 /* embed-media-light@2x.png in Resources */, - 3F8D0D162A8C9FFB008A5891 /* settings-light.png in Resources */, - 3F8D0D2A2A8C9FFB008A5891 /* settings-light@3x.png in Resources */, - 3F8D0D122A8C9FFB008A5891 /* add-dark@2x.png in Resources */, - 3F8D0D0E2A8C9FFB008A5891 /* move-dark.png in Resources */, - 3F8D0D192A8C9FFB008A5891 /* embed-media-dark@3x.png in Resources */, - 3F8D0D1E2A8C9FFB008A5891 /* build-layouts-dark.png in Resources */, 3F12364E29F6B21300AF54A4 /* local-storage-overrides.json in Resources */, - 3F8D0D102A8C9FFB008A5891 /* rich-text-light@2x.png in Resources */, 3FE06ACE29F3F6DA00F752AD /* Gutenberg-Debug.xcconfig in Resources */, - 3F8D0D112A8C9FFB008A5891 /* rich-text-light@3x.png in Resources */, - 3F8D0D2D2A8C9FFB008A5891 /* rich-text-dark@2x.png in Resources */, - 3F8D0D1F2A8C9FFB008A5891 /* settings-dark@3x.png in Resources */, 3F12364829F6B21300AF54A4 /* content-functions.js in Resources */, - 3F8D0D462A8C9FFB008A5891 /* story_example-1.png in Resources */, - 3F8D0D322A8C9FFB008A5891 /* embed-media-light.png in Resources */, - 3F8D0D132A8C9FFB008A5891 /* options-dark@3x.png in Resources */, - 3F8D0D252A8C9FFB008A5891 /* rich-text-light.png in Resources */, - 3F8D0D0C2A8C9FFB008A5891 /* back-icon-mask.png in Resources */, 3F12364929F6B21300AF54A4 /* prevent-autosaves.js in Resources */, - 3F8D0D332A8C9FFB008A5891 /* add-light@2x.png in Resources */, - 3F8D0D302A8C9FFB008A5891 /* embed-media-light@3x.png in Resources */, 3FE06AD229F3F6DA00F752AD /* Gutenberg-Release.xcconfig in Resources */, - 3F8D0D0A2A8C9FFB008A5891 /* back-icon@2x.png in Resources */, - 3F8D0D2E2A8C9FFB008A5891 /* options-light@2x.png in Resources */, - 3F8D0D3A2A8C9FFB008A5891 /* drag-and-drop-light.png in Resources */, - 3F8D0D172A8C9FFB008A5891 /* add-light.png in Resources */, - 3F8D0D422A8C9FFB008A5891 /* tiled-gallery_example-1.jpg in Resources */, - 3F8D0D392A8C9FFB008A5891 /* settings-dark.png in Resources */, - 3F8D0D372A8C9FFB008A5891 /* rich-text-dark@3x.png in Resources */, - 3F8D0D292A8C9FFB008A5891 /* drag-and-drop-dark@2x.png in Resources */, - 3F8D0D1D2A8C9FFB008A5891 /* move-dark@3x.png in Resources */, - 3F8D0D282A8C9FFB008A5891 /* build-layouts-light@2x.png in Resources */, - 3F8D0D3E2A8C9FFB008A5891 /* build-layouts-light@3x.png in Resources */, - 3F8D0D3B2A8C9FFB008A5891 /* settings-light@2x.png in Resources */, - 3F8D0D412A8C9FFB008A5891 /* tiled-gallery_example-3.jpg in Resources */, 3FE06AD129F3F6DA00F752AD /* Project-Shared.xcconfig in Resources */, - 3F8D0D272A8C9FFB008A5891 /* options-light.png in Resources */, - 3F8D0D312A8C9FFB008A5891 /* add-light@3x.png in Resources */, - 3F8D0D222A8C9FFB008A5891 /* build-layouts-dark@2x.png in Resources */, 3FE06ACF29F3F6DA00F752AD /* Gutenberg-Shared.xcconfig in Resources */, 3F12364D29F6B21300AF54A4 /* editor-behavior-overrides.js in Resources */, 3FE06AD029F3F6DA00F752AD /* Project-Release.xcconfig in Resources */, - 3F8D0D0F2A8C9FFB008A5891 /* add-dark@3x.png in Resources */, - 3F8D0D452A8C9FFB008A5891 /* tiled-gallery_example-6.jpg in Resources */, - 3F8D0D202A8C9FFB008A5891 /* build-layouts-dark@3x.png in Resources */, - 3F8D0D182A8C9FFB008A5891 /* embed-media-dark@2x.png in Resources */, - 3F8D0D2B2A8C9FFB008A5891 /* drag-and-drop-dark.png in Resources */, 3F12364B29F6B21300AF54A4 /* gutenberg-observer.js in Resources */, - 3F8D0D092A8C9FFB008A5891 /* back-icon@3x.png in Resources */, - 3F8D0D142A8C9FFB008A5891 /* move-light@3x.png in Resources */, - 3F8D0D232A8C9FFB008A5891 /* options-dark.png in Resources */, - 3F8D0D3C2A8C9FFB008A5891 /* add-dark.png in Resources */, - 3F8D0D382A8C9FFB008A5891 /* options-light@3x.png in Resources */, 3F12364629F6B21300AF54A4 /* editor-style-overrides.css in Resources */, - 3F8D0D1A2A8C9FFB008A5891 /* block-layout-collage@3x.png in Resources */, - 3F8D0D352A8C9FFB008A5891 /* drag-and-drop-light@2x.png in Resources */, - 3F8D0D3F2A8C9FFB008A5891 /* drag-and-drop-dark@3x.png in Resources */, - 3F8D0D2C2A8C9FFB008A5891 /* embed-media-dark.png in Resources */, - 3F8D0D212A8C9FFB008A5891 /* build-layouts-light.png in Resources */, 3F12364A29F6B21300AF54A4 /* inject-css.js in Resources */, 3F12364C29F6B21300AF54A4 /* wp-bar-override.css in Resources */, 3F12365029F6B23300AF54A4 /* supported-blocks.json in Resources */, - 3F8D0D402A8C9FFB008A5891 /* tiled-gallery_example-2.jpg in Resources */, - 3F8D0D262A8C9FFB008A5891 /* move-dark@2x.png in Resources */, 3FA0C5812A1C8C9700600A9A /* App.js in Resources */, - 3F8D0D442A8C9FFB008A5891 /* tiled-gallery_example-5.jpg in Resources */, - 3F8D0D1B2A8C9FFB008A5891 /* options-dark@2x.png in Resources */, - 3F8D0D152A8C9FFB008A5891 /* block-layout-collage@2x.png in Resources */, - 3F8D0D242A8C9FFB008A5891 /* settings-dark@2x.png in Resources */, - 3F8D0D1C2A8C9FFB008A5891 /* move-light@2x.png in Resources */, 3F12364729F6B21300AF54A4 /* insert-block.js in Resources */, - 3F8D0D2F2A8C9FFB008A5891 /* drag-and-drop-light@3x.png in Resources */, - 3F8D0D0D2A8C9FFB008A5891 /* rich-text-dark.png in Resources */, - 3F8D0D3D2A8C9FFB008A5891 /* block-layout-collage.png in Resources */, - 3F8D0D0B2A8C9FFB008A5891 /* back-icon.png in Resources */, - 3F8D0D362A8C9FFB008A5891 /* move-light.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 5ba5153ffff3022c94e9e919e5b1804e6ba6ba5c Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 16 Aug 2023 17:42:54 +1000 Subject: [PATCH 07/15] Add release notes entry for the XCFramework assets fix --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 12ab6af991..d642c1b6c6 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,6 @@ Unreleased --- +* [**] Fixed images not rendering in Help section on iOS [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6067] 1.101.0 --- From b0629d3aa52331fa9e964a17a0d739d8b7728011 Mon Sep 17 00:00:00 2001 From: Gerardo Date: Wed, 16 Aug 2023 15:00:42 +0200 Subject: [PATCH 08/15] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 12ab6af991..2cd2f1a560 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,6 @@ Unreleased --- +* [**] Fixes font customization not getting updated on iOS [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6036] 1.101.0 --- From d52343c2acac97427f0ee46ccdff63767c584e6f Mon Sep 17 00:00:00 2001 From: Gerardo Date: Wed, 16 Aug 2023 15:09:41 +0200 Subject: [PATCH 09/15] Update Gutenberg ref --- gutenberg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gutenberg b/gutenberg index ee86c7591e..e1f8a9e325 160000 --- a/gutenberg +++ b/gutenberg @@ -1 +1 @@ -Subproject commit ee86c7591e8f0dd534d0b707bc75d2b6b7fa2af2 +Subproject commit e1f8a9e325e8f3b1979839aad6ce53d7438af4b8 From da90ed921581e13dca5ee467a70e70b12abcc9cf Mon Sep 17 00:00:00 2001 From: Gerardo Date: Wed, 16 Aug 2023 15:16:44 +0200 Subject: [PATCH 10/15] Update package-lock --- package-lock.json | 174 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 172 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2b8d0ea26e..f5d34905b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -185,7 +185,7 @@ "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.25.2", "eslint-plugin-jest": "^27.2.1", - "eslint-plugin-jsdoc": "^39.6.9", + "eslint-plugin-jsdoc": "^46.4.6", "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-prettier": "^3.3.0", "eslint-plugin-react": "^7.27.0", @@ -212,6 +212,20 @@ } } }, + "gutenberg/packages/eslint-plugin/node_modules/@es-joy/jsdoccomment": { + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz", + "integrity": "sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg==", + "dev": true, + "dependencies": { + "comment-parser": "1.4.0", + "esquery": "^1.5.0", + "jsdoc-type-pratt-parser": "~4.0.0" + }, + "engines": { + "node": ">=16" + } + }, "gutenberg/packages/eslint-plugin/node_modules/@typescript-eslint/eslint-plugin": { "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", @@ -273,6 +287,27 @@ } } }, + "gutenberg/packages/eslint-plugin/node_modules/comment-parser": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.0.tgz", + "integrity": "sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==", + "dev": true, + "engines": { + "node": ">= 12.0.0" + } + }, + "gutenberg/packages/eslint-plugin/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "gutenberg/packages/eslint-plugin/node_modules/eslint-plugin-import": { "version": "2.28.0", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz", @@ -323,6 +358,29 @@ "semver": "bin/semver.js" } }, + "gutenberg/packages/eslint-plugin/node_modules/eslint-plugin-jsdoc": { + "version": "46.4.6", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.4.6.tgz", + "integrity": "sha512-z4SWYnJfOqftZI+b3RM9AtWL1vF/sLWE/LlO9yOKDof9yN2+n3zOdOJTGX/pRE/xnPsooOLG2Rq6e4d+XW3lNw==", + "dev": true, + "dependencies": { + "@es-joy/jsdoccomment": "~0.40.1", + "are-docs-informative": "^0.0.2", + "comment-parser": "1.4.0", + "debug": "^4.3.4", + "escape-string-regexp": "^4.0.0", + "esquery": "^1.5.0", + "is-builtin-module": "^3.2.1", + "semver": "^7.5.4", + "spdx-expression-parse": "^3.0.1" + }, + "engines": { + "node": ">=16" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, "gutenberg/packages/eslint-plugin/node_modules/globals": { "version": "13.20.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", @@ -338,6 +396,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "gutenberg/packages/eslint-plugin/node_modules/jsdoc-type-pratt-parser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz", + "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==", + "dev": true, + "engines": { + "node": ">=12.0.0" + } + }, "gutenberg/packages/eslint-plugin/node_modules/semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -12806,6 +12873,15 @@ "node": ">= 6" } }, + "node_modules/are-docs-informative": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz", + "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==", + "dev": true, + "engines": { + "node": ">=14" + } + }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -13859,6 +13935,18 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "node_modules/builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -18011,6 +18099,21 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, + "node_modules/is-builtin-module": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", + "dev": true, + "dependencies": { + "builtin-modules": "^3.3.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -32465,7 +32568,7 @@ "eslint-config-prettier": "^8.3.0", "eslint-plugin-import": "^2.25.2", "eslint-plugin-jest": "^27.2.1", - "eslint-plugin-jsdoc": "^39.6.9", + "eslint-plugin-jsdoc": "^46.4.6", "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-prettier": "^3.3.0", "eslint-plugin-react": "^7.27.0", @@ -32474,6 +32577,17 @@ "requireindex": "^1.2.0" }, "dependencies": { + "@es-joy/jsdoccomment": { + "version": "0.40.1", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz", + "integrity": "sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg==", + "dev": true, + "requires": { + "comment-parser": "1.4.0", + "esquery": "^1.5.0", + "jsdoc-type-pratt-parser": "~4.0.0" + } + }, "@typescript-eslint/eslint-plugin": { "version": "5.62.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", @@ -32504,6 +32618,18 @@ "debug": "^4.3.4" } }, + "comment-parser": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.0.tgz", + "integrity": "sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw==", + "dev": true + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true + }, "eslint-plugin-import": { "version": "2.28.0", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz", @@ -32547,6 +32673,23 @@ } } }, + "eslint-plugin-jsdoc": { + "version": "46.4.6", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.4.6.tgz", + "integrity": "sha512-z4SWYnJfOqftZI+b3RM9AtWL1vF/sLWE/LlO9yOKDof9yN2+n3zOdOJTGX/pRE/xnPsooOLG2Rq6e4d+XW3lNw==", + "dev": true, + "requires": { + "@es-joy/jsdoccomment": "~0.40.1", + "are-docs-informative": "^0.0.2", + "comment-parser": "1.4.0", + "debug": "^4.3.4", + "escape-string-regexp": "^4.0.0", + "esquery": "^1.5.0", + "is-builtin-module": "^3.2.1", + "semver": "^7.5.4", + "spdx-expression-parse": "^3.0.1" + } + }, "globals": { "version": "13.20.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", @@ -32556,6 +32699,12 @@ "type-fest": "^0.20.2" } }, + "jsdoc-type-pratt-parser": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz", + "integrity": "sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==", + "dev": true + }, "semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -39204,6 +39353,12 @@ "readable-stream": "^2.0.0" } }, + "are-docs-informative": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz", + "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==", + "dev": true + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -40030,6 +40185,12 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "dev": true + }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -43313,6 +43474,15 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, + "is-builtin-module": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", + "dev": true, + "requires": { + "builtin-modules": "^3.3.0" + } + }, "is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", From adfb8c645e6dbc87c235982c58275bc17c1b0f94 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 16 Aug 2023 15:32:52 +0100 Subject: [PATCH 11/15] try: Update target file name --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 14e2a4d95a..87773726eb 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -63,7 +63,7 @@ steps: echo "--- :arrow_up: Upload iOS bundle artifact" buildkite-agent artifact upload bundle/ios/App.js tar -czvf ios-assets.tar.gz -C ios-xcframework/Gutenberg/Resources assets/ - buildkite-agent artifact upload ios-assets + buildkite-agent artifact upload ios-assets.tar.gz if [[ -n "$BUILDKITE_TAG" ]]; then echo "--- :arrow_up: Upload iOS source map" From 4c4806c5f73144b4d63b453fb24182dfaa71b1e6 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 16 Aug 2023 16:02:12 +0100 Subject: [PATCH 12/15] fix: Update misspelled file name --- .buildkite/publish-react-native-ios-artifacts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/publish-react-native-ios-artifacts.sh b/.buildkite/publish-react-native-ios-artifacts.sh index ab25c3370c..b2dcfa01de 100755 --- a/.buildkite/publish-react-native-ios-artifacts.sh +++ b/.buildkite/publish-react-native-ios-artifacts.sh @@ -3,7 +3,7 @@ echo "--- :arrow_down: Download iOS JS bundle" buildkite-agent artifact download bundle/ios/App.js . buildkite-agent artifact download ios-assets.tar.gz . -tar -xzvf assets.tar.gz -C ios-xcframework/Gutenberg/Resources/ +tar -xzvf ios-assets.tar.gz -C ios-xcframework/Gutenberg/Resources/ echo '--- :node: Setup node_modules for RNReanimated' echo '--- :node: 1. Install nvm' From 805650388ca1efff9b4c4de8447f6f0d6177b204 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 16 Aug 2023 17:44:09 +0100 Subject: [PATCH 13/15] try: Ensure `/Gutenberg/Resources` is created `Build iOS RN XCFramework & Publish to S3` is currently failing with the following error: ``` tar: could not chdir to 'ios-xcframework/Gutenberg/Resources/' ``` With this commit, the `bundle:ios:text` command is updated to ensure that the file is generated as expected. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc4d9f44f7..0b9b4713ab 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "bundle:android:text": "mkdir -p bundle/android && npm run rn-bundle -- --platform android --dev false --entry-file ./index.js --assets-dest ./bundle/android --bundle-output ./bundle/android/App.text.js --sourcemap-output ./bundle/android/App.text.js.map", "bundle:android:bytecode": "./gutenberg/node_modules/react-native/sdks/hermesc/`node -e \"const platform=require('os').platform();console.log(platform === 'darwin' ? 'osx-bin' : (platform === 'linux' ? 'linux64-bin' : (platform === 'win32' ? 'win64-bin' : 'unsupported-os')));\"`/hermesc -emit-binary -O -out bundle/android/App.js bundle/android/App.text.js -output-source-map", "bundle:ios": "npm run bundle:ios:text && npm run bundle:ios:bytecode", - "bundle:ios:text": "mkdir -p bundle/ios && npm run rn-bundle -- --platform ios --dev false --entry-file ./index.js --assets-dest ./ios-xcframework/Gutenberg/Resources --bundle-output ./bundle/ios/App.text.js --sourcemap-output ./bundle/ios/App.text.js.map", + "bundle:ios:text": "mkdir -p bundle/ios ios-xcframework/Gutenberg/Resources && npm run rn-bundle -- --platform ios --dev false --entry-file ./index.js --assets-dest ./ios-xcframework/Gutenberg/Resources --bundle-output ./bundle/ios/App.text.js --sourcemap-output ./bundle/ios/App.text.js.map", "bundle:ios:bytecode": "./gutenberg/node_modules/react-native/sdks/hermesc/`node -e \"const platform=require('os').platform();console.log(platform === 'darwin' ? 'osx-bin' : (platform === 'linux' ? 'linux64-bin' : (platform === 'win32' ? 'win64-bin' : 'unsupported-os')));\"`/hermesc -emit-binary -O -out bundle/ios/App.js bundle/ios/App.text.js -output-source-map", "prewpandroid": "rm -Rf $TMPDIR/gbmobile-wpandroidfakernroot && mkdir $TMPDIR/gbmobile-wpandroidfakernroot && ln -s $(cd \"$(dirname \"../../../\")\"; pwd) $TMPDIR/gbmobile-wpandroidfakernroot/android", "wpandroid": "cd gutenberg && react-native run-android --root $TMPDIR/gbmobile-wpandroidfakernroot --variant wasabiDebug --appIdSuffix beta --appFolder WordPress --main-activity=ui.WPLaunchActivity", From 373f018ed4962d2b29d000f867675674a5538ddf Mon Sep 17 00:00:00 2001 From: Siobhan Date: Wed, 16 Aug 2023 18:09:04 +0100 Subject: [PATCH 14/15] Revert "try: Ensure `/Gutenberg/Resources` is created" This reverts commit 805650388ca1efff9b4c4de8447f6f0d6177b204. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b9b4713ab..dc4d9f44f7 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "bundle:android:text": "mkdir -p bundle/android && npm run rn-bundle -- --platform android --dev false --entry-file ./index.js --assets-dest ./bundle/android --bundle-output ./bundle/android/App.text.js --sourcemap-output ./bundle/android/App.text.js.map", "bundle:android:bytecode": "./gutenberg/node_modules/react-native/sdks/hermesc/`node -e \"const platform=require('os').platform();console.log(platform === 'darwin' ? 'osx-bin' : (platform === 'linux' ? 'linux64-bin' : (platform === 'win32' ? 'win64-bin' : 'unsupported-os')));\"`/hermesc -emit-binary -O -out bundle/android/App.js bundle/android/App.text.js -output-source-map", "bundle:ios": "npm run bundle:ios:text && npm run bundle:ios:bytecode", - "bundle:ios:text": "mkdir -p bundle/ios ios-xcframework/Gutenberg/Resources && npm run rn-bundle -- --platform ios --dev false --entry-file ./index.js --assets-dest ./ios-xcframework/Gutenberg/Resources --bundle-output ./bundle/ios/App.text.js --sourcemap-output ./bundle/ios/App.text.js.map", + "bundle:ios:text": "mkdir -p bundle/ios && npm run rn-bundle -- --platform ios --dev false --entry-file ./index.js --assets-dest ./ios-xcframework/Gutenberg/Resources --bundle-output ./bundle/ios/App.text.js --sourcemap-output ./bundle/ios/App.text.js.map", "bundle:ios:bytecode": "./gutenberg/node_modules/react-native/sdks/hermesc/`node -e \"const platform=require('os').platform();console.log(platform === 'darwin' ? 'osx-bin' : (platform === 'linux' ? 'linux64-bin' : (platform === 'win32' ? 'win64-bin' : 'unsupported-os')));\"`/hermesc -emit-binary -O -out bundle/ios/App.js bundle/ios/App.text.js -output-source-map", "prewpandroid": "rm -Rf $TMPDIR/gbmobile-wpandroidfakernroot && mkdir $TMPDIR/gbmobile-wpandroidfakernroot && ln -s $(cd \"$(dirname \"../../../\")\"; pwd) $TMPDIR/gbmobile-wpandroidfakernroot/android", "wpandroid": "cd gutenberg && react-native run-android --root $TMPDIR/gbmobile-wpandroidfakernroot --variant wasabiDebug --appIdSuffix beta --appFolder WordPress --main-activity=ui.WPLaunchActivity", From 30254cfbd6ce7041062fa7f51646eb928b90ad94 Mon Sep 17 00:00:00 2001 From: "Tanner W. Stokes" Date: Wed, 16 Aug 2023 17:03:32 -0400 Subject: [PATCH 15/15] Make directory before extracting. --- .buildkite/publish-react-native-ios-artifacts.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/publish-react-native-ios-artifacts.sh b/.buildkite/publish-react-native-ios-artifacts.sh index b2dcfa01de..4ba87ad058 100755 --- a/.buildkite/publish-react-native-ios-artifacts.sh +++ b/.buildkite/publish-react-native-ios-artifacts.sh @@ -3,6 +3,7 @@ echo "--- :arrow_down: Download iOS JS bundle" buildkite-agent artifact download bundle/ios/App.js . buildkite-agent artifact download ios-assets.tar.gz . +mkdir -p ios-xcframework/Gutenberg/Resources tar -xzvf ios-assets.tar.gz -C ios-xcframework/Gutenberg/Resources/ echo '--- :node: Setup node_modules for RNReanimated'