macOS: Initial test app (#96)

* macOS: Initial test app * Add macOS to CI * Update README * Build macOS separately * Hide Format menu and move React menu left * Refactor xcodebuild.sh * Run SwiftLint * Autosave window frame * release should wait on macos build * Address comments - Fix pod path checks - Use `NSApplication.shared.keyWindow` - Use `simctl` to get device id - Check for `xcpretty` * Use device_name * Remove empty tests * Fix command check
microsoft · Jun 3, 2020 · f84e73d · f84e73d
1 parent 706d3eb
commit f84e73d
Show file tree

Hide file tree

Showing 33 changed files with 2,064 additions and 42 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,11 +43,11 @@ jobs:
           set -eo pipefail
           yarn build:ios
           pod install --project-directory=ios
-          ../scripts/xcodebuild-ios.sh ios/Example.xcworkspace build-for-testing
+          ../scripts/xcodebuild.sh ios/Example.xcworkspace build-for-testing
         working-directory: example
       - name: Test
         run: |
-          ../scripts/xcodebuild-ios.sh ios/Example.xcworkspace test-without-building
+          ../scripts/xcodebuild.sh ios/Example.xcworkspace test-without-building
         working-directory: example
   ios-template:
     name: "iOS [template]"
@@ -67,10 +67,10 @@ jobs:
           yarn build:ios
           if [[ ${{ matrix.template }} == ios ]]; then
             pod install
-            ../scripts/xcodebuild-ios.sh TemplateExample.xcworkspace build
+            ../scripts/xcodebuild.sh TemplateExample.xcworkspace build
           else
             pod install --project-directory=ios
-            ../scripts/xcodebuild-ios.sh ios/TemplateExample.xcworkspace build
+            ../scripts/xcodebuild.sh ios/TemplateExample.xcworkspace build
           fi
         working-directory: template-example
   android:
@@ -141,6 +141,24 @@ jobs:
           ./gradlew clean build check test
         shell: bash
         working-directory: template-example
+  macos:
+    name: "macOS"
+    runs-on: macos-latest
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install
+        run: |
+          yarn
+        working-directory: example
+      - name: Build
+        run: |
+          set -eo pipefail
+          yarn build:macos
+          pod install --project-directory=macos
+          ../scripts/xcodebuild.sh macos/Example.xcworkspace build
+        working-directory: example
   release:
     needs:
       [
@@ -149,6 +167,7 @@ jobs:
         ios-template,
         android,
         android-template,
+        macos
       ]
     runs-on: macos-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"

diff --git a/README.md b/README.md
@@ -146,6 +146,18 @@ pod install --project-directory=ios
 open ios/Example.xcworkspace
 ```
 
+## macOS
+
+```bash
+# Bundle the JS first so CocoaPods can
+# find the assets.
+yarn build:macos
+pod install --project-directory=macos
+
+# Finally, open the Xcode workspace.
+open macos/Example.xcworkspace
+```
+
 # Known Issues
 
 ## Invalid `Podfile` file: undefined method `[]' for nil:NilClass

diff --git a/ReactTestApp-DevSupport.podspec b/ReactTestApp-DevSupport.podspec
@@ -13,6 +13,7 @@ Pod::Spec.new do |s|
   s.summary   = package['description']
 
   s.ios.deployment_target = '12.0'
+  s.osx.deployment_target = '10.14'
 
   s.source_files         = 'ios/ReactTestApp/Public/*.h'
   s.public_header_files  = 'ios/ReactTestApp/Public/*.h'

diff --git a/example/app.json b/example/app.json
@@ -12,6 +12,10 @@
       "dist/assets",
       "dist/main.jsbundle"
     ],
