diff --git a/.github/actions/setup-server/action.yml b/.github/actions/setup-server/action.yml index 8bb1720911..0cd52e5abc 100644 --- a/.github/actions/setup-server/action.yml +++ b/.github/actions/setup-server/action.yml @@ -19,7 +19,7 @@ runs: access_token: ${{ github.token }} - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ inputs.node-version }} cache: "yarn" @@ -28,11 +28,3 @@ runs: uses: ./.github/actions/cache-deps with: extension: ${{ inputs.cache-extension }} - - - name: Install dev cli - shell: "bash" - run: sudo npm i -g medusa-dev-cli@preview - - - name: Set path to medusa repo - shell: "bash" - run: medusa-dev --set-path-to-repo $(pwd) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index f1ce3cc234..eb98c80068 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -15,13 +15,6 @@ jobs: env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ secrets.TURBO_TEAM }} - outputs: - module-matrix: ${{ steps.set-module-matrix.outputs.matrix }} - module-chunks: ${{ steps.set-module-chunks.outputs.chunks }} - http-matrix: ${{ steps.set-http-matrix.outputs.matrix }} - http-chunks: ${{ steps.set-http-chunks.outputs.chunks }} - unit-tests-matrix: ${{ steps.set-unit-tests-matrix.outputs.matrix }} - unit-tests-chunks: ${{ steps.set-unit-tests-chunks.outputs.chunks }} steps: - name: Cancel Previous Runs uses: styfle/cancel-workflow-action@0.11.0 @@ -34,7 +27,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" @@ -47,46 +40,11 @@ jobs: with: extension: pipeline - - id: set-module-chunks - name: Set Module Chunks - working-directory: integration-tests/modules - run: echo "chunks=$(yarn run jest --listTests --json | jq -cM '[_nwise(length / 2 | ceil)]')" >> $GITHUB_OUTPUT - - - id: set-module-matrix - name: Set Module Matrix - run: echo "matrix=$(echo $CHUNKS | jq -cM 'to_entries | map(.key)')" >> $GITHUB_OUTPUT - env: - CHUNKS: ${{ steps.set-module-chunks.outputs.chunks }} - - - id: set-http-chunks - name: Set HTTP Chunks - working-directory: integration-tests/http - run: echo "chunks=$(yarn run jest --listTests --json | jq -cM '[_nwise(length / 2 | ceil)]')" >> $GITHUB_OUTPUT - - - id: set-http-matrix - name: Set HTTP Matrix - run: echo "matrix=$(echo $CHUNKS | jq -cM 'to_entries | map(.key)')" >> $GITHUB_OUTPUT - env: - CHUNKS: ${{ steps.set-http-chunks.outputs.chunks }} - - - id: set-unit-tests-chunks - name: Set Unit Tests Chunks - run: echo "chunks=$(yarn workspaces list --json | jq -j '[inputs | .name]' | jq -r | jq -cM '[_nwise(length / 2 | ceil)]')" >> $GITHUB_OUTPUT - - - id: set-unit-tests-matrix - name: Set Unit Tests Matrix - run: echo "matrix=$(echo $CHUNKS | jq -cM 'to_entries | map(.key)')" >> $GITHUB_OUTPUT - env: - CHUNKS: ${{ steps.set-unit-tests-chunks.outputs.chunks }} - - unit-tests-matrix: + unit-tests: needs: setup runs-on: ubuntu-latest - name: Shard (${{ matrix.chunk }}) Unit Tests strategy: - fail-fast: false - matrix: - chunk: ${{ fromJSON(needs.setup.outputs.unit-tests-matrix) }} + fail-fast: true env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ secrets.TURBO_TEAM }} @@ -106,13 +64,15 @@ jobs: - name: Run unit tests run: yarn test:chunk - env: - CHUNK: ${{ matrix.chunk }} - CHUNKS: ${{ needs.setup.outputs.unit-tests-chunks }} - integration-tests-packages: + integration-tests-packages-matrix: needs: setup + name: Packages integration tests (${{ matrix.group }}) runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + group: ["slow", "fast"] env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ secrets.TURBO_TEAM }} @@ -152,102 +112,100 @@ jobs: extension: pipeline - name: Run integration tests - run: yarn test:integration:packages + run: yarn test:integration:packages:${{ matrix.group }} env: DB_PASSWORD: postgres DB_USERNAME: postgres - integration-tests-http-matrix: - needs: setup - name: Shard (${{ matrix.chunk }}) HTTP Integration Tests - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - chunk: ${{ fromJSON(needs.setup.outputs.http-matrix) }} - env: - TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} - TURBO_TEAM: ${{ secrets.TURBO_TEAM }} - - services: - redis: - image: redis - options: >- - --health-cmd "redis-cli ping" - --health-interval 1s - --health-timeout 10s - --health-retries 10 - ports: - - 6379:6379 - postgres: - image: postgres - env: - POSTGRES_PASSWORD: postgres - POSTGRES_USER: postgres - options: >- - --health-cmd pg_isready - --health-interval 1s - --health-timeout 10s - --health-retries 10 - ports: - - 5432:5432 - - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Install dependencies - uses: ./.github/actions/cache-deps - with: - extension: pipeline - - - name: Run HTTP integration tests - run: yarn test:integration:http - env: - DB_USERNAME: postgres - DB_PASSWORD: postgres - NODE_OPTIONS: "--max_old_space_size=4096" - CHUNK: ${{ matrix.chunk }} - CHUNKS: ${{ needs.setup.outputs.http-chunks }} - - integration-tests-http: - if: ${{ always() }} - runs-on: ubuntu-latest - needs: integration-tests-http-matrix - steps: - - run: exit 1 - if: >- - ${{ - contains(needs.integration-tests-http-matrix.result, 'failure') - || contains(needs.integration-tests-http-matrix.result, 'cancelled') - || contains(needs.integration-tests-http-matrix.result, 'skipped') - }} - - run: exit 0 - if: ${{ contains(needs.integration-tests-http-matrix.result, 'success') }} - - unit-tests: + integration-tests-packages: if: ${{ always() }} runs-on: ubuntu-latest - needs: unit-tests-matrix + needs: integration-tests-packages-matrix steps: - run: exit 1 if: >- ${{ - contains(needs.unit-tests-matrix.result, 'failure') - || contains(needs.unit-tests-matrix.result, 'cancelled') - || contains(needs.unit-tests-matrix.result, 'skipped') + contains(needs.integration-tests-packages-matrix.result, 'failure') + || contains(needs.integration-tests-packages-matrix.result, 'cancelled') + || contains(needs.integration-tests-packages-matrix.result, 'skipped') }} - run: exit 0 - if: ${{ contains(needs.unit-tests-matrix.result, 'success') }} + if: ${{ contains(needs.integration-tests-packages-matrix.result, 'success') }} + + integration-tests-http-matrix: + needs: setup + name: HTTP Integration Tests - Shard ${{ matrix.shard_index }} + runs-on: ubuntu-latest + strategy: + fail-fast: true + matrix: + shard_index: [1, 2, 3] + env: + TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} + TURBO_TEAM: ${{ secrets.TURBO_TEAM }} + + services: + redis: + image: redis + options: >- + --health-cmd "redis-cli ping" + --health-interval 1s + --health-timeout 10s + --health-retries 10 + ports: + - 6379:6379 + postgres: + image: postgres + env: + POSTGRES_PASSWORD: postgres + POSTGRES_USER: postgres + options: >- + --health-cmd pg_isready + --health-interval 1s + --health-timeout 10s + --health-retries 10 + ports: + - 5432:5432 + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Install dependencies + uses: ./.github/actions/cache-deps + with: + extension: pipeline + + - name: Run HTTP integration tests + run: yarn test:integration:http -- --shard=${{ matrix.shard_index }}/3 + env: + DB_USERNAME: postgres + DB_PASSWORD: postgres + NODE_OPTIONS: "--max_old_space_size=4096" + + integration-tests-http: + if: ${{ always() }} + runs-on: ubuntu-latest + needs: integration-tests-http-matrix + steps: + - run: exit 1 + if: >- + ${{ + contains(needs.integration-tests-http-matrix.result, 'failure') + || contains(needs.integration-tests-http-matrix.result, 'cancelled') + || contains(needs.integration-tests-http-matrix.result, 'skipped') + }} + - run: exit 0 + if: ${{ contains(needs.integration-tests-http-matrix.result, 'success') }} integration-tests-modules-matrix: needs: setup - name: Shard (${{ matrix.chunk }}) Module Integration Tests + name: Module Integration Tests - Shard ${{ matrix.shard_index }} strategy: matrix: - chunk: ${{ fromJSON(needs.setup.outputs.module-matrix) }} + shard_index: [1, 2] runs-on: ubuntu-latest env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} @@ -279,7 +237,7 @@ jobs: extension: pipeline - name: Run Modules integration tests - run: yarn test:integration:modules + run: yarn test:integration:modules -- --shard=${{ matrix.shard_index }}/3 env: DB_USERNAME: postgres DB_PASSWORD: postgres diff --git a/.github/workflows/admin-i18n-validation.yml b/.github/workflows/admin-i18n-validation.yml index 3c63eb1c80..d38bf01d61 100644 --- a/.github/workflows/admin-i18n-validation.yml +++ b/.github/workflows/admin-i18n-validation.yml @@ -5,7 +5,6 @@ on: paths: - packages/admin/dashboard/src/i18n/translations/** - jobs: i18n-validation-admin-dashboard: runs-on: ubuntu-latest @@ -17,10 +16,10 @@ jobs: fetch-depth: 0 - name: Set up Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: '20' - cache: 'yarn' + node-version: "20" + cache: "yarn" - name: Install dependencies working-directory: packages/admin/dashboard @@ -30,18 +29,18 @@ jobs: working-directory: packages/admin/dashboard run: | git diff --name-only --diff-filter=A origin/develop HEAD -- src/i18n/translations > i18n_added_files.txt - + cat i18n_added_files.txt - + while read -r file; do # Get the base name of the file filename=$(basename "$file") - + # Skip those items if [ "$filename" = "\$schema.json" ] || [ "$filename" = "index.ts" ] || [ -d "$file" ]; then continue fi - + # Run validation on the file yarn i18n:validate "$filename" done < i18n_added_files.txt diff --git a/.github/workflows/codegen-test.yml b/.github/workflows/codegen-test.yml index bd5469c3f4..f03bea0e5d 100644 --- a/.github/workflows/codegen-test.yml +++ b/.github/workflows/codegen-test.yml @@ -23,7 +23,7 @@ # fetch-depth: 0 # # - name: Setup Node.js environment -# uses: actions/setup-node@v3 +# uses: actions/setup-node@v4 # with: # node-version: "16.10.0" # cache: "yarn" diff --git a/.github/workflows/docs-freshness-check.yml b/.github/workflows/docs-freshness-check.yml index 275e732779..7ae370761b 100644 --- a/.github/workflows/docs-freshness-check.yml +++ b/.github/workflows/docs-freshness-check.yml @@ -22,7 +22,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml index 4f06538417..adfa6ee5b3 100644 --- a/.github/workflows/docs-test.yml +++ b/.github/workflows/docs-test.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" diff --git a/.github/workflows/docs-update-version.yml b/.github/workflows/docs-update-version.yml index ea300fb24c..b3c2d08532 100644 --- a/.github/workflows/docs-update-version.yml +++ b/.github/workflows/docs-update-version.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" @@ -51,4 +51,4 @@ jobs: labels: "type: chore" add-paths: www/packages/docs-ui/src/global-config.ts branch: "docs/update-config-version" - branch-suffix: "timestamp" \ No newline at end of file + branch-suffix: "timestamp" diff --git a/.github/workflows/generate-public-references.yml b/.github/workflows/generate-public-references.yml index 1be8208302..ca697a7ac1 100644 --- a/.github/workflows/generate-public-references.yml +++ b/.github/workflows/generate-public-references.yml @@ -35,7 +35,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" @@ -114,7 +114,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" @@ -187,7 +187,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" @@ -242,7 +242,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" diff --git a/.github/workflows/oas-test.yml b/.github/workflows/oas-test.yml index 3ac94c3e66..86e606b980 100644 --- a/.github/workflows/oas-test.yml +++ b/.github/workflows/oas-test.yml @@ -1,41 +1,42 @@ name: OAS Comments Format Validation on: - pull_request: - paths: - - www/utils/generated/oas-output/** + pull_request: + paths: + - www/utils/generated/oas-output/** jobs: - docs-test: - runs-on: ubuntu-latest - env: - TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} - TURBO_TEAM: ${{ secrets.TURBO_TEAM }} - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.11.0 - with: - access_token: ${{ github.token }} + docs-test: + runs-on: ubuntu-latest + env: + TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} + TURBO_TEAM: ${{ secrets.TURBO_TEAM }} + steps: + - name: Cancel Previous Runs + uses: styfle/cancel-workflow-action@0.11.0 + with: + access_token: ${{ github.token }} - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 - - name: Setup Node.js environment - uses: actions/setup-node@v3 - with: - node-version: "16.10.0" - cache: "yarn" + - name: Setup Node.js environment + uses: actions/setup-node@v4 + with: + node-version: "16.10.0" + cache: "yarn" - - name: Install dependencies - uses: ./.github/actions/cache-deps - with: - extension: oas + - name: Install dependencies + uses: ./.github/actions/cache-deps + with: + extension: oas - - name: Build Packages - run: yarn build + - name: Build Packages + run: yarn build - - name: Build OAS - run: | - yarn openapi:generate --dry-run -# \ No newline at end of file + - name: Build OAS + run: | + yarn openapi:generate --dry-run + +# diff --git a/.github/workflows/release-notifications.yml b/.github/workflows/release-notifications.yml index 533f339f64..70c26bc775 100644 --- a/.github/workflows/release-notifications.yml +++ b/.github/workflows/release-notifications.yml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ced86aaa60..b2ff589947 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v3 - name: Setup Node.js 20 - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 diff --git a/.github/workflows/snapshot-this.yml b/.github/workflows/snapshot-this.yml index d11ed0be8e..0504a77930 100644 --- a/.github/workflows/snapshot-this.yml +++ b/.github/workflows/snapshot-this.yml @@ -77,7 +77,7 @@ jobs: git checkout origin/main -- .changeset fi - name: Setup Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 cache: "yarn" diff --git a/.github/workflows/test-cli-with-database.yml b/.github/workflows/test-cli-with-database.yml index e52808e765..aadbeb7a47 100644 --- a/.github/workflows/test-cli-with-database.yml +++ b/.github/workflows/test-cli-with-database.yml @@ -6,6 +6,8 @@ jobs: test-cli-with-database: env: NODE_ENV: CI + TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} + TURBO_TEAM: ${{ secrets.TURBO_TEAM }} REDIS_URL: redis://localhost:6379 DATABASE_URL: "postgres://postgres:postgres@localhost/cli-test" services: @@ -40,22 +42,32 @@ jobs: with: fetch-depth: 0 - - name: Setup development server - uses: ./.github/actions/setup-server + - name: Setup Node.js environment + uses: actions/setup-node@v4 with: - cache-extension: "cli-test" node-version: 20 + cache: "yarn" + + - name: Install dependencies + uses: ./.github/actions/cache-deps + with: + extension: cli-database - name: Install Medusa cli run: npm i -g @medusajs/cli@latest - name: Create Medusa project - run: | - medusa new cli-test --skip-db --v2 --branch ci working-directory: .. + run: | + medusa new cli-test --skip-db --v2 --branch ci-custom - - name: run medusa dev - run: medusa-dev --force-install + - name: Enable Corepack + run: corepack enable + + - name: Install new app dependencies (via resolutions) + run: rm package-lock.json && yarn install --no-immutable + env: + YARN_ENABLE_IMMUTABLE_INSTALLS: false working-directory: ../cli-test - name: Run migrations diff --git a/.github/workflows/trigger-release.yml b/.github/workflows/trigger-release.yml index d710b9085c..df1cde2712 100644 --- a/.github/workflows/trigger-release.yml +++ b/.github/workflows/trigger-release.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@v3 - name: Setup Node.js 20 - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 diff --git a/integration-tests/http/package.json b/integration-tests/http/package.json index b83fc515f7..ce6f6325b9 100644 --- a/integration-tests/http/package.json +++ b/integration-tests/http/package.json @@ -6,7 +6,7 @@ "private": true, "scripts": { "test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --no-cache --maxWorkers=50% --bail --detectOpenHandles --forceExit --logHeapUsage", - "test:integration:chunk": "NODE_OPTIONS=--experimental-vm-modules jest --silent --no-cache --bail --maxWorkers=50% --forceExit --testPathPattern=$(echo $CHUNKS | jq -r \".[${CHUNK}] | .[]\")", + "test:integration:chunk": "NODE_OPTIONS=--experimental-vm-modules jest --silent --no-cache --bail --maxWorkers=50% --forceExit", "build": "tsc --allowJs --outDir ./dist" }, "dependencies": { diff --git a/integration-tests/modules/package.json b/integration-tests/modules/package.json index b84a0014e6..93c49d1190 100644 --- a/integration-tests/modules/package.json +++ b/integration-tests/modules/package.json @@ -6,7 +6,7 @@ "private": true, "scripts": { "test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --no-cache --maxWorkers=50% --bail --detectOpenHandles --forceExit --logHeapUsage", - "test:integration:chunk": "NODE_OPTIONS=--experimental-vm-modules jest --silent --no-cache --bail --maxWorkers=50% --forceExit --testPathPattern=$(echo $CHUNKS | jq -r \".[${CHUNK}] | .[]\")", + "test:integration:chunk": "NODE_OPTIONS=--experimental-vm-modules jest --silent --no-cache --bail --maxWorkers=50% --forceExit", "build": "tsc --allowJs --outDir ./dist" }, "dependencies": { diff --git a/package.json b/package.json index cd2059760a..3212d05d2a 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,8 @@ "jest": "jest", "test": "turbo run test --concurrency=50% --no-daemon --no-cache --force", "test:chunk": "./scripts/run-workspace-unit-tests-in-chunks.sh", - "test:integration:packages": "turbo run test:integration --concurrency=1 --no-daemon --no-cache --force --filter='./packages/*' --filter='./packages/core/*' --filter='./packages/cli/*' --filter='./packages/modules/*' --filter='./packages/modules/providers/*'", + "test:integration:packages:fast": "turbo run test:integration --concurrency=2 --no-daemon --no-cache --force --filter='./packages/medusa' --filter='./packages/modules/*' --filter='./packages/modules/providers/*' --filter='!./packages/modules/{workflow-engine-redis,index,product,order,cart}'", + "test:integration:packages:slow": "turbo run test:integration --concurrency=2 --no-daemon --no-cache --force --filter='./packages/modules/{workflow-engine-redis,index,product,order,cart}'", "test:integration:api": "turbo run test:integration:chunk --concurrency=50% --no-daemon --no-cache --force --filter=integration-tests-api", "test:integration:http": "turbo run test:integration:chunk --concurrency=50% --no-daemon --no-cache --force --filter=integration-tests-http", "test:integration:modules": "turbo run test:integration:chunk --concurrency=50% --no-daemon --no-cache --force --filter=integration-tests-modules", diff --git a/packages/modules/index/package.json b/packages/modules/index/package.json index 0972ff7797..b695ea4113 100644 --- a/packages/modules/index/package.json +++ b/packages/modules/index/package.json @@ -29,7 +29,7 @@ "resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json", "build": "rimraf dist && tsc --build && npm run resolve:aliases", "test": "jest --passWithNoTests ./src", - "test:integration": "jest --runInBand --forceExit -- integration-tests/__tests__/**/*.ts", + "test:integration": "jest --forceExit --runInBand -- integration-tests/__tests__/**/*.ts", "migration:initial": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create --initial", "migration:create": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create", "migration:up": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:up", diff --git a/packages/modules/inventory/package.json b/packages/modules/inventory/package.json index cecfc922e9..a92414ffad 100644 --- a/packages/modules/inventory/package.json +++ b/packages/modules/inventory/package.json @@ -49,7 +49,7 @@ "resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json", "build": "rimraf dist && tsc --build && npm run resolve:aliases", "test": "jest --runInBand --bail --forceExit -- src/**/__tests__/**/*.ts", - "test:integration": "jest --runInBand --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", + "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", "migration:initial": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create --initial -n InitialSetupMigration", "migration:create": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create", "migration:up": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:up", diff --git a/packages/modules/locking/package.json b/packages/modules/locking/package.json index 4cfe87ae63..51ae7e27e8 100644 --- a/packages/modules/locking/package.json +++ b/packages/modules/locking/package.json @@ -25,7 +25,7 @@ "resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json", "build": "rimraf dist && tsc --build && npm run resolve:aliases", "test": "jest --passWithNoTests --runInBand --bail --forceExit -- src/", - "test:integration": "jest --runInBand --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", + "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", "migration:initial": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create --initial -n InitialSetupMigration", "migration:create": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create", "migration:up": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:up", diff --git a/packages/modules/order/package.json b/packages/modules/order/package.json index ea90aa4a8c..b38a2f7ce8 100644 --- a/packages/modules/order/package.json +++ b/packages/modules/order/package.json @@ -29,7 +29,7 @@ "resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json", "build": "rimraf dist && tsc --build && npm run resolve:aliases", "test": "jest --runInBand --bail --forceExit -- src/**/__tests__/**/*.ts", - "test:integration": "jest --forceExit", + "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", "migration:initial": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create --initial", "migration:create": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create", "migration:up": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:up", diff --git a/packages/modules/product/package.json b/packages/modules/product/package.json index e825b20d05..c2c76ec808 100644 --- a/packages/modules/product/package.json +++ b/packages/modules/product/package.json @@ -29,7 +29,7 @@ "resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json", "build": "rimraf dist && tsc --build && npm run resolve:aliases", "test": "jest --runInBand --bail --forceExit -- src/**/__tests__/**/*.ts", - "test:integration": "jest --runInBand --bail --forceExit -- integration-tests/__tests__/**/*.ts", + "test:integration": "jest --bail --forceExit -- integration-tests/__tests__/**/*.ts", "migration:initial": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create --initial", "migration:create": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create", "migration:up": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:up", diff --git a/packages/modules/providers/locking-postgres/package.json b/packages/modules/providers/locking-postgres/package.json index 4958b61f50..00ae088521 100644 --- a/packages/modules/providers/locking-postgres/package.json +++ b/packages/modules/providers/locking-postgres/package.json @@ -40,7 +40,7 @@ "resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json", "build": "rimraf dist && tsc --build && npm run resolve:aliases", "test": "jest --passWithNoTests src", - "test:integration": "jest --runInBand --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", + "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", "migration:initial": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create --initial -n InitialSetupMigration", "migration:create": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create", "migration:up": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:up", diff --git a/packages/modules/providers/locking-redis/package.json b/packages/modules/providers/locking-redis/package.json index 028bf0d708..bcdfd9a453 100644 --- a/packages/modules/providers/locking-redis/package.json +++ b/packages/modules/providers/locking-redis/package.json @@ -39,7 +39,7 @@ "resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json", "build": "rimraf dist && tsc --build && npm run resolve:aliases", "test": "jest --passWithNoTests src", - "test:integration": "jest --runInBand --forceExit -- integration-tests/**/__tests__/**/*.spec.ts" + "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.spec.ts" }, "keywords": [ "medusa-providers", diff --git a/packages/modules/stock-location/package.json b/packages/modules/stock-location/package.json index 0a6e181ded..40551b9177 100644 --- a/packages/modules/stock-location/package.json +++ b/packages/modules/stock-location/package.json @@ -49,7 +49,7 @@ "resolve:aliases": "tsc --showConfig -p tsconfig.json > tsconfig.resolved.json && tsc-alias -p tsconfig.resolved.json && rimraf tsconfig.resolved.json", "build": "rimraf dist && tsc --build && npm run resolve:aliases", "test": "jest --runInBand --bail --forceExit -- src/**/__tests__/**/*.ts", - "test:integration": "jest --runInBand --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", + "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.spec.ts", "migration:initial": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create --initial -n InitialSetupMigration", "migration:create": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:create", "migration:up": " MIKRO_ORM_CLI_CONFIG=./mikro-orm.config.dev.ts medusa-mikro-orm migration:up", diff --git a/scripts/run-workspace-unit-tests-in-chunks.sh b/scripts/run-workspace-unit-tests-in-chunks.sh index a24d5ab063..d5e0468232 100755 --- a/scripts/run-workspace-unit-tests-in-chunks.sh +++ b/scripts/run-workspace-unit-tests-in-chunks.sh @@ -21,6 +21,6 @@ for workspace in $(echo "$workspaces" | jq -r '.[]'); do filters+=" --filter=${workspace}" done -command="yarn run test $filters" +command="yarn run test $filters $@" # Run the test in the selected chunk eval "$command" diff --git a/turbo.json b/turbo.json index 2a6bccb5d0..f63c2745a5 100644 --- a/turbo.json +++ b/turbo.json @@ -6,15 +6,12 @@ "outputs": ["!node_modules/**", "!src/**", "*/**"] }, "test": { - "dependsOn": ["build"], "outputs": [] }, "test:integration": { - "dependsOn": ["build"], "outputs": [] }, "test:integration:chunk": { - "dependsOn": ["build"], "outputs": [] } },