From a559639e3c71282635f91ba318cb49d0fb61bc05 Mon Sep 17 00:00:00 2001 From: Fuxing Loh <4266087+fuxingloh@users.noreply.github.com> Date: Sat, 21 Oct 2023 12:32:18 +0800 Subject: [PATCH] chore(workspace): fix release workflow (#675) --- .github/workflows/release.yml | 2 +- package.json | 7 ------ packages/contented-pipeline-md/package.json | 5 ++-- packages/contented-pipeline/package.json | 3 ++- packages/contented-processor/package.json | 5 ++-- packages/contented/cli.js | 1 + packages/contented/package.json | 5 ++-- packages/jest-preset/package.json | 1 - packages/tsconfig/package.json | 1 - pnpm-lock.yaml | 28 +++++++++------------ 10 files changed, 25 insertions(+), 33 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c1b614e4..6a06997b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -43,7 +43,7 @@ jobs: - run: pnpm install --frozen-lockfile - - run: pnpm -r exec npm version ${{ needs.Version.outputs.result }} --git-tag-version=false + - run: pnpm -r exec pnpm version ${{ needs.Version.outputs.result }} --git-tag-version=false - run: pnpm build diff --git a/package.json b/package.json index 79c75b12..7410b6d6 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,6 @@ { "name": "@workspace/root", - "version": "0.0.0", "private": true, - "workspaces": [ - "./packages/*", - "./packages/contented-example/*" - ], "scripts": { "build": "turbo run build", "clean": "turbo run clean", @@ -25,8 +20,6 @@ "@types/node": "^18.18.6", "@typescript-eslint/eslint-plugin": "^6.8.0", "@typescript-eslint/parser": "^6.8.0", - "@workspace/jest-preset": "workspace:*", - "@workspace/tsconfig": "workspace:*", "esbuild": "^0.19.5", "esbuild-jest": "^0.5.0", "eslint": "^8.51.0", diff --git a/packages/contented-pipeline-md/package.json b/packages/contented-pipeline-md/package.json index a1002b19..eb2083ee 100644 --- a/packages/contented-pipeline-md/package.json +++ b/packages/contented-pipeline-md/package.json @@ -15,7 +15,7 @@ "scripts": { "build": "tsc --project tsconfig.build.json", "clean": "rm -rf dist", - "lint": "eslint src", + "lint": "eslint .", "test": "jest" }, "lint-staged": { @@ -72,6 +72,7 @@ "@types/js-yaml": "^4.0.8", "@types/lodash": "^4.14.200", "@types/mdast": "^4.0.2", - "@workspace/jest-preset": "workspace:*" + "@workspace/jest-preset": "workspace:*", + "@workspace/tsconfig": "workspace:*" } } diff --git a/packages/contented-pipeline/package.json b/packages/contented-pipeline/package.json index 2b1e23f0..3e786351 100644 --- a/packages/contented-pipeline/package.json +++ b/packages/contented-pipeline/package.json @@ -43,6 +43,7 @@ }, "devDependencies": { "@types/unist": "^2.0.9", - "@workspace/jest-preset": "workspace:*" + "@workspace/jest-preset": "workspace:*", + "@workspace/tsconfig": "workspace:*" } } diff --git a/packages/contented-processor/package.json b/packages/contented-processor/package.json index 0e874a52..b37f74a5 100644 --- a/packages/contented-processor/package.json +++ b/packages/contented-processor/package.json @@ -15,7 +15,7 @@ "scripts": { "build": "tsc --project tsconfig.build.json", "clean": "rm -rf dist", - "lint": "eslint src", + "lint": "eslint .", "test": "jest" }, "lint-staged": { @@ -48,6 +48,7 @@ "@types/babel__generator": "^7.6.6", "@types/minimatch": "^5.1.2", "@types/node": "^18.16.16", - "@workspace/jest-preset": "workspace:*" + "@workspace/jest-preset": "workspace:*", + "@workspace/tsconfig": "workspace:*" } } diff --git a/packages/contented/cli.js b/packages/contented/cli.js index a96475dc..c523e2b1 100755 --- a/packages/contented/cli.js +++ b/packages/contented/cli.js @@ -1,2 +1,3 @@ #! /usr/bin/env node +/* eslint-disable */ import './dist/cli.js'; diff --git a/packages/contented/package.json b/packages/contented/package.json index 65e4ec52..66d7662c 100644 --- a/packages/contented/package.json +++ b/packages/contented/package.json @@ -20,7 +20,7 @@ "scripts": { "build": "tsc --project tsconfig.build.json && node build-preview.js", "clean": "rm -rf dist", - "lint": "eslint src" + "lint": "eslint ." }, "lint-staged": { "*": [ @@ -47,6 +47,7 @@ "devDependencies": { "@types/debounce": "^1.2.2", "@types/ignore-walk": "^4.0.1", - "@workspace/jest-preset": "workspace:*" + "@workspace/jest-preset": "workspace:*", + "@workspace/tsconfig": "workspace:*" } } diff --git a/packages/jest-preset/package.json b/packages/jest-preset/package.json index 6be0f1c4..4944a0f7 100644 --- a/packages/jest-preset/package.json +++ b/packages/jest-preset/package.json @@ -1,5 +1,4 @@ { "name": "@workspace/jest-preset", - "version": "0.0.0", "private": true } diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json index 84d41fd3..8724b1a2 100644 --- a/packages/tsconfig/package.json +++ b/packages/tsconfig/package.json @@ -1,5 +1,4 @@ { "name": "@workspace/tsconfig", - "version": "0.0.0", "private": true } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1500c86f..68b5fc05 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,12 +20,6 @@ importers: '@typescript-eslint/parser': specifier: ^6.8.0 version: 6.8.0(eslint@8.51.0)(typescript@5.2.2) - '@workspace/jest-preset': - specifier: workspace:* - version: link:packages/jest-preset - '@workspace/tsconfig': - specifier: workspace:* - version: link:packages/tsconfig esbuild: specifier: ^0.19.5 version: 0.19.5 @@ -126,6 +120,9 @@ importers: '@workspace/jest-preset': specifier: workspace:* version: link:../jest-preset + '@workspace/tsconfig': + specifier: workspace:* + version: link:../tsconfig packages/contented-pipeline: dependencies: @@ -139,6 +136,9 @@ importers: '@workspace/jest-preset': specifier: workspace:* version: link:../jest-preset + '@workspace/tsconfig': + specifier: workspace:* + version: link:../tsconfig packages/contented-pipeline-md: dependencies: @@ -239,6 +239,9 @@ importers: '@workspace/jest-preset': specifier: workspace:* version: link:../jest-preset + '@workspace/tsconfig': + specifier: workspace:* + version: link:../tsconfig packages/contented-preview: dependencies: @@ -300,6 +303,9 @@ importers: '@workspace/jest-preset': specifier: workspace:* version: link:../jest-preset + '@workspace/tsconfig': + specifier: workspace:* + version: link:../tsconfig packages/jest-preset: {} @@ -4042,16 +4048,6 @@ packages: web-namespaces: 2.0.1 dev: false - /hast-util-has-property@2.0.1: - resolution: {integrity: sha512-X2+RwZIMTMKpXUzlotatPzWj8bspCymtXH3cfG3iQKV+wPF53Vgaqxi/eLqGck0wKq1kS9nvoB1wchbCPEL8sg==} - dev: false - - /hast-util-heading-rank@2.1.1: - resolution: {integrity: sha512-iAuRp+ESgJoRFJbSyaqsfvJDY6zzmFoEnL1gtz1+U8gKtGGj1p0CVlysuUAUjq95qlZESHINLThwJzNGmgGZxA==} - dependencies: - '@types/hast': 2.3.7 - dev: false - /hast-util-heading-rank@3.0.0: resolution: {integrity: sha512-EJKb8oMUXVHcWZTDepnr+WNbfnXKFNf9duMesmr4S8SXTJBJ9M4Yok08pu9vxdJwdlGRhVumk9mEhkEvKGifwA==} dependencies: