Merge pull request #3011 from wordpress-mobile/dependency/bump-jetpac…

…k-669e9ad Bump Jetpack submodule and fix break changes
wordpress-mobile · Jan 16, 2021 · 8e3400c · 8e3400c
2 parents 32defd7 + a64bb0e
commit 8e3400c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/...xtensions_blocks_story_story_example1.png → ...xtensions_blocks_story_story_example1.png b/...xtensions_blocks_story_story_example1.png → ...xtensions_blocks_story_story_example1.png
diff --git a/...tensions/blocks/story/story_example-1.png → ...tensions/blocks/story/story_example-1.png b/...tensions/blocks/story/story_example-1.png → ...tensions/blocks/story/story_example-1.png
diff --git a/.../ios/assets/jetpack/extensions/index.json → ...cts/plugins/jetpack/extensions/index.json b/.../ios/assets/jetpack/extensions/index.json → ...cts/plugins/jetpack/extensions/index.json
@@ -38,7 +38,7 @@
 		"videopress",
 		"wordads"
 	],
-	"beta": [ "amazon" ],
+	"beta": [ "amazon", "anchor-fm", "conversation", "dialogue" ],
 	"experimental": [ "seo" ],
 	"no-post-editor": [
 		"business-hours",

diff --git a/jetpack b/jetpack
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "yarn": "^1.22.10"
   },
   "scripts": {
-    "postinstall": "npm ci --prefix gutenberg &&  cd jetpack && yarn install --frozen-lockfile --ignore-engines",
+    "postinstall": "npm ci --prefix gutenberg && cd jetpack/projects/plugins/jetpack && yarn install --frozen-lockfile --ignore-engines",
     "start": "react-native start --config ./metro.config.js",
     "start:reset": "npm run core clean:runtime && npm run start -- --reset-cache",
     "core": "cd gutenberg && npm run native",

diff --git a/src/jetpack-editor-setup.js b/src/jetpack-editor-setup.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { JETPACK_DATA_PATH } from '../jetpack/extensions/shared/get-jetpack-data';
+import { JETPACK_DATA_PATH } from '../jetpack/projects/plugins/jetpack/extensions/shared/get-jetpack-data';
 /**
  * WordPress dependencies
  */
@@ -64,7 +64,7 @@ export default ( jetpackState ) => {
 		}
 	} );
 
-	require( '../jetpack/extensions/editor' );
+	require( '../jetpack/projects/plugins/jetpack/extensions/editor' );
 
 	return jetpackData;
 };
diff --git a/src/test/index.js b/src/test/index.js
@@ -10,11 +10,12 @@ describe( 'Test Jetpack blocks', () => {
 			};
 		} );
 		jest.mock(
-			'../../jetpack/extensions/blocks/contact-info/editor.js',
+			'../../jetpack/projects/plugins/jetpack/extensions/blocks/contact-info/editor.js',
 			() => jest.fn()
 		);
-		jest.mock( '../../jetpack/extensions/blocks/story/editor.js', () =>
-			jest.fn()
+		jest.mock(
+			'../../jetpack/projects/plugins/jetpack/extensions/blocks/story/editor.js',
+			() => jest.fn()
 		);
 
 		const setupJetpackEditor = require( '../jetpack-editor-setup' ).default;