Sync fork

.circleci/config.yml

@@ -1,56 +1,123 @@
-version: 2
+version: 2.1
 
 defaults: &defaults
-  docker:
-    - image: circleci/node:8
   working_directory: ~/react-native-cli
 
-jobs:
-  install-dependencies:
+executors:
+  node8:
+    <<: *defaults
+    docker:
+      - image: circleci/node:8
+  nodelts:
+    <<: *defaults
+    docker:
+      - image: circleci/node:lts
+  noderuby:
     <<: *defaults
+    docker:
+      - image: circleci/ruby:2.4-node
+
+commands:
+  install-dependencies:
     steps:
       - checkout
       - attach_workspace:
           at: ~/react-native-cli
       - restore_cache:
           keys:
-            - dependencies-{{ checksum "package.json" }}
-            - dependencies-
-      - run: yarn install
+            - v2-dependencies-{{ checksum "package.json" }}
+            - v2-dependencies-
+      - run: yarn --frozen-lockfile
       - save_cache:
-          key: dependencies-{{ checksum "package.json" }}
+          key: v2-dependencies-{{ checksum "package.json" }}
           paths:
             - node_modules
       - persist_to_workspace:
           root: .
           paths:
             - .
-  lint-and-flow:
-    <<: *defaults
+  run-lint:
     steps:
       - attach_workspace:
           at: ~/react-native-cli
-      - run: |
-          yarn lint
-          yarn flow-check
-  tests:
-    <<: *defaults
+      - run: yarn lint
+  run-typecheck:
     steps:
       - attach_workspace:
           at: ~/react-native-cli
-      - run: yarn test
+      - run: yarn flow-check
+  run-cocoa-pods-tests:
+    steps:
+      - attach_workspace:
+          at: ~/react-native-cli
+      - run: yarn test:ci:cocoapods
+  run-unit-tests:
+    steps:
+      - attach_workspace:
+          at: ~/react-native-cli
+      - run: yarn test:ci:unit
       - store_artifacts:
           path: coverage
           destination: coverage
+  run-e2e-tests:
+    steps:
+      - attach_workspace:
+          at: ~/react-native-cli
+      - run: yarn test:ci:e2e
+
+jobs:
+  setup:
+    executor: node8
+    steps:
+      - install-dependencies
+  lint:
+    executor: node8
+    steps:
+      - run-lint
+  typecheck:
+    executor: node8
+    steps:
+      - run-typecheck
+  cocoa-pods:
+    executor: noderuby
+    steps:
+      - run-cocoa-pods-tests
+  unit-tests:
+    executor: node8
+    steps:
+      - run-unit-tests
+  e2e-tests:
+    executor: node8
+    steps:
+      - run-e2e-tests
+  lts-tests:
+    executor: nodelts
+    steps:
+      - install-dependencies
+      - run-lint
+      - run-typecheck
+      - run-unit-tests
+      # TODO: figure out why e2e tests fail even though not interfering with
+      # other tests
+      # - run-e2e-tests
 
 workflows:
-  version: 2
   build-and-test:
     jobs:
-      - install-dependencies
-      - lint-and-flow:
+      - setup
+      - lint:
+          requires:
+            - setup
+      - typecheck:
+          requires:
+            - setup
+      - unit-tests:
+          requires:
+            - setup
+      - e2e-tests:
           requires:
-            - install-dependencies
-      - tests:
+            - setup
+      - cocoa-pods:
           requires:
-            - install-dependencies
+            - setup
+      - lts-tests

.eslintrc.js

@@ -0,0 +1,36 @@
+module.exports = {
+  extends: ['@react-native-community', 'plugin:import/errors'],
+  env: {
+    node: true,
+  },
+  rules: {
+    'prettier/prettier': [2, 'fb'],
+  },
+  // @todo: remove once we cover whole codebase with types
+  plugins: ['import'],
+  settings: {
+    react: {
+      version: 'latest',
+    },
+    'import/resolver': {
+      alias: {
+        map: [['types', './types/index.js']],
+      },
+      // Use <rootDir>/tsconfig.json for typescript resolution
+      typescript: {},
+    },
+  },
+  overrides: [
+    {
+      files: [
+        '**/__mocks__/**',
+        '**/__fixtures__/**',
+        '**/__e2e__/**',
+        'jest/**',
+      ],
+      env: {
+        jest: true,
+      },
+    },
+  ],
+};

.flowconfig

