From c2732e2b97a602ddc0efc0b62acc53642df433da Mon Sep 17 00:00:00 2001 From: Alexandre BODIN Date: Thu, 23 Mar 2023 15:17:01 +0100 Subject: [PATCH] Nx config improvements (#16187) --- .github/workflows/tests.yml | 2 ++ .nxignore | 1 + nx.json | 30 ++++++++++++++--------- packages/core/data-transfer/.eslintignore | 2 +- packages/core/data-transfer/.gitignore | 2 +- packages/core/data-transfer/package.json | 12 ++++----- packages/core/data-transfer/tsconfig.json | 2 +- packages/utils/logger/.eslintignore | 2 +- packages/utils/logger/.gitignore | 2 +- packages/utils/logger/package.json | 8 +++--- packages/utils/logger/project.json | 7 ------ packages/utils/logger/tsconfig.json | 2 +- 12 files changed, 37 insertions(+), 35 deletions(-) create mode 100644 .nxignore delete mode 100644 packages/utils/logger/project.json diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5c47c8e5be0..cc3b117716a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,6 +37,8 @@ jobs: key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }} - uses: nrwl/nx-set-shas@v3 - run: yarn install --frozen-lockfile + - name: Run build:ts + run: yarn nx run-many --target=build:ts --nx-ignore-cycles - name: Run lint run: yarn nx affected --target=lint --parallel --nx-ignore-cycles diff --git a/.nxignore b/.nxignore new file mode 100644 index 00000000000..0f0096f154b --- /dev/null +++ b/.nxignore @@ -0,0 +1 @@ +examples/** diff --git a/nx.json b/nx.json index 75e41e855a5..9e217a281e9 100644 --- a/nx.json +++ b/nx.json @@ -5,35 +5,41 @@ "default", "!{projectRoot}/**/*.test.ts", "!{projectRoot}/**/*.test.js", - "!{projectRoot}/**/*.md" + "!{projectRoot}/**/*.test.api.js", + "!{projectRoot}/**/__mocks__/**", + "!{projectRoot}/**/__tests__/**", + "!{projectRoot}/**/*.md", + "!{projectRoot}/jest.config.js", + "!{projectRoot}/jest.config.front.js", + "!{projectRoot}/tsconfig.eslint.json", + "!{projectRoot}/.eslintignore", + "!{projectRoot}/.eslintrc.js" ] }, + "cli": { + "packageManager": "yarn" + }, "targetDefaults": { "build": { "inputs": ["production", "^production"], - "dependsOn": ["^build"], - "outputs": ["{projectRoot}/lib", "{projectRoot}/build", "{projectRoot}/dist"] + "dependsOn": ["^build"] }, "build:ts": { "inputs": ["production", "^production", "{workspaceRoot}/packages/utils/tsconfig/**/*"], - "dependsOn": ["^build:ts"], - "outputs": ["{projectRoot}/lib", "{projectRoot}/build", "{projectRoot}/dist"] + "dependsOn": ["^build:ts"] }, "test:unit": { - "inputs": ["default", "{projectRoot}/jest.config.js", "{workspaceRoot}/jest-preset.unit.js"], + "inputs": ["default", "{workspaceRoot}/jest-preset.unit.js"], "dependsOn": ["build:ts"] }, "test:front": { - "inputs": [ - "default", - "{projectRoot}/jest.config.front.js", - "{workspaceRoot}/jest-preset.front.js" - ], + "inputs": ["default", "{workspaceRoot}/jest-preset.front.js"], "dependsOn": ["^build"] }, "lint": { "inputs": [ - "default", + "{projectRoot}/**/*.js", + "{projectRoot}/**/*.ts", "{projectRoot}/.eslintrc.js", "{projectRoot}/.eslintignore", "{projectRoot}/tsconfig.eslint.json", diff --git a/packages/core/data-transfer/.eslintignore b/packages/core/data-transfer/.eslintignore index e90fc6a9fa1..f845d965113 100644 --- a/packages/core/data-transfer/.eslintignore +++ b/packages/core/data-transfer/.eslintignore @@ -1,5 +1,5 @@ node_modules/ -lib/ +dist/ .eslintrc.js jest.config.js coverage/ diff --git a/packages/core/data-transfer/.gitignore b/packages/core/data-transfer/.gitignore index c3af857904e..849ddff3b7e 100644 --- a/packages/core/data-transfer/.gitignore +++ b/packages/core/data-transfer/.gitignore @@ -1 +1 @@ -lib/ +dist/ diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json index d35e11bdeb1..e12316b285b 100644 --- a/packages/core/data-transfer/package.json +++ b/packages/core/data-transfer/package.json @@ -24,21 +24,21 @@ "url": "https://strapi.io" } ], - "main": "./lib/index.js", - "types": "./lib/index.d.ts", + "main": "./dist/index.js", + "types": "./dist/index.d.ts", "scripts": { "build": "tsc", "build:ts": "tsc", - "clean": "rimraf ./lib", + "clean": "rimraf ./dist", "prepublishOnly": "yarn clean && yarn build", "test:unit": "jest", "test:unit:watch": "jest --watch", "watch": "tsc -w --preserveWatchOutput", "lint": "eslint ." }, - "directories": { - "lib": "./lib" - }, + "files": [ + "./dist" + ], "dependencies": { "@strapi/logger": "4.8.2", "@strapi/strapi": "4.8.2", diff --git a/packages/core/data-transfer/tsconfig.json b/packages/core/data-transfer/tsconfig.json index a959c63a2e9..13927798370 100644 --- a/packages/core/data-transfer/tsconfig.json +++ b/packages/core/data-transfer/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "tsconfig/base.json", "compilerOptions": { - "outDir": "lib" + "outDir": "dist" }, "include": ["types", "src"], "exclude": ["node_modules", "**/__tests__/**"] diff --git a/packages/utils/logger/.eslintignore b/packages/utils/logger/.eslintignore index a984a3fbb31..0ea0ae631d9 100644 --- a/packages/utils/logger/.eslintignore +++ b/packages/utils/logger/.eslintignore @@ -1,3 +1,3 @@ node_modules/ -lib/ +dist/ .eslintrc.js diff --git a/packages/utils/logger/.gitignore b/packages/utils/logger/.gitignore index 5fbd39843e6..9585e32ced9 100755 --- a/packages/utils/logger/.gitignore +++ b/packages/utils/logger/.gitignore @@ -95,5 +95,5 @@ package-lock.json testApp coverage -lib/ +dist/ docs/ diff --git a/packages/utils/logger/package.json b/packages/utils/logger/package.json index 8448a350632..7e80e2b5414 100644 --- a/packages/utils/logger/package.json +++ b/packages/utils/logger/package.json @@ -23,16 +23,16 @@ "url": "https://strapi.io" } ], - "main": "./lib/index.js", - "types": "./lib/index.ts", + "main": "./dist/index.js", + "types": "./dist/index.ts", "files": [ - "./lib" + "./dist" ], "scripts": { "build": "tsc", "build:ts": "tsc", "watch": "tsc -w --preserveWatchOutput", - "clean": "rimraf ./lib", + "clean": "rimraf ./dist", "prepublishOnly": "yarn clean && yarn build", "lint": "eslint ." }, diff --git a/packages/utils/logger/project.json b/packages/utils/logger/project.json deleted file mode 100644 index 56183355d25..00000000000 --- a/packages/utils/logger/project.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "@strapi/logger", - "namedInputs": { - "default": ["{projectRoot}/src/**/*.ts", "{projectRoot}/tsconfig.json"], - "production": ["default"] - } -} diff --git a/packages/utils/logger/tsconfig.json b/packages/utils/logger/tsconfig.json index 9b47ddc39c6..f6e9b92e7e6 100644 --- a/packages/utils/logger/tsconfig.json +++ b/packages/utils/logger/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "tsconfig/base.json", "compilerOptions": { - "outDir": "lib" + "outDir": "dist" }, "include": ["src"], "exclude": ["node_modules", "**/__tests__/**"]