Release/1.31.0

.circleci/config.yml

@@ -4,25 +4,25 @@ orbs:
   slack: circleci/[email protected]
 
 commands:
-  yarn-install:
+  npm-install:
     steps:
       - restore_cache:
-          name: Restore Yarn Cache
+          name: Restore NPM Cache
           keys:
-            - yarn-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}
+            - npm-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
       - run:
-          name: Yarn Install
-          command: yarn install --frozen-lockfile --prefer-offline --network-concurrency 1
+          name: NPM Install
+          command: npm ci --prefer-offline
       - save_cache:
-          name: Save Yarn Cache
-          key: yarn-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "yarn.lock" }}
+          name: Save NPM Cache
+          key: npm-i18n-v4-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "package-lock.json" }}
           paths:
-            - node_modules
+            - ~/.npm
             - i18n-cache/data
-  checkout-gutenberg:
+  checkout-submodules:
     steps:
       - run:
-          name: Checkout Gutenberg
+          name: Checkout Submodules
           command: git submodule update --init --recursive
   add-jest-reporter-dir:
       steps:
@@ -46,8 +46,8 @@ jobs:
       - image: circleci/node:10
     steps:
       - checkout
-      - checkout-gutenberg
-      - yarn-install
+      - checkout-submodules
+      - npm-install
       - add-jest-reporter-dir
       - run:
           name: Set Environment Variables
@@ -73,12 +73,13 @@ jobs:
         default: ""
     docker:
     - image: circleci/android:api-29-node
+    environment:
+      JAVA_OPTS: '-Xms512m -Xmx2g'
+      GRADLE_OPTS: '-Xmx3g -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx2g -XX:+HeapDumpOnOutOfMemoryError"'
     steps:
       - checkout
-      - run:
-          name: Checkout Gutenberg
-          command: git submodule update --init --recursive
-      - yarn-install
+      - checkout-submodules
+      - npm-install
       - add-jest-reporter-dir
       - run:
           name: Set Environment Variables
@@ -87,15 +88,15 @@ jobs:
             echo 'export TEST_ENV=sauce' >> $BASH_ENV
       - run:
           name: Bundle Android and Generate debug .apk file for testing
-          command: yarn test:e2e:build-app:android
+          command: npm run test:e2e:bundle:android && npm run test:e2e:build-app:android
       - run:
           name: Upload apk to sauce labs
           command: |
             source bin/sauce-pre-upload.sh
-            curl -u "$SAUCE_USERNAME:$SAUCE_ACCESS_KEY" -X POST -H "Content-Type: application/octet-stream" https://saucelabs.com/rest/v1/storage/automattic/Gutenberg-$SAUCE_FILENAME.apk?overwrite=true --data-binary @./android/app/build/outputs/apk/debug/app-debug.apk
+            curl -u "$SAUCE_USERNAME:$SAUCE_ACCESS_KEY" -X POST -H "Content-Type: application/octet-stream" https://saucelabs.com/rest/v1/storage/automattic/Gutenberg-$SAUCE_FILENAME.apk?overwrite=true --data-binary @./gutenberg/packages/react-native-editor/android/app/build/outputs/apk/debug/app-debug.apk
       - run:
           name: Run Device Tests
-          command: yarn device-tests<<parameters.is-canary>>
+          command: npm run device-tests<<parameters.is-canary>>
           no_output_timeout: 1200
           environment:
             JEST_JUNIT_OUTPUT: "reports/test-results/android-test-results.xml"
@@ -119,10 +120,11 @@ jobs:
     - image: circleci/android:api-29-node
     steps:
       - checkout
-      - yarn-install
+      - checkout-submodules
+      - npm-install
       - run:
           name: Run Android native unit tests
-          command: cd android && ./gradlew testDebug
+          command: cd gutenberg/packages/react-native-editor/android && ./gradlew testDebug
   ios-device-checks:
     parameters:
       post-to-slack:
@@ -136,8 +138,8 @@ jobs:
       xcode: "11.2.1"
     steps:
     - checkout
-    - checkout-gutenberg
-    - yarn-install
+    - checkout-submodules
+    - npm-install
     - add-jest-reporter-dir
     - run:
         name: Set Environment Variables
