miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(misc): properly add extra dependencies to packages (#19334)

Browse Source
This commit is contained in:
Jason Jean 2023-09-26 00:09:29 -04:00 committed by GitHub
parent c2297297c1
commit 5cc87bfdc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 107 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/angular/project.json
View File

@ -63,13 +63,13 @@
"outputs": ["{workspaceRoot}/build/packages/angular"],
"dependsOn": ["build-ng", "build-base", "^build"],
"options": {
"commands": [
"node ./scripts/copy-readme.js angular",
"node ./scripts/add-dependency-to-build.js angular @nrwl/angular"
],
"command": "node ./scripts/copy-readme.js angular",
"parallel": false
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js angular @nrwl/angular"
},
"lint": {}
},
"implicitDependencies": []

8
packages/cypress/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/cypress"],
"options": {
"commands": [
"node ./scripts/copy-readme.js cypress",
"node ./scripts/add-dependency-to-build.js cypress @nrwl/cypress"
]
"command": "node ./scripts/copy-readme.js cypress"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js cypress @nrwl/cypress"
},
"lint": {}
}
}

8
packages/detox/project.json
View File

@ -48,11 +48,11 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/detox"],
"options": {
"commands": [
"node ./scripts/copy-readme.js detox",
"node ./scripts/add-dependency-to-build.js detox @nrwl/detox"
]
"command": "node ./scripts/copy-readme.js detox"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js detox @nrwl/detox"
}
}
}

8
packages/devkit/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/devkit"],
"options": {
"commands": [
"node ./scripts/copy-readme.js devkit",
"node ./scripts/add-dependency-to-build.js devkit @nrwl/devkit"
]
"command": "node ./scripts/copy-readme.js devkit"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js devkit @nrwl/devkit"
},
"lint": {}
}
}

3
packages/esbuild/project.json
View File

@ -54,6 +54,9 @@
]
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js esbuild @nrwl/esbuild"
},
"lint": {}
}
}

8
packages/eslint-plugin/project.json
View File

@ -49,12 +49,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/eslint-plugin"],
"options": {
"commands": [
"node ./scripts/copy-readme.js eslint-plugin",
"node ./scripts/add-dependency-to-build.js eslint-plugin @nrwl/eslint-plugin-nx"
]
"command": "node ./scripts/copy-readme.js eslint-plugin"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js eslint-plugin @nrwl/eslint-plugin-nx"
},
"lint": {}
}
}

8
packages/expo/project.json
View File

@ -50,11 +50,11 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/expo"],
"options": {
"commands": [
"node ./scripts/copy-readme.js expo",
"node ./scripts/add-dependency-to-build.js expo @nrwl/expo"
]
"command": "node ./scripts/copy-readme.js expo"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js expo @nrwl/expo"
}
},
"tags": []

8
packages/express/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/express"],
"options": {
"commands": [
"node ./scripts/copy-readme.js express",
"node ./scripts/add-dependency-to-build.js express @nrwl/express"
]
"command": "node ./scripts/copy-readme.js express"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js express @nrwl/express"
},
"lint": {}
},
"implicitDependencies": ["node"]

8
packages/jest/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/jest"],
"options": {
"commands": [
"node ./scripts/copy-readme.js jest",
"node ./scripts/add-dependency-to-build.js jest @nrwl/jest"
]
"command": "node ./scripts/copy-readme.js jest"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js jest @nrwl/jest"
},
"lint": {}
}
}

8
packages/js/project.json
View File

@ -50,11 +50,11 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/js"],
"options": {
"commands": [
"node ./scripts/copy-readme.js js",
"node ./scripts/add-dependency-to-build.js js @nrwl/js"
]
"command": "node ./scripts/copy-readme.js js"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js js @nrwl/js"
}
},
"tags": []

8
packages/linter/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/linter"],
"options": {
"commands": [
"node ./scripts/copy-readme.js linter",
"node ./scripts/add-dependency-to-build.js linter @nrwl/linter"
]
"command": "node ./scripts/copy-readme.js linter"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js linter @nrwl/linter"
},
"lint": {}
},
"implicitDependencies": ["eslint-plugin"]

8
packages/nest/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/nest"],
"options": {
"commands": [
"node ./scripts/copy-readme.js nest",
"node ./scripts/add-dependency-to-build.js nest @nrwl/nest"
]
"command": "node ./scripts/copy-readme.js nest"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js nest @nrwl/nest"
},
"lint": {}
},
"implicitDependencies": ["node", "linter"]

8
packages/next/project.json
View File

@ -53,12 +53,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/next"],
"options": {
"commands": [
"node ./scripts/copy-readme.js next",
"node ./scripts/add-dependency-to-build.js next @nrwl/next"
]
"command": "node ./scripts/copy-readme.js next"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js next @nrwl/next"
},
"lint": {}
}
}

8
packages/node/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/node"],
"options": {
"commands": [
"node ./scripts/copy-readme.js node",
"node ./scripts/add-dependency-to-build.js node @nrwl/node"
]
"command": "node ./scripts/copy-readme.js node"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js node @nrwl/node"
},
"lint": {}
}
}

6
packages/nx/project.json
View File

