expo-module-scripts 1.2.0 → 2.1.0

package/CHANGELOG.md

@@ -0,0 +1,29 @@
+# Changelog
+
+## Unpublished
+
+### 🛠 Breaking changes
+
+### 🎉 New features
+
+### 🐛 Bug fixes
+
+### 💡 Others
+
+## 2.1.0 — 2022-08-04
+
+### 🎉 New features
+
+- Add `templates/scripts/source-login-scripts.sh` vendoring tool for node binary resolution in Xcode build phases scripts. ([#15336](https://github.com/expo/expo/pull/15336) by [@kudo](https://github.com/kudo))
+
+### 🐛 Bug fixes
+
+- Fixed `source-login-scripts.sh` error when `extendedglob` is enabled in zsh config. ([#17024](https://github.com/expo/expo/pull/17024) by [@kudo](https://github.com/kudo))
+- Fixed `expo-module prepare` error if target packages contain temporary kotlin build files. ([#17023](https://github.com/expo/expo/pull/17023) by [@kudo](https://github.com/kudo))
+- Improved support of nvm sourcing in iOS shell scripts. ([#17109](https://github.com/expo/expo/pull/17109) by [@liamronancb](https://github.com/liamronancb))
+- Fixed `source-login-scripts.sh` ~/zlogin typo. ([#17622](https://github.com/expo/expo/pull/17622) by [@vrgimael](https://github.com/vrgimael))
+- Deprecated the unreliable `source-login-scripts.sh` and sourcing the Node.js binary path from `.xcode.env` and `.xcode.env.local`. ([#18330](https://github.com/expo/expo/pull/18330) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Updated `@testing-library/react-hooks` to version `7.0.1`. ([#14552](https://github.com/expo/expo/pull/14552)) by [@Simek](https://github.com/Simek))

package/README.md

@@ -6,11 +6,12 @@ This package contains a collection of common scripts for all Expo modules and th
 
 - [Getting Started](#getting-started)
 - [Setup](#setup)
+  - [🔌 Config Plugin](#-config-plugin)
   - [🤡 Jest](#-jest)
   - [📝 LICENSE](#-license)
   - [Side Effects](#side-effects)
   - [Entry Point and Types](#entry-point-and-types)
-  - [🔗 NPM Linking](#-npm-linking)
+  - [🔗 npm Linking](#-npm-linking)
 - [⌘ Commands](#-commands)
   - [configure](#configure)
   - [typecheck](#typecheck)
@@ -21,7 +22,8 @@ This package contains a collection of common scripts for all Expo modules and th
 - [Lifecycle Commands](#lifecycle-commands)
   - [prepare (npm lifecycle)](#prepare--npm-lifecycle-)
   - [prepublishOnly (npm lifecycle)](#prepublishonly--npm-lifecycle-)
-- [Unified dependencies](#unified-dependencies)
+- [Excluding Files from npm](#excluding-files-from-npm)
+- [Unified Dependencies](#unified-dependencies)
 
 ## Getting Started
 
@@ -37,22 +39,23 @@ npm install --save-dev expo-module-scripts
 
 Add the following scripts to your `package.json` and run `yarn`
 
-```json5
-{ 
+```json
+{
   "scripts": {
-      "build": "expo-module build",
-      "clean": "expo-module clean",
-      "test": "expo-module test",
-      "prepare": "expo-module prepare",
-      "prepublishOnly": "expo-module prepublishOnly",
-      "expo-module": "expo-module"
-  },
+    "build": "expo-module build",
+    "clean": "expo-module clean",
+    "test": "expo-module test",
+    "prepare": "expo-module prepare",
+    "prepublishOnly": "expo-module prepublishOnly",
+    "expo-module": "expo-module"
+  }
 }
 ```
 
 Running `yarn` will now run the `prepare` script, which generates any missing files:
-- [`.eslintrc.js`](./templates/.eslintrc.js) ([docs](https://eslint.org/docs/user-guide/configuring)) this extends [`eslint-config-universe`](https://github.com/expo/expo/tree/master/packages/eslint-config-universe).
-  - Optionally you can customize Prettier too: [.prettierrc guide](https://github.com/expo/expo/tree/master/packages/eslint-config-universe#customizing-prettier).
+
+- [`.eslintrc.js`](./templates/.eslintrc.js) ([docs](https://eslint.org/docs/user-guide/configuring)) this extends [`eslint-config-universe`](https://github.com/expo/expo/tree/main/packages/eslint-config-universe).
+  - Optionally you can customize Prettier too: [.prettierrc guide](https://github.com/expo/expo/tree/main/packages/eslint-config-universe#customizing-prettier).
 - [`.npmignore`](./templates/.npmignore) ([docs](https://docs.npmjs.com/misc/developers)) currently only ignores the `babel.config.js` in your module. You might also want to also add tests and docs.
   - Expo modules use `.npmignore` **instead of** the `files` field in the `package.json`.
   - (Pro Tip) Test which files get packaged by running `npm pack`. If you see files that aren't crucial to running the module, you should add them to `.npmignore`.
@@ -62,29 +65,104 @@ Running `yarn` will now run the `prepare` script, which generates any missing fi
   - Try and incorporate a table of contents (TOC).
 - [`tsconfig.json`](./templates/tsconfig.json) ([docs](https://www.typescriptlang.org/docs/handbook/tsconfig-json.html)) extends [`tsconfig.base.json`](./tsconfig.base.json) this is important for ensuring all Unimodules use the same version of TypeScript.
 
-You should also add the following fields to your `package.json`:
+Besides, running `yarn prepare` script will also synchronize optional files from `expo-module-scripts` when the file is present and contains the `@generated` pattern:
+
+- [`with-node.sh`](./templates/scripts/with-node.sh): An Xcode build phase script helper for Node.js binary resolution. It sources the project's **.xcode.env** and **.xcode.env.local** files, which may define an environment variable named `NODE_BINARY` to specify the file path of the Node.js binary to run.
+
+### 🔌 Config Plugin
+
+To create a [config plugin](https://github.com/expo/expo-cli/blob/main/packages/config-plugins/README.md) that automatically configures your native code, you have two options:
+
+1. Create a `plugin` folder and write your plugin in TypeScript (recommended).
+2. Create an `app.plugin.js` file in the project root and write the plugin in pure Node.js-compliant JavaScript.
+
+Config plugins must be transpiled for compatibility with Node.js (LTS). The features supported in Node.js are slightly different from those in Expo or React Native modules, which support ES6 import/export keywords and JSX, for example. This means we'll need two different `tsconfig.json` files and two different `src` (and `build`) folders — one for the code that will execute in an Expo or React Native app and the other for the plugin that executes in Node.js.
+
+This can quickly become complex, so we've created a system for easily targeting the plugin folder.
+
+#### Plugin setup
+
+The following files are required for a TypeScript plugin:
+
+```
+╭── app.plugin.js ➡️ Entry file
+╰── plugin/ ➡️ All code related to the plugin
+    ├── __tests__/ ➡️ Optional: Folder for tests related to the plugin
+    ├── tsconfig.json ➡️ The TypeScript config for transpiling the plugin to JavaScript
+    ├── jest.config.js ➡️ Optional: The Jest preset
+    ╰── src/index.ts ➡️ The TypeScript entry point for your plugin
+```
+
+Create an `app.plugin.js` (the entry point for a config plugin):
+
+```js
+module.exports = require('./plugin/build');
+```
+
+Create a `plugin/tsconfig.json` file. Notice that this uses `tsconfig.plugin` as the base config:
+
+```json
+{
+  "extends": "expo-module-scripts/tsconfig.plugin",
+  "compilerOptions": {
+    "outDir": "build",
+    "rootDir": "src"
+  },
+  "include": ["./src"],
+  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+}
+```
+
+In your `plugin/src/index.ts` file, write your TypeScript config plugin:
+
+```ts
+import { ConfigPlugin } from '@expo/config-plugins';
+
+const withNewName: ConfigPlugin<{ name?: string }> = (config, { name = 'my-app' } = {}) => {
+  config.name = name;
+  return config;
+};
+
+export default withNewName;
+```
+
+> 💡 Tip: Using named functions makes debugging easier with `EXPO_DEBUG=true`
+
+Optionally, you can add `plugin/jest.config.js` to override the default project Jest preset.
+
+```ts
+module.exports = require('expo-module-scripts/jest-preset-plugin');
+```
+
+Use the following scripts to interact with the plugin:
+
+- `yarn build plugin`: Build the plugin.
+- `yarn clean plugin`: Delete the `plugin/build` folder.
+- `yarn lint plugin`: Lint the `plugin/src` folder.
+- `yarn test plugin`: Alias for `npx jest --rootDir ./plugin --config ./plugin/jest.config.js`, uses the project's Jest preset if `plugin/jest.config.js` doesn't exist.
+- `yarn prepare`: Prepare the plugin and module for publishing.
 
 ### 🤡 Jest
 
-The Jest preset extends [`jest-expo`](https://github.com/expo/expo/tree/master/packages/jest-expo) or [`jest-expo-enzyme`](https://github.com/expo/expo/tree/master/packages/jest-expo-enzyme) and adds proper TypeScript support and type declarations to the presets.
+The Jest preset extends [`jest-expo`](https://github.com/expo/expo/tree/main/packages/jest-expo) or [`jest-expo-enzyme`](https://github.com/expo/expo/tree/main/packages/jest-expo-enzyme) and adds proper TypeScript support and type declarations to the presets.
 
 **For unit testing API-based modules:**
 
-```json5
+```json
 {
   "jest": {
-    "preset": "expo-module-scripts/universal"
-  },
+    "preset": "expo-module-scripts"
+  }
 }
 ```
 
 **For unit testing component-based modules:**
 
-```json5
+```json
 {
   "jest": {
     "preset": "expo-module-scripts/enzyme"
-  },
+  }
 }
 ```
 
@@ -92,9 +170,9 @@ The Jest preset extends [`jest-expo`](https://github.com/expo/expo/tree/master/p
 
 This makes it easier for other members of the community to work with your package. Expo usually has the **MIT** license.
 
-```json5
+```json
 {
-  "license": "MIT",
+  "license": "MIT"
 }
 ```
 
@@ -104,9 +182,9 @@ The [`@expo/webpack-config`](https://www.npmjs.com/package/@expo/webpack-config)
 
 [**Learn more about side effects**](https://webpack.js.org/guides/tree-shaking/)
 
-```json5
+```json
 {
-  "sideEffects": false,
+  "sideEffects": false
 }
 ```
 
@@ -118,18 +196,18 @@ We recommend you name the initial file after the module for easier searching. Be
 
 [**Learn more about "types" field**](https://webpack.js.org/guides/tree-shaking/)
 
-```json5
+```json
 {
   "main": "build/Camera.js",
-  "types": "build/Camera.d.ts",
+  "types": "build/Camera.d.ts"
 }
 ```
 
 > 💡 You technically don't need to define the types file if it's named the same as the `main` file but Expo modules always define it (which is what TypeScript recommends).
 
-### 🔗 NPM Linking
+### 🔗 npm Linking
 
-Make your package accessible to NPM users by adding the following fields:
+Make your package accessible to npm users by adding the following fields:
 
 Expo modules use the long form object when possible to better accommodate monorepos and hyperlinks:
 
@@ -137,7 +215,7 @@ Expo modules use the long form object when possible to better accommodate monore
 - [bugs docs](https://docs.npmjs.com/files/package.json#bugs)
 - [repository docs](https://docs.npmjs.com/files/package.json#repository)
 
-```json5
+```json
 {
   "homepage": "https://github.com/YOU/expo-YOUR_PACKAGE#readme",
   "repository": {
@@ -146,7 +224,7 @@ Expo modules use the long form object when possible to better accommodate monore
   },
   "bugs": {
     "url": "https://github.com/YOU/expo-YOUR_PACKAGE/issues"
-  },
+  }
 }
 ```
 
@@ -168,7 +246,7 @@ For scripts that need to run as part of the npm lifecycle, you'd invoke the comm
 {
   "scripts": {
     "prepare": "expo-module prepare",
-    "prepublishOnly": "expo-module prepublishOnly",
+    "prepublishOnly": "expo-module prepublishOnly"
   }
 }
 ```
@@ -177,7 +255,7 @@ These are the commands:
 
 ### configure
 
-This generates common configuration files like `tsonfig.json` for the package. These auto-generated files are meant to be read-only and committed to Git.
+This generates common configuration files like `tsconfig.json` for the package. These auto-generated files are meant to be read-only and committed to Git.
 
 ### typecheck
 
@@ -189,6 +267,10 @@ This compiles the source JS or TypeScript to "compiled" JS that Expo can load. W
 
 If we wished to switch to using just Babel with the TypeScript plugin, this package would let us change the implementation of the `build` command and apply it to all packages automatically.
 
+#### build plugin
+
+Running `build plugin` builds the plugin source code in `plugin/src`.
+
 ### test
 
 We run tests using Jest with ts-jest, which runs TypeScript and Babel. This setup type checks test files and mimics the `build` command's approach of running `tsc` followed by Babel.
@@ -199,10 +281,27 @@ If we were to use just Babel with the TypeScript plugin for the `build` command,
 
 This runs ESLint over the source JS and TypeScript files.
 
+One of the rules enforced is restricting any imports from the `fbjs` library. As stated in that [library's readme](https://github.com/facebook/fbjs#purpose):
+
+> If you are consuming the code here and you are not also a Facebook project, be prepared for a bad time.
+
+Replacements for common `fbjs` uses-cases are listed below:
+
+- `invariant`- replace with [`invariant`](https://www.npmjs.com/package/invariant)
+- `ExecutionEnvironment`- replace with [`Platform` from `@unimodules/core`](https://github.com/expo/expo/blob/main/packages/%40unimodules/react-native-adapter/src/Platform.ts)
+
+#### lint plugin
+
+Running `lint plugin` will lints the plugin source code in `plugin/src`.
+
 ### clean
 
 This deletes the build directory.
 
+#### clean plugin
+
+Running `clean plugin` will delete the `plugin/build` directory.
+
 ## Lifecycle Commands
 
 These are commands to run as part of [the npm scripts lifecycle](https://docs.npmjs.com/misc/scripts).
@@ -215,6 +314,10 @@ Runs `clean` and `build`.
 
 Runs `npm-proofread`, which ensures a [dist-tag](https://docs.npmjs.com/cli/dist-tag) is specified when publishing a prerelease version.
 
-## Unified dependencies
+## Excluding Files from npm
+
+By convention, `expo-module-scripts` uses `.npmignore` to exclude all top-level hidden directories (directories starting with `.`) from being published to npm. This behavior is useful for files that need to be in the Git repository but not in the npm package.
+
+## Unified Dependencies
 
 This package depends on common development dependencies like Babel and Jest. The commands for compiling and testing JS need these dependencies, and the most important benefit is that all Expo module packages use the same version of Babel, Jest, their various plugins, and other development dependencies. This does remove the flexibility to customize the dependency versions for each module. We intentionally make this tradeoff to prioritize Expo as a whole over individual modules.

package/bin/expo-module-build

@@ -5,6 +5,18 @@ set -eo pipefail
 script_dir="$(dirname "$0")"
 
 args=("$@")
+
+# If the command is used like `yarn build plugin`, set the --build option to point to
+# plugin/tsconfig.json
+if [ "$1" == "plugin" ]; then
+  # `--build` must be the first argument, so reset the array
+  args=()
+  args+=("--build")
+  args+=("$(pwd)/plugin")
+  # Push the rest of the arguments minus the `plugin` arg
+  args+=("${@:2}")
+fi
+
 if [[ -t 1 && (-z "$CI" && -z "$EXPO_NONINTERACTIVE") ]]; then
   args+=("--watch")
 fi

package/bin/expo-module-clean

@@ -7,4 +7,10 @@ if [[ ! -f package.json ]]; then
   exit 1
 fi
 
-rm -rf build
+directory=$1
+# Support `yarn clean plugin` to delete ./plugin/build/
+if [[ -n $directory ]]; then
+  rm -rf "$directory/build"
+else
+  rm -rf build
+fi

package/bin/expo-module-configure

@@ -6,11 +6,71 @@ script_dir="$(dirname "$0")"
 
 shopt -s dotglob
 
+# an optional template file will be synced only if the target file is present in the file system,
+# and its content contains the string `@generated`.
+OPTIONAL_TEMPLATE_FILES=(
+  # add a relative file path from `templates/` for each new optional file
+  "scripts/with-node.sh"
+)
+
+# returns relative file paths inside a given directory without the leading "./".
+# usage: get_relative_files "/path/to/dir"
+get_relative_files() {
+  pushd $1 > /dev/null
+  local files=$(find . -type f | cut -c 3-)
+  popd > /dev/null
+  echo $files
+}
+
+
+# syncs the source file if the target file is missing or the existing file contains `@generated`.
+# usage: sync_file_if_missing "/path/source_path" "/path/target_path"
+sync_file_if_missing() {
+  local source=$1
+  local target=$2
+  # echo "sync_file_if_missing $source -> $target"
+  if [ ! -f "$target" ] || grep --quiet "@generated" "$target"; then
+    rsync --checksum "$source" "$target"
+  fi
+}
+
+# syncs the source file if the target file is present in the file system and its content contains `@generated`.
+# usage: sync_file_if_present "/path/source_path" "/path/target_path"
+sync_file_if_present() {
+  local source=$1
+  local target=$2
+  # echo "sync_file_if_present $source -> $target"
+  if [ -f "$target" ] && grep --quiet "@generated" "$target"; then
+    rsync --checksum "$source" "$target"
+  fi
+}
+
+# check if a file is listed in `OPTIONAL_TEMPLATE_FILES`.
+# usage: if is_optional_file "path/to/file"; then ... fi
+is_optional_file() {
+  local file=$1
+  for optional_file in "${OPTIONAL_TEMPLATE_FILES[@]}"; do
+    if [ "$file" = "$optional_file" ]; then
+      true
+      return
+    fi
+  done
+
+  false
+  return
+}
+
+#
+# script main starts from here
+#
+
 "$script_dir/expo-module-readme"
 
-for template_file in "$script_dir"/../templates/*; do
-  output_file="$(basename "$template_file")"
-  if [ ! -f "$output_file" ] || grep --quiet "@generated" "$output_file"; then
-    rsync --checksum "$template_file" "$output_file"
+template_files=$(get_relative_files "$script_dir/../templates")
+for template_relative_file in $template_files; do
+  if is_optional_file "$template_relative_file"; then
+    sync_file_if_present "$script_dir/../templates/$template_relative_file" "$template_relative_file"
+  else
+    sync_file_if_missing "$script_dir/../templates/$template_relative_file" "$template_relative_file"
   fi
 done

package/bin/expo-module-lint

@@ -4,4 +4,21 @@ set -eo pipefail
 
 script_dir="$(dirname "$0")"
 
-"$script_dir/expo-module-eslint" --ext .js,.jsx,.ts,.tsx,.d.ts "$@" src
+args=()
+
+# If the command is used like `yarn lint plugin` then set the target to `plugin/src`
+if [ "$1" == "plugin" ]; then
+  # Push the rest of the arguments minus the `plugin` arg
+  args+=("${@:2}")
+  args+=("plugin/src")
+  if ! [[ -d plugin ]]; then
+    # Good DX cuz Expo
+    printf "\n\033[1;33mThe \`plugin/src\` folder does not exist in this project; please create it and try again.\033[0m\n\n"
+    exit 0
+  fi
+else
+  args+=("$@") 
+  args+=("src") 
+fi
+
+"$script_dir/expo-module-eslint" "${args[@]}" 

package/bin/expo-module-prepare

@@ -6,6 +6,13 @@ script_dir="$(dirname "$0")"
 
 export EXPO_NONINTERACTIVE=1
 
+echo "Configuring module"
 "$script_dir/expo-module-clean"
 "$script_dir/expo-module-configure"
 "$script_dir/expo-module-build"
+
+if [[ -d plugin ]]; then 
+  echo "Configuring plugin"
+  "$script_dir/expo-module-clean" plugin
+  "$script_dir/expo-module-build" plugin
+fi

package/bin/expo-module-readme

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 'use strict';
 
-const path = require('path');
 const fs = require('fs');
 const glob = require('glob');
+const path = require('path');
 
 function replaceAll(current, replacement, content) {
-  let regexp = new RegExp(escapeRegExp('${' + current + '}'), 'g');
+  const regexp = new RegExp(escapeRegExp('${' + current + '}'), 'g');
   return content.replace(regexp, replacement);
 }
 
@@ -15,53 +15,53 @@ function escapeRegExp(string) {
 }
 
 function removeUnapplicableSections(name, content) {
-  let opener = `<!--- remove for ${name} --->`;
-  let closer = `<!--- end remove for ${name} --->`;
+  const opener = `<!--- remove for ${name} --->`;
+  const closer = `<!--- end remove for ${name} --->`;
   let nextContent = content;
 
   while (nextContent.includes(opener)) {
-    let openIndex = nextContent.indexOf(opener);
+    const openIndex = nextContent.indexOf(opener);
     let closeIndex = nextContent.indexOf(closer);
     if (!closeIndex) {
       console.warn(`Can't find section closer for ${name}`);
       closeIndex = openIndex + opener.length;
     }
-    let section = nextContent.substring(openIndex, closeIndex + closer.length);
+    const section = nextContent.substring(openIndex, closeIndex + closer.length);
     nextContent = nextContent.replace(section, '');
   }
   return nextContent;
 }
 
 function removeOptionals(content) {
-  let regexp = new RegExp(escapeRegExp('<!---') + '.*' + escapeRegExp('--->') + '\n', 'g');
+  const regexp = new RegExp(escapeRegExp('<!---') + '.*' + escapeRegExp('--->') + '\n', 'g');
   return content.replace(regexp, '');
 }
 
-const DEFAULT_HOMEPAGE = 'https://docs.expo.io/versions/latest/';
+const DEFAULT_HOMEPAGE = 'https://docs.expo.dev/versions/latest/';
 
 function generateREADME() {
-  let template = path.join(__dirname, '..', 'templates', 'README.md');
+  const template = path.join(__dirname, '..', 'templates', 'README.md');
   let readme = fs.readFileSync(template, 'utf8');
-  let pkg = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'package.json'), 'utf8'));
-  let packageName = pkg.name;
-  let homepage = pkg.homepage || DEFAULT_HOMEPAGE;
-  let description = pkg.description || 'Put a description of your Unimodule here';
+  const pkg = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'package.json'), 'utf8'));
+  const packageName = pkg.name;
+  const homepage = pkg.homepage || DEFAULT_HOMEPAGE;
+  const description = pkg.description || 'Put a description of your Unimodule here';
 
   // This isn't really accurate, but these all behave the same as far as READMEs go
-  let isInterface = packageName.endsWith('-interface') || packageName.endsWith('-provider');
+  const isInterface = packageName.endsWith('-interface') || packageName.endsWith('-provider');
 
-  let isAndroid = fs.existsSync(path.join(process.cwd(), 'android'));
-  let isIOS = fs.existsSync(path.join(process.cwd(), 'ios'));
+  const isAndroid = fs.existsSync(path.join(process.cwd(), 'android'));
+  const isIOS = fs.existsSync(path.join(process.cwd(), 'ios'));
 
   // Search in docs/versions/unversioned/sdk/*.md - can't find it? Ask what it should be and initialize for them
   readme = replaceAll('packageName', packageName, readme);
   readme = replaceAll('description', description, readme);
 
   if (isIOS) {
-    let podspecs = glob.sync('ios/**/*.podspec');
-    let podspecPath = podspecs[0];
-    let podName = (() => {
-      let parts = podspecPath.split('/');
+    const podspecs = glob.sync('{ios/**/,}*.podspec');
+    const podspecPath = podspecs[0];
+    const podName = (() => {
+      const parts = podspecPath.split('/');
       return parts[parts.length - 1].replace('.podspec', '');
     })();
 
@@ -81,7 +81,7 @@ function generateREADME() {
       );
     } else {
       docName = (() => {
-        let parts = homepage.split('/');
+        const parts = homepage.split('/');
         // Handle both with and without trailing slash
         let name = parts[parts.length - 1];
         if (name === '') {
@@ -92,7 +92,7 @@ function generateREADME() {
     }
     readme = replaceAll('docName', docName, readme);
     if (isAndroid) {
-      let androidPackages = glob.sync('android/**/*Package.java');
+      const androidPackages = glob.sync('android/src/**/*Package.{java,kt}');
       let androidPackage;
       let androidPackagePath = 'expo.modules.yourModule.YourPackage';
       let androidPackageName = 'YourPackage';
@@ -115,7 +115,7 @@ function generateREADME() {
             .replace(/\//g, '.')
             .replace('.java', '');
           androidPackageName = (() => {
-            let parts = androidPackagePath.split('.');
+            const parts = androidPackagePath.split('.');
             return parts[parts.length - 1];
           })();
 
@@ -133,8 +133,8 @@ function generateREADME() {
   return removeOptionals(readme);
 }
 
-let readme = generateREADME();
-let readmePath = path.join(process.cwd(), 'README.md');
+const readme = generateREADME();
+const readmePath = path.join(process.cwd(), 'README.md');
 if (fs.existsSync(readmePath)) {
   console.log('expo-module-scripts: README.md exists, not updating');
 } else {

package/bin/expo-module-test

@@ -5,6 +5,22 @@ set -eo pipefail
 script_dir="$(dirname "$0")"
 
 args=("$@")
+
+# If the command is used like `yarn test plugin`, set the --rootDir option to the `plugin` directory
+if [ "$1" == "plugin" ]; then
+  args=()
+  args+=("--rootDir")
+  args+=("plugin")
+
+  if [[ -f plugin/jest.config.js ]]; then
+    args+=("--config")
+    args+=("plugin/jest.config.js")
+  fi
+
+  # Push the rest of the arguments minus the `plugin` arg
+  args+=("${@:2}")
+fi
+
 if [[ -t 1 && (-z "$CI" && -z "$EXPO_NONINTERACTIVE") ]]; then
   args+=("--watch")
 fi

package/eslintrc.base.js

@@ -8,4 +8,13 @@ module.exports = {
       globals: { __DEV__: true },
     },
   ],
+  rules: {
+    'no-restricted-imports': [
+      'warn',
+      {
+        // fbjs is a Facebook-internal package not intended to be a public API
+        patterns: ['fbjs/*', 'fbjs'],
+      },
+    ],
+  },
 };

package/jest-preset-plugin.js

@@ -0,0 +1,10 @@
+const nodePreset = {
+  testEnvironment: 'node',
+  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
+  transform: {
+    '^.+\\.[jt]sx?$': ['babel-jest', { configFile: require.resolve('./babel.config.base.js') }],
+  },
+  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
+};
+
+module.exports = nodePreset;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-module-scripts",
-  "version": "1.2.0",
+  "version": "2.1.0",
   "description": "A private package for various tasks for Expo module packages like compiling and testing",
   "main": "index.js",
   "bin": {
@@ -24,20 +24,23 @@
   "bugs": {
     "url": "https://github.com/expo/expo/issues"
   },
-  "homepage": "https://github.com/expo/expo/tree/master/packages/expo-module-scripts#readme",
+  "homepage": "https://github.com/expo/expo/tree/main/packages/expo-module-scripts#readme",
   "dependencies": {
     "@babel/cli": "^7.1.2",
     "@expo/npm-proofread": "^1.0.1",
-    "@types/jest": "^24.0.11",
-    "babel-preset-expo": "~8.0.0",
+    "@testing-library/react-hooks": "^7.0.1",
+    "@tsconfig/node12": "^1.0.9",
+    "@types/jest": "^26.0.24",
+    "babel-preset-expo": "~9.2.0",
     "commander": "^2.19.0",
-    "eslint-config-universe": "^2.1.0",
-    "find-yarn-workspace-root": "^1.2.1",
-    "glob": "^7.1.3",
-    "jest-expo": "~36.0.1",
-    "jest-expo-enzyme": "^0.0.1",
-    "ts-jest": "~24.0.2",
-    "typescript": "^3.7.2"
+    "eslint-config-universe": "^11.0.0",
+    "find-yarn-workspace-root": "^2.0.0",
+    "glob": "^7.1.7",
+    "jest-expo": "~46.0.0",
+    "jest-expo-enzyme": "^1.2.3",
+    "jest-watch-typeahead": "0.6.4",
+    "ts-jest": "~26.3.0",
+    "typescript": "^4.3.5"
   },
-  "gitHead": "4e13b3cb88d9205f14bee7764038ab2dd9ef1fbd"
+  "gitHead": "8074a07eb9b07884f66c88cd7001376a9c28ca96"
 }

package/templates/README.md

@@ -5,17 +5,17 @@ ${description}
 
 # API documentation
 
-- [Documentation for the master branch](https://github.com/expo/expo/blob/master/docs/pages/versions/unversioned/sdk/${docName}.md)
-- [Documentation for the latest stable release](https://docs.expo.io/versions/latest/sdk/${docName}/)
+- [Documentation for the main branch](https://github.com/expo/expo/blob/main/docs/pages/versions/unversioned/sdk/${docName}.md)
+- [Documentation for the latest stable release](https://docs.expo.dev/versions/latest/sdk/${docName}/)
 
 <!--- end remove for interfaces --->
 # Installation in managed Expo projects
 
-For managed [managed](https://docs.expo.io/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](#api-documentation). If you follow the link and there is no documentation available then this library is not yet usable within managed projects &mdash; it is likely to be included in an upcoming Expo SDK release.
+For [managed](https://docs.expo.dev/versions/latest/introduction/managed-vs-bare/) Expo projects, please follow the installation instructions in the [API documentation for the latest stable release](#api-documentation). If you follow the link and there is no documentation available then this library is not yet usable within managed projects &mdash; it is likely to be included in an upcoming Expo SDK release.
 
 # Installation in bare React Native projects
 
-For bare React Native projects, you must ensure that you have [installed and configured the `react-native-unimodules` package](https://github.com/unimodules/react-native-unimodules) before continuing.
+For bare React Native projects, you must ensure that you have [installed and configured the `expo` package](https://docs.expo.dev/bare/installing-expo-modules/) before continuing.
 
 ### Add the package to your npm dependencies
 
@@ -26,7 +26,7 @@ npm install ${packageName}
 <!--- remove for no-ios --->
 ### Configure for iOS
 
-Run `pod install` in the ios directory after installing the npm package.
+Run `npx pod-install` after installing the npm package.
 
 <!--- end remove for no-ios --->
 

package/templates/scripts/with-node.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# Copyright 2018-present 650 Industries. All rights reserved.
+#
+# @generated by expo-module-scripts
+#
+# USAGE:
+# ./with-node.sh command
+
+CURR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+
+# Start with a default
+NODE_BINARY=$(command -v node)
+export NODE_BINARY
+
+# Override the default with the global environment
+ENV_PATH="$PODS_ROOT/../.xcode.env"
+if [[ -f "$ENV_PATH" ]]; then
+  source "$ENV_PATH"
+fi
+
+# Override the global with the local environment
+LOCAL_ENV_PATH="${ENV_PATH}.local"
+if [[ -f "$LOCAL_ENV_PATH" ]]; then
+  source "$LOCAL_ENV_PATH"
+fi
+
+if [[ -n "$NODE_BINARY" && -x "$NODE_BINARY" ]]; then
+  echo "Node found at: ${NODE_BINARY}"
+else
+  cat >&2 << EOF
+[ERROR] Could not find "node" while running an Xcode build script. You need to specify the path to your Node.js executable by defining an environment variable named NODE_BINARY in your project's .xcode.env or .xcode.env.local file. You can set this up quickly by running:
+
+  echo "export NODE_BINARY=\$(command -v node)" >> .xcode.env
+
+in the ios folder of your project.
+EOF
+  exit 1
+fi
+
+# Execute argument, if present
+if [[ "$#" -gt 0 ]]; then
+  "$NODE_BINARY" $@
+fi

package/templates/tsconfig.json

@@ -5,5 +5,5 @@
     "outDir": "./build"
   },
   "include": ["./src"],
-  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
+  "exclude": ["**/__mocks__/*", "**/__tests__/*", "**/__stories__/*"]
 }

package/tsconfig.base.json

@@ -2,10 +2,9 @@
   "compilerOptions": {
     "target": "esnext",
     "lib": ["dom", "esnext"],
-    "jsx": "react-native",
+    "jsx": "react",
     "moduleResolution": "node",
     "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
     "types": ["jest", "jest-require"],
     "typeRoots": [
       "./ts-declarations",
@@ -13,6 +12,7 @@
     ],
     "sourceMap": true,
     "declaration": true,
+    "declarationMap": true,
     "inlineSources": true,
     "strictNullChecks": true,
     "strictPropertyInitialization": true,

package/tsconfig.plugin.json

@@ -0,0 +1,6 @@
+{
+  "extends": "@tsconfig/node12/tsconfig.json",
+  "compilerOptions": {
+    "declaration": true
+  }
+}