+    "macos": [
+      "dist/assets",
+      "dist/main.jsbundle"
+    ],
     "android": [
       "dist/res",
       "dist/main.jsbundle"

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -195,7 +195,7 @@ SPEC CHECKSUMS:
   React-RCTText: d91537e29e38dc69cf09cbca0875cf5dc7402da6
   React-RCTVibration: 7655d72dfb919dd6d8e135ca108a5a2bd9fcd7b4
   React-RCTWebSocket: 7cd2c8d0f8ddd680dc76404defba7ab1f56b83af
-  ReactTestApp-DevSupport: ac31b3ca3ffbf3fe674a1364d96d189897db2fef
+  ReactTestApp-DevSupport: 4bc3104215b749fe64dc0b6f602fb13558d9deb6
   ReactTestApp-Resources: c070f72dfcb2806d922eec6656259cbf7a4d2bcf
   SwiftLint: 55e96a4a4d537d4a3156859fc1c54bd24851a046
   yoga: 5079887aa3e4c62142d6bcee493022643ee4d730

diff --git a/example/macos/Podfile b/example/macos/Podfile
@@ -0,0 +1,5 @@
+require_relative '../node_modules/react-native-test-app/macos/test_app.rb'
+
+workspace 'Example.xcworkspace'
+
+use_test_app!
diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock
@@ -0,0 +1,203 @@
+PODS:
+  - boost-for-react-native (1.63.0)
+  - DoubleConversion (1.1.6)
+  - Folly (2018.10.22.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - Folly/Default (= 2018.10.22.00)
+    - glog
+  - Folly/Default (2018.10.22.00):
+    - boost-for-react-native
+    - DoubleConversion
+    - glog
+  - glog (0.3.5)
+  - React (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+    - React-DevSupport (= 0.60.0-microsoft.79)
+    - React-RCTActionSheet (= 0.60.0-microsoft.79)
+    - React-RCTAnimation (= 0.60.0-microsoft.79)
+    - React-RCTBlob (= 0.60.0-microsoft.79)
+    - React-RCTImage (= 0.60.0-microsoft.79)
+    - React-RCTLinking (= 0.60.0-microsoft.79)
+    - React-RCTNetwork (= 0.60.0-microsoft.79)
+    - React-RCTSettings (= 0.60.0-microsoft.79)
+    - React-RCTText (= 0.60.0-microsoft.79)
+    - React-RCTVibration (= 0.60.0-microsoft.79)
+    - React-RCTWebSocket (= 0.60.0-microsoft.79)
+  - React-Core (0.60.0-microsoft.79):
+    - Folly (= 2018.10.22.00)
+    - React-cxxreact (= 0.60.0-microsoft.79)
+    - React-jsiexecutor (= 0.60.0-microsoft.79)
+    - yoga (= 0.60.0-microsoft.79.React)
+  - React-cxxreact (0.60.0-microsoft.79):
+    - boost-for-react-native (= 1.63.0)
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-jsinspector (= 0.60.0-microsoft.79)
+  - React-DevSupport (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+    - React-RCTWebSocket (= 0.60.0-microsoft.79)
+  - React-fishhook (0.60.0-microsoft.79)
+  - React-jsi (0.60.0-microsoft.79):
+    - boost-for-react-native (= 1.63.0)
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-jsi/Default (= 0.60.0-microsoft.79)
+  - React-jsi/Default (0.60.0-microsoft.79):
+    - boost-for-react-native (= 1.63.0)
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+  - React-jsiexecutor (0.60.0-microsoft.79):
+    - DoubleConversion
+    - Folly (= 2018.10.22.00)
+    - glog
+    - React-cxxreact (= 0.60.0-microsoft.79)
+    - React-jsi (= 0.60.0-microsoft.79)
+  - React-jsinspector (0.60.0-microsoft.79)
+  - React-RCTActionSheet (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+  - React-RCTAnimation (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+  - React-RCTBlob (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+    - React-RCTNetwork (= 0.60.0-microsoft.79)
+    - React-RCTWebSocket (= 0.60.0-microsoft.79)
+  - React-RCTImage (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+    - React-RCTNetwork (= 0.60.0-microsoft.79)
+  - React-RCTLinking (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+  - React-RCTNetwork (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+  - React-RCTSettings (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+  - React-RCTText (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+  - React-RCTVibration (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+  - React-RCTWebSocket (0.60.0-microsoft.79):
+    - React-Core (= 0.60.0-microsoft.79)
+    - React-fishhook (= 0.60.0-microsoft.79)
+  - ReactTestApp-DevSupport (0.0.15)
+  - ReactTestApp-Resources (1.0.0-dev)
+  - SwiftLint (0.39.2)
+  - yoga (0.60.0-microsoft.79.React)
+
+DEPENDENCIES:
+  - boost-for-react-native (from `../node_modules/react-native-macos/third-party-podspecs/boost-for-react-native.podspec`)
+  - DoubleConversion (from `../node_modules/react-native-macos/third-party-podspecs/DoubleConversion.podspec`)
+  - Folly (from `../node_modules/react-native-macos/third-party-podspecs/Folly.podspec`)
+  - glog (from `../node_modules/react-native-macos/third-party-podspecs/glog.podspec`)
+  - React (from `../node_modules/react-native-macos`)
+  - React-Core (from `../node_modules/react-native-macos/React`)
+  - React-cxxreact (from `../node_modules/react-native-macos/ReactCommon/cxxreact`)
+  - React-DevSupport (from `../node_modules/react-native-macos/React`)
+  - React-fishhook (from `../node_modules/react-native-macos/Libraries/fishhook`)
+  - React-jsi (from `../node_modules/react-native-macos/ReactCommon/jsi`)
+  - React-jsiexecutor (from `../node_modules/react-native-macos/ReactCommon/jsiexecutor`)
+  - React-jsinspector (from `../node_modules/react-native-macos/ReactCommon/jsinspector`)
+  - React-RCTActionSheet (from `../node_modules/react-native-macos/Libraries/ActionSheetIOS`)
+  - React-RCTAnimation (from `../node_modules/react-native-macos/Libraries/NativeAnimation`)
+  - React-RCTBlob (from `../node_modules/react-native-macos/Libraries/Blob`)
+  - React-RCTImage (from `../node_modules/react-native-macos/Libraries/Image`)
+  - React-RCTLinking (from `../node_modules/react-native-macos/Libraries/LinkingIOS`)
+  - React-RCTNetwork (from `../node_modules/react-native-macos/Libraries/Network`)
+  - React-RCTSettings (from `../node_modules/react-native-macos/Libraries/Settings`)
+  - React-RCTText (from `../node_modules/react-native-macos/Libraries/Text`)
+  - React-RCTVibration (from `../node_modules/react-native-macos/Libraries/Vibration`)
+  - React-RCTWebSocket (from `../node_modules/react-native-macos/Libraries/WebSocket`)
+  - ReactTestApp-DevSupport (from `../..`)
+  - ReactTestApp-Resources (from `..`)
+  - SwiftLint
+  - yoga (from `../node_modules/react-native-macos/ReactCommon/yoga`)
+
+SPEC REPOS:
+  trunk:
+    - SwiftLint
+
+EXTERNAL SOURCES:
+  boost-for-react-native:
+    :podspec: "../node_modules/react-native-macos/third-party-podspecs/boost-for-react-native.podspec"
+  DoubleConversion:
+    :podspec: "../node_modules/react-native-macos/third-party-podspecs/DoubleConversion.podspec"
+  Folly:
+    :podspec: "../node_modules/react-native-macos/third-party-podspecs/Folly.podspec"
+  glog:
+    :podspec: "../node_modules/react-native-macos/third-party-podspecs/glog.podspec"
+  React:
+    :path: "../node_modules/react-native-macos"
+  React-Core:
+    :path: "../node_modules/react-native-macos/React"
+  React-cxxreact:
+    :path: "../node_modules/react-native-macos/ReactCommon/cxxreact"
+  React-DevSupport:
+    :path: "../node_modules/react-native-macos/React"
+  React-fishhook:
+    :path: "../node_modules/react-native-macos/Libraries/fishhook"
+  React-jsi:
+    :path: "../node_modules/react-native-macos/ReactCommon/jsi"
+  React-jsiexecutor:
+    :path: "../node_modules/react-native-macos/ReactCommon/jsiexecutor"
+  React-jsinspector:
+    :path: "../node_modules/react-native-macos/ReactCommon/jsinspector"
+  React-RCTActionSheet:
+    :path: "../node_modules/react-native-macos/Libraries/ActionSheetIOS"
+  React-RCTAnimation:
+    :path: "../node_modules/react-native-macos/Libraries/NativeAnimation"
+  React-RCTBlob:
+    :path: "../node_modules/react-native-macos/Libraries/Blob"
+  React-RCTImage:
+    :path: "../node_modules/react-native-macos/Libraries/Image"
+  React-RCTLinking:
+    :path: "../node_modules/react-native-macos/Libraries/LinkingIOS"
+  React-RCTNetwork:
+    :path: "../node_modules/react-native-macos/Libraries/Network"
+  React-RCTSettings:
+    :path: "../node_modules/react-native-macos/Libraries/Settings"
+  React-RCTText:
+    :path: "../node_modules/react-native-macos/Libraries/Text"
+  React-RCTVibration:
+    :path: "../node_modules/react-native-macos/Libraries/Vibration"
+  React-RCTWebSocket:
+    :path: "../node_modules/react-native-macos/Libraries/WebSocket"
+  ReactTestApp-DevSupport:
+    :path: "../.."
+  ReactTestApp-Resources:
+    :path: ".."
+  yoga:
+    :path: "../node_modules/react-native-macos/ReactCommon/yoga"
+
+SPEC CHECKSUMS:
+  boost-for-react-native: a110407d9db2642fd2e1bcd7c5a51c81f2521dc9
+  DoubleConversion: a1bc12a74baa397a2609e0f10e19b8062d864053
+  Folly: feff29ba9d0b7c2e4f793a94942831d6cc5bbad7
+  glog: b3f6d74f3e2d33396addc0ee724d2b2b79fc3e00
+  React: 3231fd482d650466a8936464501ea1a61a5aa678
+  React-Core: d6eb0deaee31e7d1c9d6b09e5402f8004ff3d095
+  React-cxxreact: 6a8f44872c1df17552ef15ee77e77c6ca3c5f55a
+  React-DevSupport: e67a5dc7c4797b99d7311ed7e33dcc187c1f0bce
+  React-fishhook: be31669c26ecc09882cdcbb6a60cc4bae96ac81a
+  React-jsi: 6eb8cb13eb534aed3ce876d1a797eff41beb9a60
+  React-jsiexecutor: caa20535bb6a8418cba8b3c991e8dadc5bba445a
+  React-jsinspector: afaaf4bb46af238b991d32f75d125418c0dfaa7b
+  React-RCTActionSheet: e0e2f2ad0d4e3e84445293bfe803d4de3ef7361b
+  React-RCTAnimation: d096fc8f7301cbb1eb0283ff295a10419464b142
+  React-RCTBlob: 75d9e6538433f44b8fbb22d8389e2ccd1a7bf266
+  React-RCTImage: 1f08e42378d9f0335948e84a15eaee2b0c2bec8b
+  React-RCTLinking: f293bb64258f757304a99cbc3e406502690fdccb
+  React-RCTNetwork: ac1c158ab8cbe1683002f59872a0a6a75d2f8d8a
+  React-RCTSettings: 1752947f5f133be1adcf32ba1b39278c6e095b27
+  React-RCTText: e98ccd6061197bbcab155c2af1184519d4c10290
+  React-RCTVibration: d65410f1d96b8ab1e54ed00c5bafcaf83b655424
+  React-RCTWebSocket: 064d37b5498df29c2c8753542a248fcfb59a0a1d
+  ReactTestApp-DevSupport: 4bc3104215b749fe64dc0b6f602fb13558d9deb6
+  ReactTestApp-Resources: c070f72dfcb2806d922eec6656259cbf7a4d2bcf
+  SwiftLint: 22ccbbe3b8008684be5955693bab135e0ed6a447
+  yoga: 2a52465aadd70426513eaf9b4f66e1eb3121dac6
+
+PODFILE CHECKSUM: d91f67e74b6410c05259188d419eeed2bd768445
+
+COCOAPODS: 1.9.1
diff --git a/example/metro.config.js b/example/metro.config.js
@@ -11,6 +11,7 @@ module.exports = {
   resolver: {
     blacklistRE: blacklist([
       /node_modules\/.*\/node_modules\/react-native\/.*/,
+      /node_modules\/react-native-macos\/.*/,
     ]),
   },
   transformer: {

diff --git a/example/metro.config.macos.js b/example/metro.config.macos.js
@@ -0,0 +1,20 @@
+/**
+ * This cli config is needed for development purposes, e.g. for running
+ * integration tests during local development or on CI services.
+ */
+
+const path = require("path");
+const blacklist = require("metro-config/src/defaults/blacklist");
+
+module.exports = {
+  resolver: {
+    extraNodeModules: {
+      "react-native": path.resolve(
+        __dirname,
+        "node_modules/react-native-macos"
+      ),
+    },
+    blacklistRE: blacklist([/node_modules\/react-native\/.*/]),
+    platforms: ["macos", "ios", "android"],
+  },
+};
diff --git a/example/package.json b/example/package.json
@@ -5,11 +5,14 @@
   "scripts": {
     "build:android": "mkdirp dist/res && react-native bundle --entry-file index.js --platform android --dev true --bundle-output dist/main.jsbundle --assets-dest dist/res --reset-cache",
     "build:ios": "mkdirp dist && react-native bundle --entry-file index.js --platform ios --dev true --bundle-output dist/main.jsbundle --assets-dest dist --reset-cache",
-    "start": "react-native start"
+    "build:macos": "mkdirp dist && react-native bundle --entry-file index.js --platform macos --dev true --bundle-output dist/main.jsbundle --assets-dest dist --reset-cache --config=metro.config.macos.js",
+    "start": "react-native start",
+    "start:macos": "react-native start --config=metro.config.macos.js"
   },
   "peerDependencies": {
     "react": "^16.8.6",
-    "react-native": "^0.60.6"
+    "react-native": "^0.60.6",
+    "react-native-macos": "0.60.0-microsoft.79"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",
@@ -19,6 +22,7 @@
     "mkdirp": "^0.5.1",
     "react": "16.8.6",
     "react-native": "0.60.6",
+    "react-native-macos": "0.60.0-microsoft.79",
     "react-native-test-app": "../"
   }
 }
diff --git a/example/react-native.config.js b/example/react-native.config.js
@@ -1,7 +1,13 @@
-module.exports = {
-  project: {
-    ios: {
-      project: "ios/ReactTestApp-Dummy.xcodeproj",
+if (process.argv.includes("--config=metro.config.macos.js")) {
+  module.exports = {
+    reactNativePath: "node_modules/react-native-macos",
+  };
+} else {
+  module.exports = {
+    project: {
+      ios: {
+        project: "ios/ReactTestApp-Dummy.xcodeproj",
+      },
     },
-  },
-};
+  };
+}