diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index d15599180..9ac11636d 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -63,6 +63,11 @@ jobs: - name: Test run: pnpm test:ci + - name: Test projects + run: pnpm -r test:ci + env: + NODE_OPTIONS: --experimental-vm-modules + - name: Lint run: pnpm lint @@ -74,41 +79,6 @@ jobs: name: Dry-run site packaging run: pnpm skuba node scripts/package.ts - package: - name: Lint - runs-on: ubuntu-latest - timeout-minutes: 20 - strategy: - matrix: - template: - - eslint-config-skuba - - skuba-dive - steps: - - name: Check out repo - uses: actions/checkout@v4 - - - name: Set up Node.js - uses: actions/setup-node@v4 - with: - node-version: 20.x - - - name: Set up pnpm - run: corepack enable pnpm - - - name: Install dependencies - run: pnpm install --frozen-lockfile - - - name: Setup Skuba - run: pnpm build - - - if: github.head_ref != 'changeset-release/main' && github.ref_name != 'changeset-release/main' - name: Lint package - run: pnpm --filter ${{ matrix.template }} lint - - - if: github.head_ref != 'changeset-release/main' && github.ref_name != 'changeset-release/main' - name: Test package - run: pnpm --filter ${{ matrix.template }} test - template: name: Integrate runs-on: ubuntu-latest diff --git a/package.json b/package.json index 7d3f1a2e5..9f196b44d 100644 --- a/package.json +++ b/package.json @@ -31,15 +31,21 @@ "build": "scripts/build.sh", "changeset": "changeset", "deploy": "scripts/deploy.sh", - "format": "pnpm --silent skuba format", - "lint": "pnpm --silent skuba lint && pnpm --silent lint:md", + "format": "pnpm /^format:/", + "format:projects": "pnpm -r format", + "format:skuba": "pnpm --silent skuba format", + "lint": "pnpm /^lint:/", "lint:md": "remark --frail --quiet .", + "lint:projects": "pnpm -r lint", + "lint:skuba": "pnpm --silent skuba lint", "release": "pnpm --silent build && changeset publish", "skuba": "pnpm --silent build && pnpm --silent skuba:exec", "skuba:exec": "node --experimental-vm-modules lib/skuba", "stage": "changeset version && node ./.changeset/inject.js && pnpm format", "test": "pnpm --silent skuba test --selectProjects unit --", "test:ci": "pnpm --silent skuba test --runInBand", + "test:ci:projects": "pnpm -r test:ci", + "test:projects": "pnpm -r test", "test:int": "pnpm --silent skuba test --selectProjects integration --runInBand", "test:template": "scripts/test-template.sh", "test:watch": "pnpm --silent skuba test --runInBand --watch" diff --git a/packages/eslint-config-skuba/.npmrc b/packages/eslint-config-skuba/.npmrc new file mode 100644 index 000000000..8db8c5a6c --- /dev/null +++ b/packages/eslint-config-skuba/.npmrc @@ -0,0 +1,8 @@ +# managed by skuba +public-hoist-pattern[]="@types*" +public-hoist-pattern[]="*eslint*" +public-hoist-pattern[]="*prettier*" +public-hoist-pattern[]="esbuild" +public-hoist-pattern[]="jest" +public-hoist-pattern[]="tsconfig-seek" +# end managed by skuba diff --git a/packages/skuba-dive/.npmrc b/packages/skuba-dive/.npmrc new file mode 100644 index 000000000..8db8c5a6c --- /dev/null +++ b/packages/skuba-dive/.npmrc @@ -0,0 +1,8 @@ +# managed by skuba +public-hoist-pattern[]="@types*" +public-hoist-pattern[]="*eslint*" +public-hoist-pattern[]="*prettier*" +public-hoist-pattern[]="esbuild" +public-hoist-pattern[]="jest" +public-hoist-pattern[]="tsconfig-seek" +# end managed by skuba diff --git a/src/cli/__snapshots__/format.int.test.ts.snap b/src/cli/__snapshots__/format.int.test.ts.snap index 2354b913b..ebc127f68 100644 --- a/src/cli/__snapshots__/format.int.test.ts.snap +++ b/src/cli/__snapshots__/format.int.test.ts.snap @@ -205,6 +205,7 @@ Refreshed .eslintignore. refresh-config-files Refreshed .gitignore. refresh-config-files Refreshed .prettierignore. refresh-config-files Refreshed .npmrc. refresh-config-files +Refreshed .dockerignore. refresh-config-files Processed skuba lints in s. ESLint