@@ -146,59 +148,57 @@ jobs:
           echo 'export TEST_ENV=sauce' >> $BASH_ENV
     - run:
         name: Prepare build cache key
-        command: find yarn.lock ios react-native-aztec/ios react-native-gutenberg-bridge/ios -type f -print0 | sort -z | xargs -0 shasum | tee ios-checksums.txt
+        command: find gutenberg/package-lock.json gutenberg/packages/react-native-editor/ios gutenberg/packages/react-native-aztec/ios gutenberg/packages/react-native-bridge/ios -type f -print0 | sort -z | xargs -0 shasum | tee ios-checksums.txt
     - restore_cache:
         name: Restore Build Cache
         keys:
           - ios-build-cache-{{ checksum "ios-checksums.txt" }}
     - restore_cache:
         name: Restore Dependencies Cache
         keys:
-        - dependencies-v3-{{ checksum "ios/Gemfile.lock" }}-{{ checksum "ios/Podfile.lock" }}-{{
-          checksum "yarn.lock" }}
-        - dependencies-v3-{{ checksum "ios/Gemfile.lock" }}-{{ checksum "ios/Podfile.lock" }}
-        - dependencies-v3-{{ checksum "ios/Gemfile.lock" }}
-        - dependencies-v3-
+        - dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}-{{ checksum "gutenberg/packages/react-native-editor/ios/Podfile.lock" }}-{{ checksum "gutenberg/package-lock.json" }}
+        - dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}-{{ checksum "gutenberg/packages/react-native-editor/ios/Podfile.lock" }}
+        - dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}
+        - dependencies-v4-
     - run:
         name: Build (if needed)
-        command: test -e ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app || SKIP_BUNDLING=true yarn test:e2e:build-app:ios
+        command: test -e ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app || SKIP_BUNDLING=true npm run core test:e2e:build-app:ios
     - save_cache:
         name: Save Dependencies Cache
-        key: dependencies-v3-{{ checksum "ios/Gemfile.lock" }}-{{ checksum "ios/Podfile.lock" }}-{{
-          checksum "yarn.lock" }}
+        key: dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}-{{ checksum "gutenberg/packages/react-native-editor/ios/Podfile.lock" }}-{{ checksum "gutenberg/package-lock.json" }}
         paths:
-        - ios/Pods
+        - gutenberg/packages/react-native-editor/ios/Pods
         - ~/Library/Caches/CocoaPods
         - ~/.cocoapods/repos/trunk
-        - ios/vendor
+        - gutenberg/packages/react-native-editor/ios/vendor
     - run:
         name: Bundle iOS
-        command: yarn test:e2e:bundle:ios
+        command: npm run test:e2e:bundle:ios
     - run:
         name: Generate .app file for testing
-        command: WORK_DIR=$(pwd) && cd ./ios/build/gutenberg/Build/Products/Release-iphonesimulator && zip -r $WORK_DIR/ios/GutenbergDemo.app.zip GutenbergDemo.app
+        command: WORK_DIR=$(pwd) && cd ./gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator && zip -r $WORK_DIR/gutenberg/packages/react-native-editor/ios/GutenbergDemo.app.zip GutenbergDemo.app
     - run:
         name: Upload .app to sauce labs
         command: |
           source bin/sauce-pre-upload.sh
-          curl -u "$SAUCE_USERNAME:$SAUCE_ACCESS_KEY" -X POST -H "Content-Type: application/octet-stream" https://saucelabs.com/rest/v1/storage/automattic/Gutenberg-$SAUCE_FILENAME.app.zip?overwrite=true --data-binary @./ios/GutenbergDemo.app.zip
+          curl -u "$SAUCE_USERNAME:$SAUCE_ACCESS_KEY" -X POST -H "Content-Type: application/octet-stream" https://saucelabs.com/rest/v1/storage/automattic/Gutenberg-$SAUCE_FILENAME.app.zip?overwrite=true --data-binary @./gutenberg/packages/react-native-editor/ios/GutenbergDemo.app.zip
     - run:
         name: Run Device Tests
         command: |
