From fd8408ec663a55da8c96a5ec80b692bf4a499519 Mon Sep 17 00:00:00 2001 From: Gearonix Date: Sat, 19 Aug 2023 15:17:04 +0300 Subject: [PATCH] fix(ci): fixed storybook build --- .github/workflows/master.yml | 20 ++----------------- libs/client-shared/vite.config.ts | 2 +- package.json | 9 ++++----- .../ts-morph/remove-all-console-logs.ts | 2 +- yarn.lock | 12 ----------- 5 files changed, 8 insertions(+), 37 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 9e6d6b59..0c29e62e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -50,24 +50,8 @@ jobs: - name: Building storybook run: yarn dlx nx run ui:storybook:build - name: Pushing to build-storybook branch - - uses: JamesIves/github-pages-deploy-action@v4 + uses: JamesIves/github-pages-deploy-action@v4 with: folder: dist/storybook/ui branch: storybook-build - testing: - name: Testing project - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - # Node.js and yarn setup - - name: Installing Node.js 19.x - uses: actions/setup-node@v3 - with: - node-version: 19.x - # Installing deps - - name: Installing dependencies - run: yarn install - # Main rules - - name: Testing storybook - run: yarn dlx nx run ui:storybook:test - + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/libs/client-shared/vite.config.ts b/libs/client-shared/vite.config.ts index fecbdbd3..434a5cee 100644 --- a/libs/client-shared/vite.config.ts +++ b/libs/client-shared/vite.config.ts @@ -11,7 +11,7 @@ export default defineConfig({ plugins: [ dts({ entryRoot: 'src', - tsConfigFilePath: path.join(__dirname, 'tsconfig.consts.json'), + tsConfigFilePath: path.join(__dirname, 'tsconfig.lib.json'), skipDiagnostics: true }), react(), diff --git a/package.json b/package.json index 1e178b75..80273fb8 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,10 @@ } }, "scripts": { - "serve": "nx run-many -t=serve -p client server --parallel", - "build": "nx run-many -t=build -p client server --parallel", - "lint": "nx run-many --targets=lint --all", - "test": "nx run-many --targets=test --all", + "serve": "nx run-many -t=serve -p client server --parallel=2", + "build": "nx run-many -t=build -p client server --parallel=2", + "lint": "nx run-many --targets=lint --all --parallel=8", + "test": "nx run-many --targets=test --all --parallel=8", "dep-graph": "nx dep-graph", "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('You must use Yarn to install, not NPM')\"", "prepare": "husky install", @@ -160,7 +160,6 @@ "ts-jest": "^29.1.0", "ts-morph": "^19.0.0", "ts-node": "10.9.1", - "tsconfig-paths-webpack-plugin": "^4.1.0", "typescript": "~5.1.3", "vite": "^4.3.9", "vite-plugin-dts": "~2.3.0", diff --git a/tools/scripts/ts-morph/remove-all-console-logs.ts b/tools/scripts/ts-morph/remove-all-console-logs.ts index 9b30f82a..de8e4510 100644 --- a/tools/scripts/ts-morph/remove-all-console-logs.ts +++ b/tools/scripts/ts-morph/remove-all-console-logs.ts @@ -8,7 +8,7 @@ const project = new Project({ }) const files = project.addSourceFilesFromTsConfig( - '../../libs/editor/tsconfig.consts.json' + '../../libs/editor/tsconfig.lib.json' ) console.log(`Success. Number of files: ${files.length}`) diff --git a/yarn.lock b/yarn.lock index b1013a93..12f7cf5f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2288,7 +2288,6 @@ __metadata: ts-jest: ^29.1.0 ts-morph: ^19.0.0 ts-node: 10.9.1 - tsconfig-paths-webpack-plugin: ^4.1.0 tslib: ^2.6.0 typescript: ~5.1.3 uuid: ^9.0.0 @@ -26205,17 +26204,6 @@ __metadata: languageName: node linkType: hard -"tsconfig-paths-webpack-plugin@npm:^4.1.0": - version: 4.1.0 - resolution: "tsconfig-paths-webpack-plugin@npm:4.1.0" - dependencies: - chalk: ^4.1.0 - enhanced-resolve: ^5.7.0 - tsconfig-paths: ^4.1.2 - checksum: f6e9a8a407e1a405b0f2531184296d9f033cb4fe5837282b757ab4a2f4cd82a3117e62c4b86d56c7d47749c7f1345aa438ec6417dbf64a0ec74a292fe9eae44d - languageName: node - linkType: hard - "tsconfig-paths@npm:^3.14.1": version: 3.14.2 resolution: "tsconfig-paths@npm:3.14.2"