Merge pull request #151 from wordpress-mobile/fix/update-to-gb-master…

…-with-mobile-submodule Update to gb master with mobile submodule
WordPress · Sep 20, 2018 · 403d389 · 403d389
2 parents f36fd5e + ccdbf58
commit 403d389
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/gutenberg b/gutenberg
diff --git a/jest.config.js b/jest.config.js
@@ -15,7 +15,12 @@ module.exports = {
 	verbose: true,
 	preset: 'jest-react-native',
 	testEnvironment: 'jsdom',
-	testPathIgnorePatterns: [ '/node_modules/', '/gutenberg/test/', '/gutenberg/packages/' ],
+	testPathIgnorePatterns: [
+		'/node_modules/',
+		'/gutenberg/gutenberg-mobile/',
+		'/gutenberg/test/',
+		'/gutenberg/packages/',
+	],
 	moduleFileExtensions: [
 		'native.js',
 		'android.js',
@@ -31,6 +36,7 @@ module.exports = {
 		'jsx',
 		'node',
 	],
+	modulePathIgnorePatterns: [ '<rootDir>/gutenberg/gutenberg-mobile' ],
 	moduleNameMapper: {
 		'@wordpress\\/(block-serialization-default-parser|blocks|data|element|deprecated|editor|block-library|components|keycodes|url|a11y|viewport|core-data|api-fetch|nux)$':
 			'<rootDir>/gutenberg/packages/$1/src/index',

diff --git a/rn-cli.config.js b/rn-cli.config.js
@@ -10,6 +10,7 @@ module.exports = {
 		// are automagically resolved by Metro so, there is no list of them anywhere.
 		return blacklist( [
 			/gutenberg\/packages\/(autop|compose|deprecated|hooks|i18n|is-shallow-equal|blob|redux-routine)\/.*/,
+			/gutenberg\/gutenberg-mobile\/.*/,
 		] );
 	},
 	getTransformModulePath() {
+1 −0		.eslintignore
+3 −0		.gitmodules
+1 −0		.stylelintignore
+41 −0		.travis.yml
+15 −1		docs/data/data-core-editor.md
+6 −0		docs/manifest.json
+25 −0		docs/reference/testing-overview.md
+6 −0		docs/root-manifest.json
+5 −0		edit-post/assets/stylesheets/_animations.scss
+11 −2		edit-post/assets/stylesheets/_mixins.scss
+6 −0		edit-post/assets/stylesheets/main.scss
+10 −0		edit-post/components/fullscreen-mode/style.scss
+1 −1		edit-post/components/header/fullscreen-mode-close/index.js
+16 −6		edit-post/components/header/index.js
+2 −0		edit-post/components/header/more-menu/index.js
+38 −0		edit-post/components/header/publish-sidebar-toggle/index.js
+4 −7		edit-post/components/header/style.scss
+1 −0		gutenberg-mobile
+12 −5		gutenberg.php
+15 −5		lib/load.php
+7 −1		package-lock.json
+9 −4		package.json
+3 −0		packages/block-library/src/code/edit.native.js
+1 −1		packages/block-library/src/file/inspector.js
+9 −7		packages/block-library/src/image/edit.js
+1 −1		packages/block-library/src/image/index.js
+3 −2		packages/block-library/src/more/edit.native.js
+9 −2		packages/block-library/src/preformatted/index.js
+9 −1		packages/block-library/src/quote/index.js
+9 −2		packages/block-library/src/verse/index.js
+3 −0		packages/block-serialization-default-parser/CHANGELOG.md
+16 −4		packages/block-serialization-default-parser/parser.php
+9 −3		packages/block-serialization-default-parser/src/index.js
+46 −0		packages/block-serialization-default-parser/test/index.js
+9 −0		packages/components/src/dashicon/index.js
+3 −9		packages/components/src/dropdown-menu/style.scss
+1 −1		packages/components/src/menu-item/style.scss
+2 −1		packages/components/src/sandbox/index.js
+1 −1		packages/data/src/plugins/controls/index.js
+1 −2		packages/editor/src/components/autocompleters/style.scss
+8 −2		packages/editor/src/components/block-icon/index.js
+16 −5		packages/editor/src/components/block-icon/style.scss
+1 −0		packages/editor/src/components/block-inspector/style.scss
+4 −1		packages/editor/src/components/block-settings-menu/style.scss
+5 −8		packages/editor/src/components/block-switcher/style.scss
+5 −0		packages/editor/src/components/block-types-list/style.scss
+22 −9		packages/editor/src/components/inner-blocks/index.js
+35 −25		packages/editor/src/components/page-attributes/order.js
+13 −0		packages/editor/src/components/page-attributes/style.scss
+61 −7		packages/editor/src/components/page-attributes/test/order.js
+24 −3		packages/editor/src/components/post-publish-panel/index.js
+21 −3		packages/editor/src/components/post-publish-panel/prepublish.js
+6 −0		packages/editor/src/components/post-publish-panel/style.scss
+4 −2		packages/editor/src/components/rich-text/format-toolbar/link-container.js
+1 −11		packages/editor/src/components/rich-text/index.js
+11 −1		packages/editor/src/components/rich-text/index.native.js
+10 −0		packages/editor/src/components/rich-text/utils.js
+1 −2		packages/editor/src/hooks/custom-class-name.js
+16 −0		packages/editor/src/hooks/test/custom-class-name.js
+22 −0		packages/editor/src/store/actions.js
+1 −0		packages/editor/src/store/defaults.js
+12 −3		packages/editor/src/store/reducer.js
+20 −0		packages/editor/src/store/selectors.js
+19 −0		packages/editor/src/store/test/reducer.js
+29 −0		packages/editor/src/store/test/selectors.js
+15 −4		packages/list-reusable-blocks/src/utils/file.js
+8 −1		test/e2e/jest.config.json
+25 −0		test/e2e/specs/__snapshots__/inner-blocks-templates.test.js.snap
+54 −0		test/e2e/specs/inner-blocks-templates.test.js
+54 −26		test/e2e/specs/publishing.test.js
+33 −0		test/e2e/support/utils.js
+22 −0		test/e2e/test-plugins/inner-blocks-templates.php
+48 −0		test/e2e/test-plugins/inner-blocks-templates/index.js
+5 −1		test/unit/jest.config.json