-          yarn device-tests<<parameters.is-canary>>
+          npm run device-tests<<parameters.is-canary>>
         no_output_timeout: 1200
         environment:
           JEST_JUNIT_OUTPUT: "reports/test-results/ios-test-results.xml"
     - store_test_results:
         path: ./reports/test-results
     - run:
         name: Prepare build cache
-        command: rm ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app/main.jsbundle
+        command: rm gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app/main.jsbundle
     - save_cache:
         name: Save Build Cache
         key: ios-build-cache-{{ checksum "ios-checksums.txt" }}
         paths:
-          - ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app
+          - gutenberg/packages/react-native-editor/ios/build/gutenberg/Build/Products/Release-iphonesimulator/GutenbergDemo.app
     - when:
           condition: << parameters.post-to-slack >>
           steps:

.eslintignore

@@ -1,7 +1,5 @@
 ; ignore the submodules
 gutenberg
-symlinked-packages
-symlinked-packages-in-parent
-react-native-aztec
 bundle
 jetpack
+bin

.eslintrc.js

@@ -16,59 +16,8 @@ module.exports = {
 		"react",
 		"react-native",
 		"jest",
-		"flowtype"
 	],
 	extends: [
 		"plugin:@wordpress/eslint-plugin/recommended",
-		"plugin:flowtype/recommended",
-	],
-	settings: {
-		flowtype: {
-			onlyFilesWithFlowAnnotation: true,
-		},
-		react: {
-			pragma: "React",
-			version: "detect",
-			flowVersion: "0.92.0",
-		},
-	},
-	rules: {
-		'no-restricted-syntax': [
-			'error',
-			// NOTE: We can't include the forward slash in our regex or
-			// we'll get a `SyntaxError` (Invalid regular expression: \ at end of pattern)
-			// here. That's why we use \\u002F in the regexes below.
-			{
-				selector: 'ImportDeclaration[source.value=/^@wordpress\\u002F.+\\u002F/]',
-				message: 'Path access on WordPress dependencies is not allowed.',
-			},
-			{
-				selector: 'CallExpression[callee.name=/^(__|_x|_n|_nx)$/] Literal[value=/\\.{3}/]',
-				message: 'Use ellipsis character (…) in place of three dots',
-			},
-			{
-				selector: 'ImportDeclaration[source.value="lodash"] Identifier.imported[name="memoize"]',
-				message: 'Use memize instead of Lodash’s memoize',
-			},
-			{
-				selector: 'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',
-				message: 'Prefer page.waitForSelector instead.',
-			},
-			{
-				selector: 'JSXAttribute[name.name="id"][value.type="Literal"]',
-				message: 'Do not use string literals for IDs; use withInstanceId instead.',
-			},
-			{
-				// Discourage the usage of `Math.random()` as it's a code smell
-				// for UUID generation, for which we already have a higher-order
-				// component: `withInstanceId`.
-				selector: 'CallExpression[callee.object.name="Math"][callee.property.name="random"]',
-				message: 'Do not use Math.random() to generate unique IDs; use withInstanceId instead. (If you’re not generating unique IDs: ignore this message.)',
-			},
-			{
-				selector: 'CallExpression[callee.name="withDispatch"] > :function > BlockStatement > :not(VariableDeclaration,ReturnStatement)',
-				message: 'withDispatch must return an object with consistent keys. Avoid performing logic in `mapDispatchToProps`.',
-			},
-		],
-	},
-}
+	]
+};

.gitignore

@@ -102,6 +102,8 @@ buck-out/
 
 # e2e output log
 appium-out.log
+ios-screen-recordings/
+android-screen-recordings/
 
 bin/wp-cli.phar
 

.vscode/settings.json

@@ -6,4 +6,12 @@
 
     // Use 'prettier-eslint' instead of 'prettier'. Other settings will only be fallbacks in case they could not be inferred from eslint rules.
     "prettier.eslintIntegration": true,
-}
+    "search.exclude": {
+        "**/bundle/android/App.js": true,
+        "**/bundle/android/App.js.map": true,
+        "**/bundle/ios/App.js": true,
+        "**/bundle/ios/App.js.map": true,
+        "**/i18n-cache/data": true,
+        "**/symlinked-packages": true
+    },
+}