@ -95,14 +95,14 @@
},
{
"command": "node ./scripts/copy-readme.js nx"
},
{
"command": "node ./scripts/add-dependency-to-build.js nx @nrwl/tao"
}
],
"parallel": false
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js nx @nrwl/tao"
},
"lint": {},
"test": {},
"test-native": {}

8
packages/plugin/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/plugin"],
"options": {
"commands": [
"node ./scripts/copy-readme.js plugin",
"node ./scripts/add-dependency-to-build.js plugin @nrwl/nx-plugin"
]
"command": "node ./scripts/copy-readme.js plugin"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js plugin @nrwl/nx-plugin"
},
"lint": {}
}
}

8
packages/react-native/project.json
View File

@ -44,11 +44,11 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/react-native"],
"options": {
"commands": [
"node ./scripts/copy-readme.js react-native",
"node ./scripts/add-dependency-to-build.js react-native @nrwl/react-native"
]
"command": "node ./scripts/copy-readme.js react-native"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js react-native @nrwl/react-native"
}
}
}

8
packages/react/project.json
View File

@ -58,12 +58,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/react"],
"options": {
"commands": [
"node ./scripts/copy-readme.js react",
"node ./scripts/add-dependency-to-build.js react @nrwl/react"
]
"command": "node ./scripts/copy-readme.js react"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js react @nrwl/react"
},
"lint": {}
}
}

8
packages/rollup/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/rollup"],
"options": {
"commands": [
"node ./scripts/copy-readme.js rollup",
"node ./scripts/add-dependency-to-build.js rollup @nrwl/rollup"
]
"command": "node ./scripts/copy-readme.js rollup"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js rollup @nrwl/rollup"
},
"lint": {}
}
}

8
packages/storybook/project.json
View File

@ -58,12 +58,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/storybook"],
"options": {
"commands": [
"node ./scripts/copy-readme.js storybook",
"node ./scripts/add-dependency-to-build.js storybook @nrwl/storybook"
]
"command": "node ./scripts/copy-readme.js storybook"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js storybook @nrwl/storybook"
},
"lint": {}
}
}

8
packages/vite/project.json
View File

@ -59,12 +59,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/vite"],
"options": {
"commands": [
"node ./scripts/copy-readme.js vite",
"node ./scripts/add-dependency-to-build.js vite @nrwl/vite"
]
"command": "node ./scripts/copy-readme.js vite"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js vite @nrwl/vite"
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {

8
packages/web/project.json
View File

@ -53,12 +53,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/web"],
"options": {
"commands": [
"node ./scripts/copy-readme.js web",
"node ./scripts/add-dependency-to-build.js web @nrwl/web"
]
"command": "node ./scripts/copy-readme.js web"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js web @nrwl/web"
},
"lint": {}
}
}

8
packages/webpack/project.json
View File

@ -48,12 +48,12 @@
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/webpack"],
"options": {
"commands": [
"node ./scripts/copy-readme.js webpack",
"node ./scripts/add-dependency-to-build.js webpack @nrwl/webpack"
]
"command": "node ./scripts/copy-readme.js webpack"
}
},
"add-extra-dependencies": {
"command": "node ./scripts/add-dependency-to-build.js webpack @nrwl/webpack"
},
"lint": {}
}
}

12
packages/workspace/project.json
View File

@ -75,16 +75,14 @@
}
},
"build": {
"executor": "nx:run-commands",
"outputs": ["{workspaceRoot}/build/packages/workspace"],
"options": {
"commands": [
{
"command": "node ./scripts/copy-readme.js workspace"
},
{
"command": "node ./scripts/add-dependency-to-build.js workspace nx"
},
"add-extra-dependencies": {
"executor": "nx:run-commands",
"options": {
"commands": [
"node ./scripts/add-dependency-to-build.js workspace nx",
"node ./scripts/add-dependency-to-build.js workspace @nrwl/workspace"
],
"parallel": false

3
scripts/add-dependency-to-build.js
View File

@ -5,6 +5,7 @@ const [package, dependency] = process.argv.slice(2);
const pkgPath = join(__dirname, '../build/packages', package, 'package.json');
const packageJson = readJsonSync(pkgPath);
packageJson.dependencies[dependency] = '*';
const version = packageJson.version;
packageJson.dependencies[dependency] = version;
writeJsonSync(pkgPath, packageJson, { spaces: 2 });

10
scripts/nx-release.ts
View File

@ -79,6 +79,11 @@ const LARGE_BUFFER = 1024 * 1000000;
runNxReleaseVersion();
execSync(`pnpm nx run-many -t add-extra-dependencies --parallel 8`, {
stdio: isVerboseLogging ? [0, 1, 2] : 'ignore',
maxBuffer: LARGE_BUFFER,
});
let changelogCommand = `pnpm nx release changelog ${options.version} --tagVersionPrefix="" --interactive`;
if (options.from) {
changelogCommand += ` --from ${options.from}`;
@ -103,6 +108,11 @@ const LARGE_BUFFER = 1024 * 1000000;
runNxReleaseVersion();
execSync(`pnpm nx run-many -t add-extra-dependencies --parallel 8`, {
stdio: isVerboseLogging ? [0, 1, 2] : 'ignore',
maxBuffer: LARGE_BUFFER,
});
if (options.dryRun) {
console.warn('Not Publishing because --dryRun was passed');
} else {