From 0366596400999ebc14e5bf31cf2342ec4928c672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Fri, 9 Jan 2026 23:42:08 +0100 Subject: [PATCH 01/10] chore(steps): simplify package.json to plain CJS - Remove 'type: module' field - Simplify main/types to use single dist/ directory - Remove dual exports field - Update build scripts to use simple tsc - Remove chokidar-cli (no longer needed for watch) - Remove this-file dependency (replaced with native __dirname) --- packages/steps/package.json | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/packages/steps/package.json b/packages/steps/package.json index 47d45348..526a6d45 100644 --- a/packages/steps/package.json +++ b/packages/steps/package.json @@ -5,32 +5,22 @@ "url": "https://github.com/expo/eas-build.git", "directory": "packages/steps" }, - "type": "module", "version": "1.0.265", - "main": "./dist_commonjs/index.cjs", - "types": "./dist_esm/index.d.ts", - "exports": { - ".": { - "types": "./dist_esm/index.d.ts", - "import": "./dist_esm/index.js", - "require": "./dist_commonjs/index.cjs" - } - }, + "main": "dist/index.js", + "types": "dist/index.d.ts", "files": [ "bin", - "dist_commonjs", - "dist_esm", - "README.md" + "dist" ], "scripts": { "start": "yarn watch", - "build": "./build.sh", - "prepack": "./build.sh", - "watch": "chokidar --initial \"src/**/*.ts\" -i \"src/**/__tests__/**/*\" -c \"./build.sh\"", - "test": "node --experimental-vm-modules --no-warnings node_modules/.bin/jest -c=jest.config.cjs --no-cache", - "test:coverage": "node --experimental-vm-modules --no-warnings node_modules/.bin/jest -c=jest.config.cjs --no-cache --coverage", + "build": "tsc --project tsconfig.build.json", + "prepack": "rm -rf dist && tsc --project tsconfig.build.json", + "watch": "tsc --watch --preserveWatchOutput", + "test": "jest --config jest.config.cjs", + "test:coverage": "jest --config jest.config.cjs --coverage", "test:watch": "yarn test --watch", - "clean": "rm -rf node_modules dist_* coverage" + "clean": "rm -rf node_modules dist coverage" }, "author": "Expo ", "bugs": "https://github.com/expo/eas-build/issues", @@ -41,7 +31,6 @@ "@types/lodash.clonedeep": "^4.5.9", "@types/lodash.get": "^4.4.9", "@types/node": "20.14.2", - "chokidar-cli": "^3.0.0", "eslint-plugin-async-protect": "^3.1.0", "jest": "^29.7.0", "ts-jest": "^29.1.4", @@ -62,7 +51,6 @@ "jsep": "^1.3.8", "lodash.clonedeep": "^4.5.0", "lodash.get": "^4.4.2", - "this-file": "^2.0.3", "uuid": "^9.0.1", "yaml": "^2.4.3" }, From 558a853a69978cd4835c4d1b4372919669602178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Fri, 9 Jan 2026 23:43:13 +0100 Subject: [PATCH 02/10] chore(steps): simplify TypeScript build configuration - Update tsconfig.build.json to use commonjs module and output to dist/ - Delete tsconfig.build.commonjs.json (no longer need dual build) - Delete build.sh (replaced by simple tsc command in package.json) --- packages/steps/build.sh | 27 --------------------- packages/steps/tsconfig.build.commonjs.json | 8 ------ packages/steps/tsconfig.build.json | 3 ++- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100755 packages/steps/build.sh delete mode 100644 packages/steps/tsconfig.build.commonjs.json diff --git a/packages/steps/build.sh b/packages/steps/build.sh deleted file mode 100755 index 13294e44..00000000 --- a/packages/steps/build.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -SED_INPLACE_OPT=(-i '') -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - SED_INPLACE_OPT=(-i) -fi - -set -eo pipefail - -if [[ "$npm_lifecycle_event" == "prepack" ]]; then - echo 'Removing "dist_commonjs" and "dist_esm" folders...' - rm -rf dist_commonjs dist_esm -fi - -echo 'Compiling TypeScript to JavaScript...' -node_modules/.bin/tsc --project tsconfig.build.json - -echo 'Compiling TypeScript to CommonJS JavaScript...' -node_modules/.bin/tsc --project tsconfig.build.commonjs.json - -echo 'Renaming CommonJS file extensions to .cjs...' -find dist_commonjs -type f -name '*.js' -exec bash -c 'mv "$0" "${0%.*}.cjs"' {} \; - -echo 'Rewriting module specifiers to .cjs...' -find dist_commonjs -type f -name '*.cjs' -exec sed "${SED_INPLACE_OPT[@]}" 's/require("\(\.[^"]*\)\.js")/require("\1.cjs")/g' {} \; - -echo 'Finished compiling' diff --git a/packages/steps/tsconfig.build.commonjs.json b/packages/steps/tsconfig.build.commonjs.json deleted file mode 100644 index a146d9eb..00000000 --- a/packages/steps/tsconfig.build.commonjs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "module": "commonjs", - "outDir": "dist_commonjs" - }, - "exclude": ["**/__mocks__/", "**/__tests__/"] -} diff --git a/packages/steps/tsconfig.build.json b/packages/steps/tsconfig.build.json index 85fc2fbe..83e4c158 100644 --- a/packages/steps/tsconfig.build.json +++ b/packages/steps/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "dist_esm" + "module": "commonjs", + "outDir": "dist" }, "exclude": ["**/__mocks__/", "**/__tests__/"] } From d9811832b4af90b3587efbe4ed3fbfde8666c666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Fri, 9 Jan 2026 23:44:11 +0100 Subject: [PATCH 03/10] chore(steps): remove .js extensions from imports Remove ESM-style .js extensions from all relative imports in source files. CommonJS module resolution doesn't require explicit extensions. --- packages/steps/src/AbstractConfigParser.ts | 18 ++++----- packages/steps/src/BuildConfig.ts | 10 ++--- packages/steps/src/BuildConfigParser.ts | 18 ++++----- packages/steps/src/BuildFunction.ts | 14 +++---- packages/steps/src/BuildFunctionGroup.ts | 10 ++--- packages/steps/src/BuildStep.ts | 26 ++++++------- packages/steps/src/BuildStepContext.ts | 18 ++++----- packages/steps/src/BuildStepInput.ts | 8 ++-- packages/steps/src/BuildStepOutput.ts | 4 +- packages/steps/src/BuildTemporaryFiles.ts | 2 +- packages/steps/src/BuildWorkflow.ts | 8 ++-- packages/steps/src/BuildWorkflowValidator.ts | 14 +++---- packages/steps/src/StepsConfigParser.ts | 14 +++---- .../__tests__/AbstractConfigParser-test.ts | 12 +++--- .../steps/src/__tests__/BuildConfig-test.ts | 6 +-- .../src/__tests__/BuildConfigParser-test.ts | 24 ++++++------ .../steps/src/__tests__/BuildFunction-test.ts | 12 +++--- .../steps/src/__tests__/BuildStep-test.ts | 30 +++++++-------- .../src/__tests__/BuildStepContext-test.ts | 16 ++++---- .../src/__tests__/BuildStepInput-test.ts | 8 ++-- .../src/__tests__/BuildStepOutput-test.ts | 8 ++-- .../src/__tests__/BuildTemporaryFiles-test.ts | 4 +- .../steps/src/__tests__/BuildWorkflow-test.ts | 8 ++-- .../__tests__/BuildWorkflowValidator-test.ts | 20 +++++----- .../src/__tests__/StepsConfigParser-test.ts | 18 ++++----- packages/steps/src/__tests__/utils/context.ts | 8 ++-- packages/steps/src/cli/cli.ts | 10 ++--- packages/steps/src/index.ts | 38 +++++++++---------- packages/steps/src/interpolation.ts | 2 +- .../__tests__/runCustomFunction-test.ts | 14 +++---- .../steps/src/scripts/runCustomFunction.ts | 10 ++--- .../utils/__tests__/customFunction-test.ts | 2 +- .../src/utils/__tests__/jsepEval-test.ts | 2 +- .../src/utils/__tests__/nullthrows-test.ts | 4 +- .../src/utils/__tests__/template-test.ts | 6 +-- packages/steps/src/utils/customFunction.ts | 10 ++--- .../expodash/__tests__/duplicates-test.ts | 2 +- .../src/utils/expodash/__tests__/uniq-test.ts | 2 +- .../src/utils/shell/__tests__/command-test.ts | 2 +- packages/steps/src/utils/template.ts | 6 +-- 40 files changed, 222 insertions(+), 226 deletions(-) diff --git a/packages/steps/src/AbstractConfigParser.ts b/packages/steps/src/AbstractConfigParser.ts index f31d8dde..a40f6e9f 100644 --- a/packages/steps/src/AbstractConfigParser.ts +++ b/packages/steps/src/AbstractConfigParser.ts @@ -1,12 +1,12 @@ -import { BuildFunction, BuildFunctionById } from './BuildFunction.js'; -import { BuildFunctionGroup } from './BuildFunctionGroup.js'; -import { BuildStep } from './BuildStep.js'; -import { BuildStepGlobalContext } from './BuildStepContext.js'; -import { BuildWorkflow } from './BuildWorkflow.js'; -import { BuildWorkflowValidator } from './BuildWorkflowValidator.js'; -import { BuildConfigError } from './errors.js'; -import { duplicates } from './utils/expodash/duplicates.js'; -import { uniq } from './utils/expodash/uniq.js'; +import { BuildFunction, BuildFunctionById } from './BuildFunction'; +import { BuildFunctionGroup } from './BuildFunctionGroup'; +import { BuildStep } from './BuildStep'; +import { BuildStepGlobalContext } from './BuildStepContext'; +import { BuildWorkflow } from './BuildWorkflow'; +import { BuildWorkflowValidator } from './BuildWorkflowValidator'; +import { BuildConfigError } from './errors'; +import { duplicates } from './utils/expodash/duplicates'; +import { uniq } from './utils/expodash/uniq'; export abstract class AbstractConfigParser { protected readonly externalFunctions?: BuildFunction[]; diff --git a/packages/steps/src/BuildConfig.ts b/packages/steps/src/BuildConfig.ts index 3fbc50f8..47f0e827 100644 --- a/packages/steps/src/BuildConfig.ts +++ b/packages/steps/src/BuildConfig.ts @@ -5,11 +5,11 @@ import path from 'path'; import Joi from 'joi'; import YAML from 'yaml'; -import { BuildConfigError, BuildWorkflowError } from './errors.js'; -import { BuildRuntimePlatform } from './BuildRuntimePlatform.js'; -import { BuildStepInputValueTypeName, BuildStepInputValueType } from './BuildStepInput.js'; -import { BuildStepEnv } from './BuildStepEnv.js'; -import { BUILD_STEP_OR_BUILD_GLOBAL_CONTEXT_REFERENCE_REGEX } from './utils/template.js'; +import { BuildConfigError, BuildWorkflowError } from './errors'; +import { BuildRuntimePlatform } from './BuildRuntimePlatform'; +import { BuildStepInputValueTypeName, BuildStepInputValueType } from './BuildStepInput'; +import { BuildStepEnv } from './BuildStepEnv'; +import { BUILD_STEP_OR_BUILD_GLOBAL_CONTEXT_REFERENCE_REGEX } from './utils/template'; export type BuildFunctions = Record; diff --git a/packages/steps/src/BuildConfigParser.ts b/packages/steps/src/BuildConfigParser.ts index dc3c0f2b..c6548ffa 100644 --- a/packages/steps/src/BuildConfigParser.ts +++ b/packages/steps/src/BuildConfigParser.ts @@ -16,23 +16,23 @@ import { isBuildStepBareFunctionOrFunctionGroupCall, isBuildStepCommandRun, readAndValidateBuildConfigFromPathAsync, -} from './BuildConfig.js'; -import { BuildFunction, BuildFunctionById } from './BuildFunction.js'; -import { BuildStep } from './BuildStep.js'; +} from './BuildConfig'; +import { BuildFunction, BuildFunctionById } from './BuildFunction'; +import { BuildStep } from './BuildStep'; import { BuildStepInput, BuildStepInputProvider, BuildStepInputValueTypeName, -} from './BuildStepInput.js'; -import { BuildStepGlobalContext } from './BuildStepContext.js'; -import { BuildStepOutput, BuildStepOutputProvider } from './BuildStepOutput.js'; -import { BuildConfigError } from './errors.js'; +} from './BuildStepInput'; +import { BuildStepGlobalContext } from './BuildStepContext'; +import { BuildStepOutput, BuildStepOutputProvider } from './BuildStepOutput'; +import { BuildConfigError } from './errors'; import { BuildFunctionGroup, BuildFunctionGroupById, createBuildFunctionGroupByIdMapping, -} from './BuildFunctionGroup.js'; -import { AbstractConfigParser } from './AbstractConfigParser.js'; +} from './BuildFunctionGroup'; +import { AbstractConfigParser } from './AbstractConfigParser'; export class BuildConfigParser extends AbstractConfigParser { private readonly configPath: string; diff --git a/packages/steps/src/BuildFunction.ts b/packages/steps/src/BuildFunction.ts index 917c3f5e..e5c2fac2 100644 --- a/packages/steps/src/BuildFunction.ts +++ b/packages/steps/src/BuildFunction.ts @@ -1,12 +1,12 @@ import assert from 'assert'; -import { BuildRuntimePlatform } from './BuildRuntimePlatform.js'; -import { BuildStep, BuildStepFunction } from './BuildStep.js'; -import { BuildStepGlobalContext } from './BuildStepContext.js'; -import { BuildStepInputProvider } from './BuildStepInput.js'; -import { BuildStepOutputProvider } from './BuildStepOutput.js'; -import { BuildStepEnv } from './BuildStepEnv.js'; -import { createCustomFunctionCall } from './utils/customFunction.js'; +import { BuildRuntimePlatform } from './BuildRuntimePlatform'; +import { BuildStep, BuildStepFunction } from './BuildStep'; +import { BuildStepGlobalContext } from './BuildStepContext'; +import { BuildStepInputProvider } from './BuildStepInput'; +import { BuildStepOutputProvider } from './BuildStepOutput'; +import { BuildStepEnv } from './BuildStepEnv'; +import { createCustomFunctionCall } from './utils/customFunction'; export type BuildFunctionById = Record; export type BuildFunctionCallInputs = Record; diff --git a/packages/steps/src/BuildFunctionGroup.ts b/packages/steps/src/BuildFunctionGroup.ts index f527c6a1..3a4dbe44 100644 --- a/packages/steps/src/BuildFunctionGroup.ts +++ b/packages/steps/src/BuildFunctionGroup.ts @@ -1,12 +1,12 @@ -import { BuildFunctionCallInputs } from './BuildFunction.js'; -import { BuildStep } from './BuildStep.js'; -import { BuildStepGlobalContext } from './BuildStepContext.js'; +import { BuildFunctionCallInputs } from './BuildFunction'; +import { BuildStep } from './BuildStep'; +import { BuildStepGlobalContext } from './BuildStepContext'; import { BuildStepInputById, BuildStepInputProvider, makeBuildStepInputByIdMap, -} from './BuildStepInput.js'; -import { BuildConfigError } from './errors.js'; +} from './BuildStepInput'; +import { BuildConfigError } from './errors'; export type BuildFunctionGroupById = Record; diff --git a/packages/steps/src/BuildStep.ts b/packages/steps/src/BuildStep.ts index c5ba80ee..f928fde9 100644 --- a/packages/steps/src/BuildStep.ts +++ b/packages/steps/src/BuildStep.ts @@ -6,29 +6,29 @@ import { Buffer } from 'buffer'; import { v4 as uuidv4 } from 'uuid'; import { JobInterpolationContext } from '@expo/eas-build-job'; -import { BuildStepContext, BuildStepGlobalContext } from './BuildStepContext.js'; -import { BuildStepInput, BuildStepInputById, makeBuildStepInputByIdMap } from './BuildStepInput.js'; +import { BuildStepContext, BuildStepGlobalContext } from './BuildStepContext'; +import { BuildStepInput, BuildStepInputById, makeBuildStepInputByIdMap } from './BuildStepInput'; import { BuildStepOutput, BuildStepOutputById, SerializedBuildStepOutput, makeBuildStepOutputByIdMap, -} from './BuildStepOutput.js'; -import { BIN_PATH } from './utils/shell/bin.js'; -import { getShellCommandAndArgs } from './utils/shell/command.js'; +} from './BuildStepOutput'; +import { BIN_PATH } from './utils/shell/bin'; +import { getShellCommandAndArgs } from './utils/shell/command'; import { cleanUpStepTemporaryDirectoriesAsync, getTemporaryEnvsDirPath, getTemporaryOutputsDirPath, saveScriptToTemporaryFileAsync, -} from './BuildTemporaryFiles.js'; -import { spawnAsync } from './utils/shell/spawn.js'; -import { interpolateWithInputs, interpolateWithOutputs } from './utils/template.js'; -import { BuildStepRuntimeError } from './errors.js'; -import { BuildStepEnv } from './BuildStepEnv.js'; -import { BuildRuntimePlatform } from './BuildRuntimePlatform.js'; -import { jsepEval } from './utils/jsepEval.js'; -import { interpolateJobContext } from './interpolation.js'; +} from './BuildTemporaryFiles'; +import { spawnAsync } from './utils/shell/spawn'; +import { interpolateWithInputs, interpolateWithOutputs } from './utils/template'; +import { BuildStepRuntimeError } from './errors'; +import { BuildStepEnv } from './BuildStepEnv'; +import { BuildRuntimePlatform } from './BuildRuntimePlatform'; +import { jsepEval } from './utils/jsepEval'; +import { interpolateJobContext } from './interpolation'; export enum BuildStepStatus { NEW = 'new', diff --git a/packages/steps/src/BuildStepContext.ts b/packages/steps/src/BuildStepContext.ts index 395bbc81..64d568f0 100644 --- a/packages/steps/src/BuildStepContext.ts +++ b/packages/steps/src/BuildStepContext.ts @@ -6,21 +6,17 @@ import { Env, JobInterpolationContext, StaticJobInterpolationContext } from '@ex import { bunyan } from '@expo/logger'; import { v4 as uuidv4 } from 'uuid'; -import { StepMetricInput, StepMetricsCollection } from './StepMetrics.js'; -import { hashFiles } from './utils/hashFiles.js'; -import { - BuildStep, - BuildStepOutputAccessor, - SerializedBuildStepOutputAccessor, -} from './BuildStep.js'; +import { StepMetricInput, StepMetricsCollection } from './StepMetrics'; +import { hashFiles } from './utils/hashFiles'; +import { BuildStep, BuildStepOutputAccessor, SerializedBuildStepOutputAccessor } from './BuildStep'; import { getObjectValueForInterpolation, interpolateWithGlobalContext, parseOutputPath, -} from './utils/template.js'; -import { BuildStepRuntimeError } from './errors.js'; -import { BuildRuntimePlatform } from './BuildRuntimePlatform.js'; -import { BuildStepEnv } from './BuildStepEnv.js'; +} from './utils/template'; +import { BuildStepRuntimeError } from './errors'; +import { BuildRuntimePlatform } from './BuildRuntimePlatform'; +import { BuildStepEnv } from './BuildStepEnv'; interface SerializedExternalBuildContextProvider { projectSourceDirectory: string; diff --git a/packages/steps/src/BuildStepInput.ts b/packages/steps/src/BuildStepInput.ts index f553ba51..5aee61a5 100644 --- a/packages/steps/src/BuildStepInput.ts +++ b/packages/steps/src/BuildStepInput.ts @@ -2,13 +2,13 @@ import assert from 'assert'; import { JobInterpolationContext } from '@expo/eas-build-job'; -import { BuildStepGlobalContext } from './BuildStepContext.js'; -import { BuildStepRuntimeError } from './errors.js'; +import { BuildStepGlobalContext } from './BuildStepContext'; +import { BuildStepRuntimeError } from './errors'; import { BUILD_STEP_OR_BUILD_GLOBAL_CONTEXT_REFERENCE_REGEX, interpolateWithOutputs, -} from './utils/template.js'; -import { interpolateJobContext } from './interpolation.js'; +} from './utils/template'; +import { interpolateJobContext } from './interpolation'; export enum BuildStepInputValueTypeName { STRING = 'string', diff --git a/packages/steps/src/BuildStepOutput.ts b/packages/steps/src/BuildStepOutput.ts index e717b5a1..07e24e9f 100644 --- a/packages/steps/src/BuildStepOutput.ts +++ b/packages/steps/src/BuildStepOutput.ts @@ -1,5 +1,5 @@ -import { BuildStepGlobalContext } from './BuildStepContext.js'; -import { BuildStepRuntimeError } from './errors.js'; +import { BuildStepGlobalContext } from './BuildStepContext'; +import { BuildStepRuntimeError } from './errors'; export type BuildStepOutputById = Record; export type BuildStepOutputProvider = ( diff --git a/packages/steps/src/BuildTemporaryFiles.ts b/packages/steps/src/BuildTemporaryFiles.ts index b1eba7db..b23e5e14 100644 --- a/packages/steps/src/BuildTemporaryFiles.ts +++ b/packages/steps/src/BuildTemporaryFiles.ts @@ -3,7 +3,7 @@ import fs from 'fs/promises'; import { v4 as uuidv4 } from 'uuid'; -import { BuildStepGlobalContext } from './BuildStepContext.js'; +import { BuildStepGlobalContext } from './BuildStepContext'; export async function saveScriptToTemporaryFileAsync( ctx: BuildStepGlobalContext, diff --git a/packages/steps/src/BuildWorkflow.ts b/packages/steps/src/BuildWorkflow.ts index 4e14de25..cd8b38bc 100644 --- a/packages/steps/src/BuildWorkflow.ts +++ b/packages/steps/src/BuildWorkflow.ts @@ -1,7 +1,7 @@ -import { BuildFunctionById } from './BuildFunction.js'; -import { BuildStep } from './BuildStep.js'; -import { BuildStepGlobalContext } from './BuildStepContext.js'; -import { StepMetricResult } from './StepMetrics.js'; +import { BuildFunctionById } from './BuildFunction'; +import { BuildStep } from './BuildStep'; +import { BuildStepGlobalContext } from './BuildStepContext'; +import { StepMetricResult } from './StepMetrics'; export class BuildWorkflow { public readonly buildSteps: BuildStep[]; diff --git a/packages/steps/src/BuildWorkflowValidator.ts b/packages/steps/src/BuildWorkflowValidator.ts index 2c9ee848..8a3ed567 100644 --- a/packages/steps/src/BuildWorkflowValidator.ts +++ b/packages/steps/src/BuildWorkflowValidator.ts @@ -2,13 +2,13 @@ import path from 'path'; import fs from 'fs-extra'; -import { BuildStep } from './BuildStep.js'; -import { BuildStepInputValueTypeName } from './BuildStepInput.js'; -import { BuildWorkflow } from './BuildWorkflow.js'; -import { BuildConfigError, BuildWorkflowError } from './errors.js'; -import { duplicates } from './utils/expodash/duplicates.js'; -import { nullthrows } from './utils/nullthrows.js'; -import { findOutputPaths } from './utils/template.js'; +import { BuildStep } from './BuildStep'; +import { BuildStepInputValueTypeName } from './BuildStepInput'; +import { BuildWorkflow } from './BuildWorkflow'; +import { BuildConfigError, BuildWorkflowError } from './errors'; +import { duplicates } from './utils/expodash/duplicates'; +import { nullthrows } from './utils/nullthrows'; +import { findOutputPaths } from './utils/template'; export class BuildWorkflowValidator { constructor(private readonly workflow: BuildWorkflow) {} diff --git a/packages/steps/src/StepsConfigParser.ts b/packages/steps/src/StepsConfigParser.ts index a28a3da9..492b0856 100644 --- a/packages/steps/src/StepsConfigParser.ts +++ b/packages/steps/src/StepsConfigParser.ts @@ -9,17 +9,17 @@ import { validateSteps, } from '@expo/eas-build-job'; -import { BuildFunction, BuildFunctionById } from './BuildFunction.js'; +import { BuildFunction, BuildFunctionById } from './BuildFunction'; import { BuildFunctionGroup, BuildFunctionGroupById, createBuildFunctionGroupByIdMapping, -} from './BuildFunctionGroup.js'; -import { BuildStepGlobalContext } from './BuildStepContext.js'; -import { BuildStep } from './BuildStep.js'; -import { AbstractConfigParser } from './AbstractConfigParser.js'; -import { BuildConfigError } from './errors.js'; -import { BuildStepOutput } from './BuildStepOutput.js'; +} from './BuildFunctionGroup'; +import { BuildStepGlobalContext } from './BuildStepContext'; +import { BuildStep } from './BuildStep'; +import { AbstractConfigParser } from './AbstractConfigParser'; +import { BuildConfigError } from './errors'; +import { BuildStepOutput } from './BuildStepOutput'; export class StepsConfigParser extends AbstractConfigParser { private readonly steps: Step[]; diff --git a/packages/steps/src/__tests__/AbstractConfigParser-test.ts b/packages/steps/src/__tests__/AbstractConfigParser-test.ts index df1e7ecd..215e4af1 100644 --- a/packages/steps/src/__tests__/AbstractConfigParser-test.ts +++ b/packages/steps/src/__tests__/AbstractConfigParser-test.ts @@ -1,13 +1,13 @@ import path from 'path'; import url from 'url'; -import { StepsConfigParser } from '../StepsConfigParser.js'; -import { BuildFunction } from '../BuildFunction.js'; -import { BuildConfigParser } from '../BuildConfigParser.js'; -import { BuildStep } from '../BuildStep.js'; +import { StepsConfigParser } from '../StepsConfigParser'; +import { BuildFunction } from '../BuildFunction'; +import { BuildConfigParser } from '../BuildConfigParser'; +import { BuildStep } from '../BuildStep'; -import { createGlobalContextMock } from './utils/context.js'; -import { UUID_REGEX } from './utils/uuid.js'; +import { createGlobalContextMock } from './utils/context'; +import { UUID_REGEX } from './utils/uuid'; const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); diff --git a/packages/steps/src/__tests__/BuildConfig-test.ts b/packages/steps/src/__tests__/BuildConfig-test.ts index e5e03bf1..0b0653dd 100644 --- a/packages/steps/src/__tests__/BuildConfig-test.ts +++ b/packages/steps/src/__tests__/BuildConfig-test.ts @@ -21,10 +21,10 @@ import { mergeConfigWithImportedFunctions, BuildFunctions, readAndValidateBuildFunctionsConfigFileAsync, -} from '../BuildConfig.js'; -import { BuildConfigError, BuildConfigYAMLError } from '../errors.js'; +} from '../BuildConfig'; +import { BuildConfigError, BuildConfigYAMLError } from '../errors'; -import { getError, getErrorAsync } from './utils/error.js'; +import { getError, getErrorAsync } from './utils/error'; const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); diff --git a/packages/steps/src/__tests__/BuildConfigParser-test.ts b/packages/steps/src/__tests__/BuildConfigParser-test.ts index c6279c6a..004cf736 100644 --- a/packages/steps/src/__tests__/BuildConfigParser-test.ts +++ b/packages/steps/src/__tests__/BuildConfigParser-test.ts @@ -1,18 +1,18 @@ import path from 'path'; import url from 'url'; -import { BuildConfigParser } from '../BuildConfigParser.js'; -import { BuildFunction } from '../BuildFunction.js'; -import { BuildStepFunction } from '../BuildStep.js'; -import { BuildWorkflow } from '../BuildWorkflow.js'; -import { BuildConfigError, BuildStepRuntimeError } from '../errors.js'; -import { BuildRuntimePlatform } from '../BuildRuntimePlatform.js'; -import { BuildStepInputValueTypeName } from '../BuildStepInput.js'; -import { BuildFunctionGroup } from '../BuildFunctionGroup.js'; - -import { createGlobalContextMock } from './utils/context.js'; -import { getError, getErrorAsync } from './utils/error.js'; -import { UUID_REGEX } from './utils/uuid.js'; +import { BuildConfigParser } from '../BuildConfigParser'; +import { BuildFunction } from '../BuildFunction'; +import { BuildStepFunction } from '../BuildStep'; +import { BuildWorkflow } from '../BuildWorkflow'; +import { BuildConfigError, BuildStepRuntimeError } from '../errors'; +import { BuildRuntimePlatform } from '../BuildRuntimePlatform'; +import { BuildStepInputValueTypeName } from '../BuildStepInput'; +import { BuildFunctionGroup } from '../BuildFunctionGroup'; + +import { createGlobalContextMock } from './utils/context'; +import { getError, getErrorAsync } from './utils/error'; +import { UUID_REGEX } from './utils/uuid'; const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); diff --git a/packages/steps/src/__tests__/BuildFunction-test.ts b/packages/steps/src/__tests__/BuildFunction-test.ts index 44509f58..68ad5d5f 100644 --- a/packages/steps/src/__tests__/BuildFunction-test.ts +++ b/packages/steps/src/__tests__/BuildFunction-test.ts @@ -1,14 +1,14 @@ -import { BuildFunction } from '../BuildFunction.js'; -import { BuildStep, BuildStepFunction } from '../BuildStep.js'; +import { BuildFunction } from '../BuildFunction'; +import { BuildStep, BuildStepFunction } from '../BuildStep'; import { BuildStepInput, BuildStepInputProvider, BuildStepInputValueTypeName, -} from '../BuildStepInput.js'; -import { BuildStepOutput, BuildStepOutputProvider } from '../BuildStepOutput.js'; +} from '../BuildStepInput'; +import { BuildStepOutput, BuildStepOutputProvider } from '../BuildStepOutput'; -import { createGlobalContextMock } from './utils/context.js'; -import { UUID_REGEX } from './utils/uuid.js'; +import { createGlobalContextMock } from './utils/context'; +import { UUID_REGEX } from './utils/uuid'; describe(BuildFunction, () => { describe('constructor', () => { diff --git a/packages/steps/src/__tests__/BuildStep-test.ts b/packages/steps/src/__tests__/BuildStep-test.ts index f6f4658c..34061552 100644 --- a/packages/steps/src/__tests__/BuildStep-test.ts +++ b/packages/steps/src/__tests__/BuildStep-test.ts @@ -5,21 +5,21 @@ import { jest } from '@jest/globals'; import { instance, mock, verify, when } from 'ts-mockito'; import { v4 as uuidv4 } from 'uuid'; -import { BuildStep, BuildStepFunction, BuildStepStatus } from '../BuildStep.js'; -import { BuildStepInput, BuildStepInputValueTypeName } from '../BuildStepInput.js'; -import { BuildStepGlobalContext, BuildStepContext } from '../BuildStepContext.js'; -import { BuildStepOutput } from '../BuildStepOutput.js'; -import { BuildStepRuntimeError } from '../errors.js'; -import { nullthrows } from '../utils/nullthrows.js'; -import { BuildRuntimePlatform } from '../BuildRuntimePlatform.js'; -import { spawnAsync } from '../utils/shell/spawn.js'; -import { BuildStepEnv } from '../BuildStepEnv.js'; -import { BuildFunction } from '../BuildFunction.js'; - -import { createGlobalContextMock } from './utils/context.js'; -import { createMockLogger } from './utils/logger.js'; -import { getError, getErrorAsync } from './utils/error.js'; -import { UUID_REGEX } from './utils/uuid.js'; +import { BuildStep, BuildStepFunction, BuildStepStatus } from '../BuildStep'; +import { BuildStepInput, BuildStepInputValueTypeName } from '../BuildStepInput'; +import { BuildStepGlobalContext, BuildStepContext } from '../BuildStepContext'; +import { BuildStepOutput } from '../BuildStepOutput'; +import { BuildStepRuntimeError } from '../errors'; +import { nullthrows } from '../utils/nullthrows'; +import { BuildRuntimePlatform } from '../BuildRuntimePlatform'; +import { spawnAsync } from '../utils/shell/spawn'; +import { BuildStepEnv } from '../BuildStepEnv'; +import { BuildFunction } from '../BuildFunction'; + +import { createGlobalContextMock } from './utils/context'; +import { createMockLogger } from './utils/logger'; +import { getError, getErrorAsync } from './utils/error'; +import { UUID_REGEX } from './utils/uuid'; describe(BuildStep, () => { describe(BuildStep.getNewId, () => { diff --git a/packages/steps/src/__tests__/BuildStepContext-test.ts b/packages/steps/src/__tests__/BuildStepContext-test.ts index 3c760324..5dbd574a 100644 --- a/packages/steps/src/__tests__/BuildStepContext-test.ts +++ b/packages/steps/src/__tests__/BuildStepContext-test.ts @@ -6,14 +6,14 @@ import crypto from 'crypto'; import { JobInterpolationContext } from '@expo/eas-build-job'; import { instance, mock, when } from 'ts-mockito'; -import { BuildStep } from '../BuildStep.js'; -import { BuildStepGlobalContext, BuildStepContext } from '../BuildStepContext.js'; -import { BuildStepRuntimeError } from '../errors.js'; -import { BuildRuntimePlatform } from '../BuildRuntimePlatform.js'; - -import { createGlobalContextMock, MockContextProvider } from './utils/context.js'; -import { getError } from './utils/error.js'; -import { createMockLogger } from './utils/logger.js'; +import { BuildStep } from '../BuildStep'; +import { BuildStepGlobalContext, BuildStepContext } from '../BuildStepContext'; +import { BuildStepRuntimeError } from '../errors'; +import { BuildRuntimePlatform } from '../BuildRuntimePlatform'; + +import { createGlobalContextMock, MockContextProvider } from './utils/context'; +import { getError } from './utils/error'; +import { createMockLogger } from './utils/logger'; describe(BuildStepGlobalContext, () => { describe('stepsInternalBuildDirectory', () => { diff --git a/packages/steps/src/__tests__/BuildStepInput-test.ts b/packages/steps/src/__tests__/BuildStepInput-test.ts index 5075a76b..4e9c0888 100644 --- a/packages/steps/src/__tests__/BuildStepInput-test.ts +++ b/packages/steps/src/__tests__/BuildStepInput-test.ts @@ -1,14 +1,14 @@ import { JobInterpolationContext } from '@expo/eas-build-job'; -import { BuildStepRuntimeError } from '../errors.js'; -import { BuildStep } from '../BuildStep.js'; +import { BuildStepRuntimeError } from '../errors'; +import { BuildStep } from '../BuildStep'; import { BuildStepInput, BuildStepInputValueTypeName, makeBuildStepInputByIdMap, -} from '../BuildStepInput.js'; +} from '../BuildStepInput'; -import { createGlobalContextMock } from './utils/context.js'; +import { createGlobalContextMock } from './utils/context'; describe(BuildStepInput, () => { test('basic case string', () => { diff --git a/packages/steps/src/__tests__/BuildStepOutput-test.ts b/packages/steps/src/__tests__/BuildStepOutput-test.ts index 4df9c6e4..c60cdee8 100644 --- a/packages/steps/src/__tests__/BuildStepOutput-test.ts +++ b/packages/steps/src/__tests__/BuildStepOutput-test.ts @@ -1,8 +1,8 @@ -import { BuildStep } from '../BuildStep.js'; -import { BuildStepOutput, makeBuildStepOutputByIdMap } from '../BuildStepOutput.js'; -import { BuildStepRuntimeError } from '../errors.js'; +import { BuildStep } from '../BuildStep'; +import { BuildStepOutput, makeBuildStepOutputByIdMap } from '../BuildStepOutput'; +import { BuildStepRuntimeError } from '../errors'; -import { createGlobalContextMock } from './utils/context.js'; +import { createGlobalContextMock } from './utils/context'; describe(BuildStepOutput, () => { test('basic case', () => { diff --git a/packages/steps/src/__tests__/BuildTemporaryFiles-test.ts b/packages/steps/src/__tests__/BuildTemporaryFiles-test.ts index 7168bd7f..5699a3e3 100644 --- a/packages/steps/src/__tests__/BuildTemporaryFiles-test.ts +++ b/packages/steps/src/__tests__/BuildTemporaryFiles-test.ts @@ -5,9 +5,9 @@ import { cleanUpStepTemporaryDirectoriesAsync, getTemporaryOutputsDirPath, saveScriptToTemporaryFileAsync, -} from '../BuildTemporaryFiles.js'; +} from '../BuildTemporaryFiles'; -import { createGlobalContextMock } from './utils/context.js'; +import { createGlobalContextMock } from './utils/context'; describe(saveScriptToTemporaryFileAsync, () => { it('saves the script in a directory inside os.tmpdir()', async () => { diff --git a/packages/steps/src/__tests__/BuildWorkflow-test.ts b/packages/steps/src/__tests__/BuildWorkflow-test.ts index 54b9f283..d08d81f7 100644 --- a/packages/steps/src/__tests__/BuildWorkflow-test.ts +++ b/packages/steps/src/__tests__/BuildWorkflow-test.ts @@ -1,10 +1,10 @@ import { instance, mock, verify, when } from 'ts-mockito'; -import { BuildStep } from '../BuildStep.js'; -import { BuildWorkflow } from '../BuildWorkflow.js'; -import { BuildRuntimePlatform } from '../BuildRuntimePlatform.js'; +import { BuildStep } from '../BuildStep'; +import { BuildWorkflow } from '../BuildWorkflow'; +import { BuildRuntimePlatform } from '../BuildRuntimePlatform'; -import { createGlobalContextMock } from './utils/context.js'; +import { createGlobalContextMock } from './utils/context'; describe(BuildWorkflow, () => { describe(BuildWorkflow.prototype.executeAsync, () => { diff --git a/packages/steps/src/__tests__/BuildWorkflowValidator-test.ts b/packages/steps/src/__tests__/BuildWorkflowValidator-test.ts index 25151243..f7eeba19 100644 --- a/packages/steps/src/__tests__/BuildWorkflowValidator-test.ts +++ b/packages/steps/src/__tests__/BuildWorkflowValidator-test.ts @@ -1,16 +1,16 @@ import assert from 'assert'; -import { BuildStep, BuildStepFunction } from '../BuildStep.js'; -import { BuildStepInput, BuildStepInputValueTypeName } from '../BuildStepInput.js'; -import { BuildStepOutput } from '../BuildStepOutput.js'; -import { BuildWorkflow } from '../BuildWorkflow.js'; -import { BuildWorkflowValidator } from '../BuildWorkflowValidator.js'; -import { BuildConfigError, BuildWorkflowError } from '../errors.js'; -import { BuildRuntimePlatform } from '../BuildRuntimePlatform.js'; -import { BuildFunction } from '../BuildFunction.js'; +import { BuildStep, BuildStepFunction } from '../BuildStep'; +import { BuildStepInput, BuildStepInputValueTypeName } from '../BuildStepInput'; +import { BuildStepOutput } from '../BuildStepOutput'; +import { BuildWorkflow } from '../BuildWorkflow'; +import { BuildWorkflowValidator } from '../BuildWorkflowValidator'; +import { BuildConfigError, BuildWorkflowError } from '../errors'; +import { BuildRuntimePlatform } from '../BuildRuntimePlatform'; +import { BuildFunction } from '../BuildFunction'; -import { createGlobalContextMock } from './utils/context.js'; -import { getErrorAsync } from './utils/error.js'; +import { createGlobalContextMock } from './utils/context'; +import { getErrorAsync } from './utils/error'; describe(BuildWorkflowValidator, () => { test('non unique step ids', async () => { diff --git a/packages/steps/src/__tests__/StepsConfigParser-test.ts b/packages/steps/src/__tests__/StepsConfigParser-test.ts index 9a33d060..de943172 100644 --- a/packages/steps/src/__tests__/StepsConfigParser-test.ts +++ b/packages/steps/src/__tests__/StepsConfigParser-test.ts @@ -1,16 +1,16 @@ import path from 'path'; import assert from 'node:assert'; -import { BuildFunction } from '../BuildFunction.js'; -import { BuildFunctionGroup } from '../BuildFunctionGroup.js'; -import { BuildWorkflow } from '../BuildWorkflow.js'; -import { BuildConfigError, BuildStepRuntimeError } from '../errors.js'; -import { StepsConfigParser } from '../StepsConfigParser.js'; -import { BuildStepInput, BuildStepInputValueTypeName } from '../BuildStepInput.js'; +import { BuildFunction } from '../BuildFunction'; +import { BuildFunctionGroup } from '../BuildFunctionGroup'; +import { BuildWorkflow } from '../BuildWorkflow'; +import { BuildConfigError, BuildStepRuntimeError } from '../errors'; +import { StepsConfigParser } from '../StepsConfigParser'; +import { BuildStepInput, BuildStepInputValueTypeName } from '../BuildStepInput'; -import { createGlobalContextMock } from './utils/context.js'; -import { getError } from './utils/error.js'; -import { UUID_REGEX } from './utils/uuid.js'; +import { createGlobalContextMock } from './utils/context'; +import { getError } from './utils/error'; +import { UUID_REGEX } from './utils/uuid'; describe(StepsConfigParser, () => { describe('constructor', () => { diff --git a/packages/steps/src/__tests__/utils/context.ts b/packages/steps/src/__tests__/utils/context.ts index 49463d69..5e33b28f 100644 --- a/packages/steps/src/__tests__/utils/context.ts +++ b/packages/steps/src/__tests__/utils/context.ts @@ -9,11 +9,11 @@ import { ExternalBuildContextProvider, BuildStepGlobalContext, BuildStepContext, -} from '../../BuildStepContext.js'; -import { BuildRuntimePlatform } from '../../BuildRuntimePlatform.js'; -import { BuildStepEnv } from '../../BuildStepEnv.js'; +} from '../../BuildStepContext'; +import { BuildRuntimePlatform } from '../../BuildRuntimePlatform'; +import { BuildStepEnv } from '../../BuildStepEnv'; -import { createMockLogger } from './logger.js'; +import { createMockLogger } from './logger'; export class MockContextProvider implements ExternalBuildContextProvider { private _env: BuildStepEnv = {}; diff --git a/packages/steps/src/cli/cli.ts b/packages/steps/src/cli/cli.ts index 09f24a2b..91f58c93 100644 --- a/packages/steps/src/cli/cli.ts +++ b/packages/steps/src/cli/cli.ts @@ -3,11 +3,11 @@ import path from 'path'; import { Job, Metadata, StaticJobInterpolationContext } from '@expo/eas-build-job'; import { bunyan, createLogger } from '@expo/logger'; -import { BuildConfigParser } from '../BuildConfigParser.js'; -import { ExternalBuildContextProvider, BuildStepGlobalContext } from '../BuildStepContext.js'; -import { BuildWorkflowError } from '../errors.js'; -import { BuildRuntimePlatform } from '../BuildRuntimePlatform.js'; -import { BuildStepEnv } from '../BuildStepEnv.js'; +import { BuildConfigParser } from '../BuildConfigParser'; +import { ExternalBuildContextProvider, BuildStepGlobalContext } from '../BuildStepContext'; +import { BuildWorkflowError } from '../errors'; +import { BuildRuntimePlatform } from '../BuildRuntimePlatform'; +import { BuildStepEnv } from '../BuildStepEnv'; const logger = createLogger({ name: 'steps-cli', diff --git a/packages/steps/src/index.ts b/packages/steps/src/index.ts index b1122da1..52e88488 100644 --- a/packages/steps/src/index.ts +++ b/packages/steps/src/index.ts @@ -1,19 +1,19 @@ -export { BuildStepContext } from './BuildStepContext.js'; -export { readAndValidateBuildConfigFromPathAsync } from './BuildConfig.js'; -export { BuildConfigParser } from './BuildConfigParser.js'; -export { StepsConfigParser } from './StepsConfigParser.js'; -export { BuildFunction } from './BuildFunction.js'; -export { BuildRuntimePlatform } from './BuildRuntimePlatform.js'; -export { BuildStepInput, BuildStepInputValueTypeName } from './BuildStepInput.js'; -export { BuildStepOutput } from './BuildStepOutput.js'; -export { BuildStepGlobalContext, ExternalBuildContextProvider } from './BuildStepContext.js'; -export { BuildWorkflow } from './BuildWorkflow.js'; -export { BuildStepEnv } from './BuildStepEnv.js'; -export { BuildFunctionGroup } from './BuildFunctionGroup.js'; -export { BuildStep } from './BuildStep.js'; -export * as errors from './errors.js'; -export * from './interpolation.js'; -export * from './utils/shell/spawn.js'; -export * from './utils/jsepEval.js'; -export * from './utils/hashFiles.js'; -export { StepMetric, StepMetricResult, StepMetricsCollection } from './StepMetrics.js'; +export { BuildStepContext } from './BuildStepContext'; +export { readAndValidateBuildConfigFromPathAsync } from './BuildConfig'; +export { BuildConfigParser } from './BuildConfigParser'; +export { StepsConfigParser } from './StepsConfigParser'; +export { BuildFunction } from './BuildFunction'; +export { BuildRuntimePlatform } from './BuildRuntimePlatform'; +export { BuildStepInput, BuildStepInputValueTypeName } from './BuildStepInput'; +export { BuildStepOutput } from './BuildStepOutput'; +export { BuildStepGlobalContext, ExternalBuildContextProvider } from './BuildStepContext'; +export { BuildWorkflow } from './BuildWorkflow'; +export { BuildStepEnv } from './BuildStepEnv'; +export { BuildFunctionGroup } from './BuildFunctionGroup'; +export { BuildStep } from './BuildStep'; +export * as errors from './errors'; +export * from './interpolation'; +export * from './utils/shell/spawn'; +export * from './utils/jsepEval'; +export * from './utils/hashFiles'; +export { StepMetric, StepMetricResult, StepMetricsCollection } from './StepMetrics'; diff --git a/packages/steps/src/interpolation.ts b/packages/steps/src/interpolation.ts index ef379489..46970f01 100644 --- a/packages/steps/src/interpolation.ts +++ b/packages/steps/src/interpolation.ts @@ -1,6 +1,6 @@ import { JobInterpolationContext } from '@expo/eas-build-job'; -import { jsepEval } from './utils/jsepEval.js'; +import { jsepEval } from './utils/jsepEval'; export function interpolateJobContext({ target, diff --git a/packages/steps/src/scripts/__tests__/runCustomFunction-test.ts b/packages/steps/src/scripts/__tests__/runCustomFunction-test.ts index 75f3ecff..dcd217df 100644 --- a/packages/steps/src/scripts/__tests__/runCustomFunction-test.ts +++ b/packages/steps/src/scripts/__tests__/runCustomFunction-test.ts @@ -6,17 +6,17 @@ import { createContext } from 'this-file'; import { v4 as uuidv4 } from 'uuid'; import { jest } from '@jest/globals'; -import { BuildStepInput, BuildStepInputValueTypeName } from '../../BuildStepInput.js'; -import { BuildStepOutput } from '../../BuildStepOutput.js'; -import { createStepContextMock } from '../../__tests__/utils/context.js'; +import { BuildStepInput, BuildStepInputValueTypeName } from '../../BuildStepInput'; +import { BuildStepOutput } from '../../BuildStepOutput'; +import { createStepContextMock } from '../../__tests__/utils/context'; import { cleanUpStepTemporaryDirectoriesAsync, getTemporaryEnvsDirPath, getTemporaryOutputsDirPath, -} from '../../BuildTemporaryFiles.js'; -import { BIN_PATH } from '../../utils/shell/bin.js'; -import { createCustomFunctionCall } from '../../utils/customFunction.js'; -import { createMockLogger } from '../../__tests__/utils/logger.js'; +} from '../../BuildTemporaryFiles'; +import { BIN_PATH } from '../../utils/shell/bin'; +import { createCustomFunctionCall } from '../../utils/customFunction'; +import { createMockLogger } from '../../__tests__/utils/logger'; describe('runCustomFunction', () => { test('can run custom function', async () => { diff --git a/packages/steps/src/scripts/runCustomFunction.ts b/packages/steps/src/scripts/runCustomFunction.ts index 078cf821..b5e0eab8 100644 --- a/packages/steps/src/scripts/runCustomFunction.ts +++ b/packages/steps/src/scripts/runCustomFunction.ts @@ -4,14 +4,14 @@ import { createLogger } from '@expo/logger'; import { SpawnPromise, SpawnResult } from '@expo/spawn-async'; import cloneDeep from 'lodash.clonedeep'; -import { BuildStepOutput } from '../BuildStepOutput.js'; +import { BuildStepOutput } from '../BuildStepOutput'; import { SerializedCustomBuildFunctionArguments, deserializeInputs, -} from '../utils/customFunction.js'; -import { BuildStepContext } from '../BuildStepContext.js'; -import { BuildStepFunction } from '../BuildStep.js'; -import { spawnAsync } from '../utils/shell/spawn.js'; +} from '../utils/customFunction'; +import { BuildStepContext } from '../BuildStepContext'; +import { BuildStepFunction } from '../BuildStep'; +import { spawnAsync } from '../utils/shell/spawn'; async function runCustomJsFunctionAsync(): Promise { const customJavascriptFunctionModulePath = process.argv[2]; diff --git a/packages/steps/src/utils/__tests__/customFunction-test.ts b/packages/steps/src/utils/__tests__/customFunction-test.ts index c26b5967..d3f04ade 100644 --- a/packages/steps/src/utils/__tests__/customFunction-test.ts +++ b/packages/steps/src/utils/__tests__/customFunction-test.ts @@ -1,4 +1,4 @@ -import { deserializeInputs, serializeInputs } from '../customFunction.js'; +import { deserializeInputs, serializeInputs } from '../customFunction'; describe(serializeInputs, () => { test('serializes inputs correctly', () => { diff --git a/packages/steps/src/utils/__tests__/jsepEval-test.ts b/packages/steps/src/utils/__tests__/jsepEval-test.ts index 74ee61cc..58a73ac2 100644 --- a/packages/steps/src/utils/__tests__/jsepEval-test.ts +++ b/packages/steps/src/utils/__tests__/jsepEval-test.ts @@ -1,4 +1,4 @@ -import { jsepEval } from '../jsepEval.js'; +import { jsepEval } from '../jsepEval'; const TEST_CASES = [ ['1 + 1', 2], diff --git a/packages/steps/src/utils/__tests__/nullthrows-test.ts b/packages/steps/src/utils/__tests__/nullthrows-test.ts index b9369db3..be9c206c 100644 --- a/packages/steps/src/utils/__tests__/nullthrows-test.ts +++ b/packages/steps/src/utils/__tests__/nullthrows-test.ts @@ -1,5 +1,5 @@ -import { getError } from '../../__tests__/utils/error.js'; -import { nullthrows } from '../nullthrows.js'; +import { getError } from '../../__tests__/utils/error'; +import { nullthrows } from '../nullthrows'; describe(nullthrows, () => { it('throws for null', () => { diff --git a/packages/steps/src/utils/__tests__/template-test.ts b/packages/steps/src/utils/__tests__/template-test.ts index 20993312..b6e6a830 100644 --- a/packages/steps/src/utils/__tests__/template-test.ts +++ b/packages/steps/src/utils/__tests__/template-test.ts @@ -1,5 +1,5 @@ -import { BuildConfigError, BuildStepRuntimeError } from '../../errors.js'; -import { getError } from '../../__tests__/utils/error.js'; +import { BuildConfigError, BuildStepRuntimeError } from '../../errors'; +import { getError } from '../../__tests__/utils/error'; import { findOutputPaths, getObjectValueForInterpolation, @@ -7,7 +7,7 @@ import { interpolateWithInputs, interpolateWithOutputs, parseOutputPath, -} from '../template.js'; +} from '../template'; describe(interpolateWithInputs, () => { test('interpolation', () => { diff --git a/packages/steps/src/utils/customFunction.ts b/packages/steps/src/utils/customFunction.ts index 1796cc86..5c7c2bb4 100644 --- a/packages/steps/src/utils/customFunction.ts +++ b/packages/steps/src/utils/customFunction.ts @@ -3,12 +3,12 @@ import path from 'path'; import { createContext } from 'this-file'; import fs from 'fs-extra'; -import { BuildStepFunction } from '../BuildStep.js'; -import { BuildStepEnv } from '../BuildStepEnv.js'; -import { SerializedBuildStepOutput } from '../BuildStepOutput.js'; -import { SerializedBuildStepContext } from '../BuildStepContext.js'; +import { BuildStepFunction } from '../BuildStep'; +import { BuildStepEnv } from '../BuildStepEnv'; +import { SerializedBuildStepOutput } from '../BuildStepOutput'; +import { SerializedBuildStepContext } from '../BuildStepContext'; -import { spawnAsync } from './shell/spawn.js'; +import { spawnAsync } from './shell/spawn'; const thisFileCtx = createContext(); diff --git a/packages/steps/src/utils/expodash/__tests__/duplicates-test.ts b/packages/steps/src/utils/expodash/__tests__/duplicates-test.ts index 2e222092..c2bc635f 100644 --- a/packages/steps/src/utils/expodash/__tests__/duplicates-test.ts +++ b/packages/steps/src/utils/expodash/__tests__/duplicates-test.ts @@ -1,4 +1,4 @@ -import { duplicates } from '../duplicates.js'; +import { duplicates } from '../duplicates'; describe(duplicates, () => { it('returns empty list if there are no duplicates', () => { diff --git a/packages/steps/src/utils/expodash/__tests__/uniq-test.ts b/packages/steps/src/utils/expodash/__tests__/uniq-test.ts index ad004a1b..d42cde71 100644 --- a/packages/steps/src/utils/expodash/__tests__/uniq-test.ts +++ b/packages/steps/src/utils/expodash/__tests__/uniq-test.ts @@ -1,4 +1,4 @@ -import { uniq } from '../uniq.js'; +import { uniq } from '../uniq'; describe(uniq, () => { it('returns unique numbers from a list', () => { diff --git a/packages/steps/src/utils/shell/__tests__/command-test.ts b/packages/steps/src/utils/shell/__tests__/command-test.ts index f5c7767c..b523d8bc 100644 --- a/packages/steps/src/utils/shell/__tests__/command-test.ts +++ b/packages/steps/src/utils/shell/__tests__/command-test.ts @@ -1,4 +1,4 @@ -import { getShellCommandAndArgs } from '../command.js'; +import { getShellCommandAndArgs } from '../command'; describe(getShellCommandAndArgs, () => { test('shell command with arguments', () => { diff --git a/packages/steps/src/utils/template.ts b/packages/steps/src/utils/template.ts index 9809ab26..bc645565 100644 --- a/packages/steps/src/utils/template.ts +++ b/packages/steps/src/utils/template.ts @@ -1,10 +1,10 @@ import get from 'lodash.get'; import cloneDeep from 'lodash.clonedeep'; -import { BuildStepInputValueTypeName } from '../BuildStepInput.js'; -import { BuildConfigError, BuildStepRuntimeError } from '../errors.js'; +import { BuildStepInputValueTypeName } from '../BuildStepInput'; +import { BuildConfigError, BuildStepRuntimeError } from '../errors'; -import { nullthrows } from './nullthrows.js'; +import { nullthrows } from './nullthrows'; export const BUILD_STEP_INPUT_EXPRESSION_REGEXP = /\${\s*(inputs\.[\S]+)\s*}/; export const BUILD_STEP_OUTPUT_EXPRESSION_REGEXP = /\${\s*(steps\.[\S]+)\s*}/; From 2a1388ac8463de89d897c63a19cf44c66ecd7833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Fri, 9 Jan 2026 23:45:28 +0100 Subject: [PATCH 04/10] chore(steps): replace ESM-specific code with CJS equivalents - Replace this-file createContext() with native __dirname - Remove import.meta.url usage in test files (use built-in __dirname) - Update SCRIPTS_PATH to point to dist/scripts instead of dist_commonjs/scripts --- packages/steps/src/__tests__/AbstractConfigParser-test.ts | 3 --- packages/steps/src/__tests__/BuildConfig-test.ts | 3 --- packages/steps/src/__tests__/BuildConfigParser-test.ts | 3 --- packages/steps/src/utils/customFunction.ts | 5 +---- packages/steps/src/utils/shell/bin.ts | 6 +----- 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/packages/steps/src/__tests__/AbstractConfigParser-test.ts b/packages/steps/src/__tests__/AbstractConfigParser-test.ts index 215e4af1..ec893d2d 100644 --- a/packages/steps/src/__tests__/AbstractConfigParser-test.ts +++ b/packages/steps/src/__tests__/AbstractConfigParser-test.ts @@ -1,5 +1,4 @@ import path from 'path'; -import url from 'url'; import { StepsConfigParser } from '../StepsConfigParser'; import { BuildFunction } from '../BuildFunction'; @@ -9,8 +8,6 @@ import { BuildStep } from '../BuildStep'; import { createGlobalContextMock } from './utils/context'; import { UUID_REGEX } from './utils/uuid'; -const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); - describe('Publish Update job', () => { it('parses job with steps and build config to the same workflow', async () => { const ctx = createGlobalContextMock(); diff --git a/packages/steps/src/__tests__/BuildConfig-test.ts b/packages/steps/src/__tests__/BuildConfig-test.ts index 0b0653dd..b371cc73 100644 --- a/packages/steps/src/__tests__/BuildConfig-test.ts +++ b/packages/steps/src/__tests__/BuildConfig-test.ts @@ -1,6 +1,5 @@ import assert from 'assert'; import path from 'path'; -import url from 'url'; import { BuildStepBareCommandRun, @@ -26,8 +25,6 @@ import { BuildConfigError, BuildConfigYAMLError } from '../errors'; import { getError, getErrorAsync } from './utils/error'; -const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); - describe(readAndValidateBuildConfigFromPathAsync, () => { test('valid custom build config', async () => { const config = await readAndValidateBuildConfigFromPathAsync( diff --git a/packages/steps/src/__tests__/BuildConfigParser-test.ts b/packages/steps/src/__tests__/BuildConfigParser-test.ts index 004cf736..2f9c5f3d 100644 --- a/packages/steps/src/__tests__/BuildConfigParser-test.ts +++ b/packages/steps/src/__tests__/BuildConfigParser-test.ts @@ -1,5 +1,4 @@ import path from 'path'; -import url from 'url'; import { BuildConfigParser } from '../BuildConfigParser'; import { BuildFunction } from '../BuildFunction'; @@ -14,8 +13,6 @@ import { createGlobalContextMock } from './utils/context'; import { getError, getErrorAsync } from './utils/error'; import { UUID_REGEX } from './utils/uuid'; -const __dirname = url.fileURLToPath(new URL('.', import.meta.url)); - describe(BuildConfigParser, () => { describe('constructor', () => { it('throws if provided external functions with duplicated IDs', () => { diff --git a/packages/steps/src/utils/customFunction.ts b/packages/steps/src/utils/customFunction.ts index 5c7c2bb4..674ec390 100644 --- a/packages/steps/src/utils/customFunction.ts +++ b/packages/steps/src/utils/customFunction.ts @@ -1,6 +1,5 @@ import path from 'path'; -import { createContext } from 'this-file'; import fs from 'fs-extra'; import { BuildStepFunction } from '../BuildStep'; @@ -10,9 +9,7 @@ import { SerializedBuildStepContext } from '../BuildStepContext'; import { spawnAsync } from './shell/spawn'; -const thisFileCtx = createContext(); - -export const SCRIPTS_PATH = path.join(thisFileCtx.dirname, '../../dist_commonjs/scripts'); +export const SCRIPTS_PATH = path.join(__dirname, '../../dist/scripts'); type SerializedBuildStepInput = { serializedValue: string | undefined }; diff --git a/packages/steps/src/utils/shell/bin.ts b/packages/steps/src/utils/shell/bin.ts index 4507616d..e4ee40c4 100644 --- a/packages/steps/src/utils/shell/bin.ts +++ b/packages/steps/src/utils/shell/bin.ts @@ -1,7 +1,3 @@ import path from 'path'; -import { createContext } from 'this-file'; - -const ctx = createContext(); - -export const BIN_PATH = path.join(ctx.dirname, '../../../bin'); +export const BIN_PATH = path.join(__dirname, '../../../bin'); From e99b31831483946f39c17c19d071f46e0a4b7800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Fri, 9 Jan 2026 23:46:41 +0100 Subject: [PATCH 05/10] chore(steps): update cli.sh and jest.config.cjs for CJS - Update cli.sh to reference dist/cli/cli.js instead of dist_commonjs/cli/cli.cjs - Simplify jest.config.cjs to use standard ts-jest preset (not ESM) - Remove moduleNameMapper for .js extensions (no longer needed) - Remove custom transform with useESM option --- packages/steps/cli.sh | 2 +- packages/steps/jest.config.cjs | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/packages/steps/cli.sh b/packages/steps/cli.sh index f73fce1f..c6fdc2b4 100755 --- a/packages/steps/cli.sh +++ b/packages/steps/cli.sh @@ -4,4 +4,4 @@ set -eo pipefail STEPS_ROOT_DIR=$( dirname "${BASH_SOURCE[0]}" ) -node $STEPS_ROOT_DIR/dist_commonjs/cli/cli.cjs $@ | yarn run bunyan -o short +node $STEPS_ROOT_DIR/dist/cli/cli.js $@ | yarn run bunyan -o short diff --git a/packages/steps/jest.config.cjs b/packages/steps/jest.config.cjs index 65626757..3e1f21cd 100644 --- a/packages/steps/jest.config.cjs +++ b/packages/steps/jest.config.cjs @@ -1,23 +1,11 @@ module.exports = { - preset: 'ts-jest/presets/default-esm', - transform: { - '^.+\\.tsx?$': [ - 'ts-jest', - { - tsconfig: 'tsconfig.json', - useESM: true, - }, - ], - }, + preset: 'ts-jest', testEnvironment: 'node', rootDir: 'src', testMatch: ['**/__tests__/*-test.ts'], coverageReporters: ['json', 'lcov'], coverageDirectory: '../coverage/tests/', collectCoverageFrom: ['**/*.ts'], - moduleNameMapper: { - '^(\\.\\.?/.*)\\.js$': ['$1.ts', '$0'], - }, clearMocks: true, setupFilesAfterEnv: ['/../jest/setup-tests.ts'], }; From 92c237246c59bd880d168f19f38bdfddeb6965fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Fri, 9 Jan 2026 23:50:20 +0100 Subject: [PATCH 06/10] fix(steps): update remaining ESM references to CJS - Remove this-file import from runCustomFunction-test.ts - Update SCRIPTS_PATH reference to runCustomFunction.js (not .cjs) --- .../steps/src/scripts/__tests__/runCustomFunction-test.ts | 6 ++---- packages/steps/src/utils/customFunction.ts | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/steps/src/scripts/__tests__/runCustomFunction-test.ts b/packages/steps/src/scripts/__tests__/runCustomFunction-test.ts index dcd217df..b56dc6ea 100644 --- a/packages/steps/src/scripts/__tests__/runCustomFunction-test.ts +++ b/packages/steps/src/scripts/__tests__/runCustomFunction-test.ts @@ -2,7 +2,6 @@ import path from 'path'; import os from 'os'; import fs from 'fs/promises'; -import { createContext } from 'this-file'; import { v4 as uuidv4 } from 'uuid'; import { jest } from '@jest/globals'; @@ -20,14 +19,13 @@ import { createMockLogger } from '../../__tests__/utils/logger'; describe('runCustomFunction', () => { test('can run custom function', async () => { - const dirname = createContext().dirname; const projectSourceDirectory = path.join(os.tmpdir(), 'eas-build', uuidv4()); await fs.mkdir(projectSourceDirectory, { recursive: true }); const logger = createMockLogger(); // return the same logger instance so we can expect calls on it later jest.spyOn(logger, 'child').mockImplementation(() => logger); const ctx = createStepContextMock({ - projectTargetDirectory: path.resolve(dirname, '../../__tests__/fixtures'), + projectTargetDirectory: path.resolve(__dirname, '../../__tests__/fixtures'), projectSourceDirectory, logger, }); @@ -82,7 +80,7 @@ describe('runCustomFunction', () => { const currentPath = process.env.PATH; const newPath = currentPath ? `${BIN_PATH}:${currentPath}` : BIN_PATH; const fn = createCustomFunctionCall( - path.resolve(dirname, '../../__tests__/fixtures/my-custom-ts-function') + path.resolve(__dirname, '../../__tests__/fixtures/my-custom-ts-function') ); const promise = fn(ctx, { env: { diff --git a/packages/steps/src/utils/customFunction.ts b/packages/steps/src/utils/customFunction.ts index 674ec390..438bfa1d 100644 --- a/packages/steps/src/utils/customFunction.ts +++ b/packages/steps/src/utils/customFunction.ts @@ -66,7 +66,7 @@ export function createCustomFunctionCall(rawCustomFunctionModulePath: string): B await spawnAsync( 'node', [ - path.join(SCRIPTS_PATH, 'runCustomFunction.cjs'), + path.join(SCRIPTS_PATH, 'runCustomFunction.js'), customFunctionModulePath, JSON.stringify(serializedArguments), ], From a9d8d5e8311ffc80bcb3fc26ad5cffaa1028dc4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Fri, 9 Jan 2026 23:51:55 +0100 Subject: [PATCH 07/10] chore(steps): update yarn.lock after dependency removal --- yarn.lock | 189 ++++-------------------------------------------------- 1 file changed, 12 insertions(+), 177 deletions(-) diff --git a/yarn.lock b/yarn.lock index 78b3477b..32c96797 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2695,7 +2695,7 @@ ansi-regex@^6.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -2732,14 +2732,6 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -anymatch@~3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" - integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - aproba@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" @@ -3078,11 +3070,6 @@ bin-links@^5.0.0: read-cmd-shim "^5.0.0" write-file-atomic "^6.0.0" -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - bl@^4.0.3: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" @@ -3130,7 +3117,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^3.0.3, braces@~3.0.2: +braces@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== @@ -3341,7 +3328,7 @@ camelcase-keys@^6.2.2: map-obj "^4.0.0" quick-lru "^4.0.1" -camelcase@^5.0.0, camelcase@^5.3.1: +camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -3401,31 +3388,6 @@ chardet@^2.1.1: resolved "https://registry.yarnpkg.com/chardet/-/chardet-2.1.1.tgz#5c75593704a642f71ee53717df234031e65373c8" integrity sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ== -chokidar-cli@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chokidar-cli/-/chokidar-cli-3.0.0.tgz#29283666063b9e167559d30f247ff8fc48794eb7" - integrity sha512-xVW+Qeh7z15uZRxHOkP93Ux8A0xbPzwK4GaqD8dQOYc34TlkqUhVSS59fK36DOp5WdJlrRzlYSy02Ht99FjZqQ== - dependencies: - chokidar "^3.5.2" - lodash.debounce "^4.0.8" - lodash.throttle "^4.1.1" - yargs "^13.3.0" - -chokidar@^3.5.2: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" @@ -3502,15 +3464,6 @@ cli-width@^4.1.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.1.0.tgz#42daac41d3c254ef38ad8ac037672130173691c5" integrity sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ== -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" - cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -3910,7 +3863,7 @@ decamelize-keys@^1.1.0: decamelize "^1.1.0" map-obj "^1.0.0" -decamelize@^1.1.0, decamelize@^1.2.0: +decamelize@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -4147,11 +4100,6 @@ emittery@^0.13.1: resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad" integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ== -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== - emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" @@ -4932,13 +4880,6 @@ find-up@^2.0.0: dependencies: locate-path "^2.0.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -5071,7 +5012,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^2.3.2, fsevents@~2.3.2: +fsevents@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -5138,7 +5079,7 @@ gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^2.0.1, get-caller-file@^2.0.5: +get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -5338,7 +5279,7 @@ glob-parent@6.0.2, glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob-parent@^5.1.2, glob-parent@~5.1.2: +glob-parent@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -5999,13 +5940,6 @@ is-bigint@^1.1.0: dependencies: has-bigints "^1.0.2" -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - is-boolean-object@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0" @@ -6126,11 +6060,6 @@ is-finalizationregistry@^1.1.0: dependencies: call-bound "^1.0.3" -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -6155,7 +6084,7 @@ is-glob@^4.0.0, is-glob@^4.0.1: dependencies: is-extglob "^2.1.1" -is-glob@^4.0.3, is-glob@~4.0.1: +is-glob@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -7299,14 +7228,6 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -7326,11 +7247,6 @@ lodash.clonedeep@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== - lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" @@ -7351,11 +7267,6 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.throttle@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" - integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ== - lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.5: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -8001,7 +7912,7 @@ normalize-package-data@^3.0.3: semver "^7.3.4" validate-npm-package-license "^3.0.1" -normalize-path@^3.0.0, normalize-path@~3.0.0: +normalize-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== @@ -8432,7 +8343,7 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.0: +p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== @@ -8453,13 +8364,6 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -8703,7 +8607,7 @@ picomatch@^2.0.4: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== -picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: +picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -9041,13 +8945,6 @@ readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -9131,11 +9028,6 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - resolve-alpn@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.0.0.tgz#745ad60b3d6aff4b4a48e01b8c0bdc70959e0e8c" @@ -9766,15 +9658,6 @@ string-length@^4.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - string-width@^4.1.0, string-width@^4.2.0: version "4.2.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" @@ -9935,7 +9818,7 @@ string_decoder@~1.1.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: +strip-ansi@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== @@ -10152,11 +10035,6 @@ thingies@^1.20.0: resolved "https://registry.yarnpkg.com/thingies/-/thingies-1.21.0.tgz#e80fbe58fd6fdaaab8fad9b67bd0a5c943c445c1" integrity sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g== -this-file@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/this-file/-/this-file-2.0.3.tgz#13bd2bcfbab2ce86a37a15689df1d14861032b1b" - integrity sha512-IdMH1bUkVJdJjM7o8v83Mv4QvVPdkAofur20STl2Bbw9uMuuS/bT/PZURkEdZsy9XC/1ZXWgZ1wIL9nvouGaEg== - through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -10771,11 +10649,6 @@ which-collection@^1.0.2: is-weakmap "^2.0.2" is-weakset "^2.0.3" -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== - which-typed-array@^1.1.11, which-typed-array@^1.1.13: version "1.1.13" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" @@ -10857,15 +10730,6 @@ wordwrap@^1.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -10988,11 +10852,6 @@ xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== - y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -11033,14 +10892,6 @@ yargs-parser@21.1.1, yargs-parser@^21.0.1, yargs-parser@^21.1.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs-parser@^13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^20.2.2: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" @@ -11064,22 +10915,6 @@ yargs@17.7.2: y18n "^5.0.5" yargs-parser "^21.1.1" -yargs@^13.3.0: - version "13.3.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.2" - yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" From 36b5172162cdb31eb79afdeadbe10726f0b3d9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Mon, 12 Jan 2026 12:02:27 +0100 Subject: [PATCH 08/10] Fix import --- packages/build-tools/src/steps/functions/installNodeModules.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/build-tools/src/steps/functions/installNodeModules.ts b/packages/build-tools/src/steps/functions/installNodeModules.ts index dd6f4297..54daf91d 100644 --- a/packages/build-tools/src/steps/functions/installNodeModules.ts +++ b/packages/build-tools/src/steps/functions/installNodeModules.ts @@ -1,7 +1,6 @@ import path from 'path'; -import { BuildFunction, BuildStepEnv } from '@expo/steps'; -import { BuildStepContext } from '@expo/steps/dist_esm/BuildStepContext'; +import { BuildFunction, BuildStepEnv, BuildStepContext } from '@expo/steps'; import { findPackagerRootDir, From acc5e7d07b4031a367bee5a112bc609390871ce7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Mon, 12 Jan 2026 12:06:20 +0100 Subject: [PATCH 09/10] Remove import/extensions ESLint rule --- packages/steps/.eslintrc.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/steps/.eslintrc.json b/packages/steps/.eslintrc.json index 8c9e49df..f1f5e2b1 100644 --- a/packages/steps/.eslintrc.json +++ b/packages/steps/.eslintrc.json @@ -1,10 +1,7 @@ { "extends": "../../.eslintrc.json", - "plugins": [ - "async-protect" - ], + "plugins": ["async-protect"], "rules": { - "async-protect/async-suffix": "error", - "import/extensions": ["error", "always"] + "async-protect/async-suffix": "error" } } From 2dc1aaaa65fcc8cdbc222a87d6ffcfa5d6478d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Mon, 12 Jan 2026 12:06:50 +0100 Subject: [PATCH 10/10] Fix lint --- packages/steps/src/scripts/runCustomFunction.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/steps/src/scripts/runCustomFunction.ts b/packages/steps/src/scripts/runCustomFunction.ts index b5e0eab8..fbbd2ba9 100644 --- a/packages/steps/src/scripts/runCustomFunction.ts +++ b/packages/steps/src/scripts/runCustomFunction.ts @@ -5,10 +5,7 @@ import { SpawnPromise, SpawnResult } from '@expo/spawn-async'; import cloneDeep from 'lodash.clonedeep'; import { BuildStepOutput } from '../BuildStepOutput'; -import { - SerializedCustomBuildFunctionArguments, - deserializeInputs, -} from '../utils/customFunction'; +import { SerializedCustomBuildFunctionArguments, deserializeInputs } from '../utils/customFunction'; import { BuildStepContext } from '../BuildStepContext'; import { BuildStepFunction } from '../BuildStep'; import { spawnAsync } from '../utils/shell/spawn';