expo-module-scripts 3.4.1 → 3.5.0

package/CHANGELOG.md

@@ -10,18 +10,33 @@
 
 ### 💡 Others
 
-## 3.4.1 — 2024-02-01
+## 3.5.0 — 2024-04-18
+
+### 🎉 New features
+
+- Add support for package cli and utils subpackages (like plugins). ([#27083](https://github.com/expo/expo/pull/27083) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Use appropriate version of `tsc` when executing `expo-module build` in monorepos with multiple typescript versions installed ([#27779](https://github.com/expo/expo/pull/27779) by [@peter.jozsa](https://github.com/peter.jozsa)
+
+### 💡 Others
+
+- Target Node 18 in the Babel CLI preset. ([#26847](https://github.com/expo/expo/pull/26847) by [@simek](https://github.com/simek))
+- Update Babel dependencies to the latest version from `7.23` releases. ([#26525](https://github.com/expo/expo/pull/26525) by [@simek](https://github.com/simek))
+
+## 3.4.1 - 2024-02-01
 
 ### 🐛 Bug fixes
 
-- Use `node18` tsconfig in `expo-module-scripts` to match the dependencies. ([#26738](https://github.com/expo/expo/pull/26738)) by ([@krystofwoldrich](https://github.com/krystofwoldrich))
+- Use `node18` tsconfig in `expo-module-scripts` to match the dependencies. ([#26738](https://github.com/expo/expo/pull/26738)) by ([@krystofwoldrich](https://github.com/krystofwoldrich)) ([#26738](https://github.com/expo/expo/pull/26738) by [@krystofwoldrich](https://github.com/krystofwoldrich))
 
 ## 3.4.0 — 2023-12-12
 
 ### 🎉 New features
 
 - Add Node-specific Babel and Jest configurations. ([#25458](https://github.com/expo/expo/pull/25458) by [@byCedric](https://github.com/byCedric))
-- Add Node override in ESLint config for root configuraiton files. ([#25767](https://github.com/expo/expo/pull/25767) by [@byCedric](https://github.com/byCedric))
+- Add Node override in ESLint config for root configuration files. ([#25767](https://github.com/expo/expo/pull/25767) by [@byCedric](https://github.com/byCedric))
 
 ## 3.3.0 — 2023-11-14
 

package/babel.config.cli.js

@@ -7,7 +7,7 @@ module.exports = function (api) {
         {
           modules: false, // Disable the default `modules-commonjs`, to enable lazy evaluation
           targets: {
-            node: '12.0.0',
+            node: '18.0.0',
           },
         },
       ],
@@ -15,11 +15,11 @@ module.exports = function (api) {
     ],
     plugins: [
       require('babel-plugin-dynamic-import-node'),
-      require('@babel/plugin-proposal-export-namespace-from'),
+      require('@babel/plugin-transform-export-namespace-from'),
       [
         require('@babel/plugin-transform-modules-commonjs'),
         {
-          lazy: /* istanbul ignore next */ (source) => true,
+          lazy: () => true,
         },
       ],
     ],

package/babel.config.utils.js

@@ -0,0 +1,6 @@
+module.exports = function (api) {
+  api.cache(true);
+  return {
+    plugins: ['@babel/plugin-transform-flow-strip-types'],
+  };
+};

package/bin/expo-module-build

@@ -8,14 +8,18 @@ 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
+extra_module_build_types=("plugin" "cli" "utils")
+for i in "${extra_module_build_types[@]}"
+do
+  if [ "$1" == "$i" ]; then
+    # `--build` must be the first argument, so reset the array
+    args=()
+    args+=("--build")
+    args+=("$(pwd)/$i")
+    # Push the rest of the arguments minus the `plugin` arg
+    args+=("${@:2}")
+  fi
+done
 
 if [[ -t 1 && (-z "$CI" && -z "$EXPO_NONINTERACTIVE") ]]; then
   args+=("--watch")

package/bin/expo-module-lint

@@ -7,18 +7,27 @@ script_dir="$(dirname "$0")"
 args=()
 
 # If the command is used like `yarn lint plugin` then set the target to `plugin/src`
-if [ "$1" == "plugin" ]; then
+extra_module_build_types=("plugin" "cli" "utils")
+found_target=""
+for i in "${extra_module_build_types[@]}"
+do
+  if [ "$1" == "$i" ]; then
+    found_target=$i
+  fi
+done
+
+if [[ -n "$found_target" ]]; then
   # Push the rest of the arguments minus the `plugin` arg
   args+=("${@:2}")
-  args+=("plugin/src")
-  if ! [[ -d plugin ]]; then
+  args+=("$found_target/src")
+  if ! [[ -d "$found_target" ]]; 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"
+    printf "\n\033[1;33mThe \`$found_target/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") 
+  args+=("$@")
+  args+=("src")
 fi
 
-"$script_dir/expo-module-eslint" "${args[@]}" 
+"$script_dir/expo-module-eslint" "${args[@]}"

package/bin/expo-module-prepare

@@ -11,8 +11,12 @@ echo "Configuring module"
 "$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
+extra_module_build_types=("plugin" "cli" "utils")
+for i in "${extra_module_build_types[@]}"
+do
+  if [[ -d "$i" ]]; then
+    echo "Configuring $i"
+    "$script_dir/expo-module-clean" "$i"
+    "$script_dir/expo-module-build" "$i"
+  fi
+done

package/bin/expo-module-test

@@ -7,22 +7,26 @@ 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")
-  else
-    args+=("--config")
-    args+=("$(node --print "require.resolve('expo-module-scripts/jest-preset-plugin.js')")")
+extra_module_build_types=("plugin" "cli" "utils")
+for i in "${extra_module_build_types[@]}"
+do
+  if [ "$1" == "$i" ]; then
+    args=()
+    args+=("--rootDir")
+    args+=("$i")
+
+    if [[ -f "$i/jest.config.js" ]]; then
+      args+=("--config")
+      args+=("$i/jest.config.js")
+    else
+      args+=("--config")
+      args+=("$(node --print "require.resolve('expo-module-scripts/jest-preset-$i.js')")")
+    fi
+
+    # Push the rest of the arguments minus the `plugin` arg
+    args+=("${@:2}")
   fi
-
-  # Push the rest of the arguments minus the `plugin` arg
-  args+=("${@:2}")
-fi
+done
 
 if [[ -t 1 && (-z "$CI" && -z "$EXPO_NONINTERACTIVE") ]]; then
   args+=("--watch")

package/bin/expo-module-tsc

@@ -4,4 +4,4 @@ set -eo pipefail
 
 script_dir="$(dirname "$0")"
 
-"$script_dir/npx" tsc "$@"
+"$script_dir/npx" --package=typescript tsc "$@"

package/createJestPreset.js

@@ -4,7 +4,7 @@ const findYarnWorkspaceRoot = require('find-yarn-workspace-root');
 const fs = require('fs');
 const path = require('path');
 
-module.exports = function(basePreset) {
+module.exports = function (basePreset) {
   // Explicitly catch and log errors since Jest sometimes suppresses error messages
   try {
     return _createJestPreset(basePreset);
@@ -41,12 +41,12 @@ function _createBabelConfiguration() {
 }
 
 function _createTypeScriptConfiguration() {
-  let tsConfigFileName = 'tsconfig.json';
+  const tsConfigFileName = 'tsconfig.json';
   // The path to tsconfig.json is resolved relative to cwd
-  let tsConfigPath = path.resolve(tsConfigFileName);
+  const tsConfigPath = path.resolve(tsConfigFileName);
 
-  let jestTsConfigDirectory = path.join('.expo');
-  let jestTsConfig = {
+  const jestTsConfigDirectory = path.join('.expo');
+  const jestTsConfig = {
     extends: tsConfigPath,
     compilerOptions: {
       // Explicitly specify "module" so that ts-jest doesn't provide its default
@@ -59,11 +59,11 @@ function _createTypeScriptConfiguration() {
     },
   };
 
-  let jestTsConfigJson = JSON.stringify(jestTsConfig, null, 2);
+  const jestTsConfigJson = JSON.stringify(jestTsConfig, null, 2);
   // The TypeScript configuration needs to be under the project directory so that TypeScript finds
   // type declaration packages that are installed in the project or workspace root (writing it to a
   // temporary directory would not work, for example)
-  let jestTsConfigPath = path.join(jestTsConfigDirectory, 'tsconfig.jest.json');
+  const jestTsConfigPath = path.join(jestTsConfigDirectory, 'tsconfig.jest.json');
 
   // NOTE: remove this existsSync call once we require Node 10.12+
   if (!fs.existsSync(jestTsConfigPath)) {
@@ -82,21 +82,21 @@ function _createTypeScriptConfiguration() {
  */
 function _getDefaultTypeRoots(currentDirectory) {
   currentDirectory = path.resolve(currentDirectory);
-  let typeRoots = ['./node_modules/@types'];
+  const typeRoots = ['./node_modules/@types'];
 
   // If the TypeScript configuration is in a subdirectory of a package, find the package's directory
   // since find-yarn-workspace-root works only from workspace packages
-  let packageDirectory = _findPackageDirectory(currentDirectory);
+  const packageDirectory = _findPackageDirectory(currentDirectory);
   if (!packageDirectory) {
     return typeRoots;
   }
 
-  let workspaceRootPath = findYarnWorkspaceRoot(packageDirectory);
+  const workspaceRootPath = findYarnWorkspaceRoot(packageDirectory);
 
   // If the TypeScript configuration is in a Yarn workspace, workspace's npm dependencies may be
   // installed in the workspace root. If the configuration is in a non-workspace package, its
   // dependencies are installed only in the package's directory.
-  let rootPath = workspaceRootPath || packageDirectory;
+  const rootPath = workspaceRootPath || packageDirectory;
 
   let relativeAncestorDirectoryPath = '..';
   while (currentDirectory !== rootPath) {

package/jest-preset-cli.js

@@ -9,4 +9,6 @@ module.exports = {
     require.resolve('jest-watch-typeahead/filename'),
     require.resolve('jest-watch-typeahead/testname'),
   ],
+  // See: https://jestjs.io/docs/configuration#prettierpath-string
+  prettierPath: require.resolve('jest-snapshot-prettier'),
 };

package/jest-preset-plugin.js

@@ -9,4 +9,6 @@ module.exports = {
     require.resolve('jest-watch-typeahead/filename'),
     require.resolve('jest-watch-typeahead/testname'),
   ],
+  // See: https://jestjs.io/docs/configuration#prettierpath-string
+  prettierPath: require.resolve('jest-snapshot-prettier'),
 };

package/jest-preset-utils.js

@@ -0,0 +1,14 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  testEnvironment: 'node',
+  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
+  transform: {
+    '^.+\\.[jt]sx?$': ['babel-jest', { configFile: require.resolve('./babel.config.cli.js') }],
+  },
+  watchPlugins: [
+    require.resolve('jest-watch-typeahead/filename'),
+    require.resolve('jest-watch-typeahead/testname'),
+  ],
+  // See: https://jestjs.io/docs/configuration#prettierpath-string
+  prettierPath: require.resolve('jest-snapshot-prettier'),
+};

package/jest-preset.js

@@ -1,4 +1,5 @@
 const { withWatchPlugins } = require('jest-expo/config');
+
 const createJestPreset = require('./createJestPreset');
 module.exports = withWatchPlugins({
   projects: [
@@ -8,4 +9,6 @@ module.exports = withWatchPlugins({
     createJestPreset(require('jest-expo/node/jest-preset')),
     // Remove sub-watch-plugins from the preset when using multi-project runner.
   ].map(({ watchPlugins, ...config }) => config),
+  // See: https://jestjs.io/docs/configuration#prettierpath-string
+  prettierPath: require.resolve('jest-snapshot-prettier'),
 });

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "expo-module-scripts",
-  "version": "3.4.1",
+  "version": "3.5.0",
   "description": "A private package for various tasks for Expo module packages like compiling and testing",
   "main": "index.js",
   "bin": {
     "expo-module": "bin/expo-module.js"
   },
   "scripts": {
-    "lint": "expo-module lint ."
+    "lint": "expo-module eslint ."
   },
   "repository": {
     "type": "git",
@@ -26,24 +26,25 @@
   },
   "homepage": "https://github.com/expo/expo/tree/main/packages/expo-module-scripts#readme",
   "dependencies": {
-    "@babel/cli": "^7.1.2",
-    "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-typescript": "^7.12.12",
+    "@babel/cli": "^7.23.4",
+    "@babel/plugin-transform-export-namespace-from": "^7.23.4",
+    "@babel/preset-env": "^7.23.8",
+    "@babel/preset-typescript": "^7.23.3",
     "@expo/npm-proofread": "^1.0.1",
     "@testing-library/react-hooks": "^7.0.1",
     "@tsconfig/node18": "^18.2.2",
     "@types/jest": "^29.2.1",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "babel-preset-expo": "~10.0.0",
+    "babel-preset-expo": "~11.0.0",
     "commander": "^2.19.0",
     "eslint-config-universe": "^12.0.0",
     "find-yarn-workspace-root": "^2.0.0",
     "glob": "^7.1.7",
-    "jest-expo": "~50.0.0-alpha.0",
+    "jest-expo": "~51.0.0-unreleased",
+    "jest-snapshot-prettier": "npm:prettier@^2",
     "jest-watch-typeahead": "2.2.1",
     "ts-jest": "~29.0.4",
     "typescript": "^5.1.3"
   },
-  "gitHead": "9e4890b069b18598ea429734b5114b40e3afeabb"
+  "gitHead": "4165b8d72e1b9a1889c2767534cc619e21468110"
 }

package/ts-declarations/jest-require/index.d.ts

@@ -36,4 +36,4 @@ interface NodeModule {
   paths: string[];
 }
 
-declare var require: NodeRequire;
+declare let require: NodeRequire;

package/universal/jest-preset.js

@@ -1,4 +1,5 @@
 const { withWatchPlugins } = require('jest-expo/config');
+
 const createJestPreset = require('../createJestPreset');
 
 console.warn(