@@ -23,9 +23,11 @@ flow-typed
 [options]
 emoji=true
 
+esproposal.export_star_as=enable
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
+module.name_mapper='types' -> '<PROJECT_ROOT>/types/index.js'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
@@ -43,6 +45,7 @@ module.ignore_non_literal_requires=true
 all=warn
 unnecessary-optional-chain=off
 dynamic-export=off
+unsafe-getters-setters=off
 
 # There is an ESLint rule for this
 unclear-type=off
@@ -63,6 +66,3 @@ unclear-type
 unsafe-getters-setters
 untyped-import
 untyped-type-import
-
-[version]
-^0.94.0

.gitignore

@@ -6,3 +6,5 @@ package-lock.json
 *.log
 build/
 .eslintcache
+!packages/cli/src/commands/init/__fixtures__/editTemplate/node_modules
+*.tsbuildinfo

.prettierrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  singleQuote: true,
+  trailingComma: 'all',
+  bracketSpacing: false,
+  jsxBracketSameLine: true,
+};

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+  // See http://go.microsoft.com/fwlink/?LinkId=827846
+  // for the documentation about the extensions.json format
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "redhat.vscode-yaml",
+    "flowtype.flow-for-vscode",
+    "esbenp.prettier-vscode"
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,24 @@
+{
+  "editor.rulers": [80],
+  "files.exclude": {
+    "**/.git": true,
+    "**/node_modules": true,
+    "**/build": true
+  },
+  "editor.formatOnSave": true,
+  "flow.useNPMPackagedFlow": true,
+  "javascript.validate.enable": false,
+  "prettier.eslintIntegration": true,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    {
+      "language": "typescript",
+      "autoFix": true
+    },
+    {
+      "language": "typescriptreact",
+      "autoFix": true
+    }
+  ]
+}

CODEOWNERS

@@ -0,0 +1 @@
+* @grabbou @thymikee @esemesek

CONTRIBUTING.md

@@ -22,7 +22,7 @@ Repository is splitted into two packages:
 You can test your changes by calling `cli.js` directly from the cloned repository. You need to make sure the version of React Native matches the one present in devDependencies of the CLI. Otherwise, you may get unexpected errors.
 
 ```sh
-node /path/to/cloned/project/packages/cli/index.js
+node /path/to/cloned/project/packages/cli/build/index.js
 ```
 
 ## Testing `init` command
@@ -35,13 +35,13 @@ yarn global add verdaccio
 ```
 * Run verdaccio
 ```sh
-yarn verdaccio
+verdaccio
 ```
 * Set npm registry to `verdaccio` proxy server
 ```sh
 npm set registry http://localhost:4873/
 ```
-* Clone `react-native` and `@react-native-commiunity/cli`
+* Clone `react-native` and `@react-native-community/cli`
 * Release new version of `@react-native-community/cli` to local npm proxy. If you have any issues, head over to [verdaccio](https://github.com/verdaccio/verdaccio) and check out the docs.
 ```
 cd /path/to/cli/packages/cli && npm publish
@@ -61,6 +61,25 @@ react-native init --version ${RN_VERSION}
 npm config set registry https://registry.npmjs.org/
 ```
 
+## Running `start` command
+
+In order for symlinks to work correctly when running `start` locally, set REACT_NATIVE_APP_ROOT as the root folder of your cli project:
+
+```
+REACT_NATIVE_APP_ROOT=path/to/cli node path/to/cli/packages/cli/build/index.js start
+```
+
+## Running CLI with React Native from the source
+
+First make sure you have RN repo checked out and CLI repo checked out and built. Then you can start a new RN project with local version of CLI and RN without publishing or proxy:
+
+1. Check out `react-native` repo. Then update template in local `react-native/template/package.json`, replacing dependency version of `react-native` with the absolute path of the react native repo, for example: "react-native": "file:///Users/username/react-native" (you can find the absolute path using `pwd` command)
+
+1. Go back up and create a new RN project: `node ./cli/packages/cli/build/index.js init --template=file:///path/to/local/react-native RNTestProject`
+
+1. To work with android, update gradle config in the newly created project following the second part of [Christoph's instructions](https://gist.github.com/cpojer/38a91f90614f35769e88410e3a387b48)
+
+1. Run start (as described above) and compile your app eg `node ../cli/packages/cli/build/index.js run-android` (make sure you definitely have NDK r17c installed before building android)
 
 ## Typechecking, linting and testing