Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nrwl/nx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 15.4.6
Choose a base ref
...
head repository: nrwl/nx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 15.4.8
Choose a head ref
  • 10 commits
  • 36 files changed
  • 8 contributors

Commits on Jan 12, 2023

  1. Copy the full SHA
    a5766a8 View commit details
  2. 1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    8518f69 View commit details
  3. 1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    b197679 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    6485ecd View commit details
  5. 1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    f98071a View commit details
  6. 1
    Copy the full SHA
    d98d246 View commit details
  7. 1
    Copy the full SHA
    0e5531e View commit details
  8. Copy the full SHA
    7405f97 View commit details
  9. chore(misc): publish 15.4.7

    Jason committed Jan 12, 2023
    Copy the full SHA
    ba3fd62 View commit details
  10. Copy the full SHA
    fa75276 View commit details
Showing with 95 additions and 73 deletions.
  1. +1 −1 .circleci/config.yml
  2. +0 −6 docs/generated/cli/exec.md
  3. +2 −2 docs/generated/packages/next/executors/server.json
  4. +2 −2 docs/generated/packages/nx-plugin/executors/e2e.json
  5. +0 −5 docs/generated/packages/nx-plugin/generators/e2e-project.json
  6. +0 −6 docs/generated/packages/nx/documents/exec.md
  7. +2 −2 docs/generated/packages/react/generators/library.json
  8. +1 −1 lerna.json
  9. +2 −2 package.json
  10. +1 −1 packages/cra-to-nx/package.json
  11. +1 −1 packages/create-nx-plugin/package.json
  12. +10 −1 packages/cypress/src/executors/cypress/cypress.impl.ts
  13. +1 −1 packages/esbuild/package.json
  14. +1 −1 packages/expo/package.json
  15. +1 −1 packages/js/package.json
  16. +2 −5 packages/js/src/utils/inline.ts
  17. +1 −1 packages/next/package.json
  18. +2 −2 packages/next/src/executors/server/schema.json
  19. +1 −1 packages/nx-plugin/package.json
  20. +2 −2 packages/nx-plugin/src/executors/e2e/schema.json
  21. +0 −5 packages/nx-plugin/src/generators/e2e-project/schema.json
  22. +1 −1 packages/nx/package.json
  23. +1 −1 packages/nx/src/command-line/nx-commands.ts
  24. +14 −4 packages/nx/src/tasks-runner/forked-process-task-runner.ts
  25. +1 −1 packages/react-native/package.json
  26. +2 −2 packages/react/src/generators/library/schema.json
  27. +1 −1 packages/rollup/package.json
  28. +3 −3 packages/storybook/migrations.json
  29. +13 −2 packages/storybook/src/executors/storybook/storybook.impl.ts
  30. 0 ...c/migrations/{update-15-5-0 → update-15-4-6}/__snapshots__/refactor-executor-options.spec.ts.snap
  31. 0 packages/storybook/src/migrations/{update-15-5-0 → update-15-4-6}/refactor-executor-options.spec.ts
  32. 0 packages/storybook/src/migrations/{update-15-5-0 → update-15-4-6}/refactor-executor-options.ts
  33. 0 packages/storybook/src/migrations/{update-15-5-0 → update-15-4-6}/test-configs/various-projects.json
  34. +1 −1 packages/webpack/package.json
  35. +1 −1 packages/workspace/package.json
  36. +24 −7 yarn.lock
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -185,7 +185,7 @@ jobs:
npx nx-cloud record -- nx format:check --base=$NX_BASE --head=$NX_HEAD &
pids+=($!)
npx nx run-many -t check-imports check-commit check-lock-files root-lint depcheck documentation --parallel=3 --no-dte &
npx nx run-many -t check-imports check-commit check-lock-files root-lint depcheck documentation --parallel=1 --no-dte &
pids+=($!)
yarn nx affected -t test lint --base=$NX_BASE --head=$NX_HEAD --parallel=1 &
6 changes: 0 additions & 6 deletions docs/generated/cli/exec.md
Original file line number Diff line number Diff line change
@@ -79,12 +79,6 @@ Default: `false`

Rerun the tasks even when the results are available in the cache

### targets

Type: `string`

Tasks to run for affected projects

### verbose

Type: `boolean`
4 changes: 2 additions & 2 deletions docs/generated/packages/next/executors/server.json
Original file line number Diff line number Diff line change
@@ -39,8 +39,8 @@
},
"customServerPath": {
"type": "string",
"description": "Use a custom server script. (Use `customServerTarget` instead)",
"x-deprecated": true
"description": "Use a custom server script.",
"x-deprecated": "Use `customServerTarget` instead."
},
"hostname": {
"type": "string",
4 changes: 2 additions & 2 deletions docs/generated/packages/nx-plugin/executors/e2e.json
Original file line number Diff line number Diff line change
@@ -60,12 +60,12 @@
"tsConfig": {
"description": "The name of the Typescript configuration file. Set the tsconfig option in the jest config file. ",
"type": "string",
"x-deprecated": true
"x-deprecated": "Use the ts-jest configuration options in the jest config file instead."
},
"setupFile": {
"description": "The name of a setup file used by Jest. (use Jest config file https://jestjs.io/docs/en/configuration#setupfilesafterenv-array)",
"type": "string",
"x-deprecated": true
"x-deprecated": "Use the setupFilesAfterEnv option in the jest config file. https://jestjs.io/docs/en/configuration#setupfilesafterenv-array"
},
"bail": {
"alias": "b",
5 changes: 0 additions & 5 deletions docs/generated/packages/nx-plugin/generators/e2e-project.json
Original file line number Diff line number Diff line change
@@ -26,11 +26,6 @@
"description": "the output path of the plugin after it builds."
},
"jestConfig": { "type": "string", "description": "Jest config file." },
"tsSpecConfig": {
"type": "string",
"description": "Spec `tsconfig` file.",
"x-deprecated": true
},
"standaloneConfig": {
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
"type": "boolean"
6 changes: 0 additions & 6 deletions docs/generated/packages/nx/documents/exec.md
Original file line number Diff line number Diff line change
@@ -79,12 +79,6 @@ Default: `false`

Rerun the tasks even when the results are available in the cache

### targets

Type: `string`

Tasks to run for affected projects

### verbose

Type: `boolean`
4 changes: 2 additions & 2 deletions docs/generated/packages/react/generators/library.json
Original file line number Diff line number Diff line change
@@ -122,8 +122,8 @@
"buildable": {
"type": "boolean",
"default": false,
"description": "Generate a buildable library that uses rollup to bundle. Use 'bundler' option instead for greater control (none, vite, rollup).",
"x-deprecated": true
"description": "Generate a buildable library that uses rollup to bundle.",
"x-deprecated": "Use the `bundler` option for greater control (none, vite, rollup)."
},
"importPath": {
"type": "string",
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages": ["build/packages/*"],
"version": "15.4.6",
"version": "15.4.8",
"granularPathspec": false,
"command": {
"publish": {
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@
"@types/eslint": "~8.4.1",
"@types/express": "4.17.14",
"@types/flat": "^5.0.1",
"@types/fs-extra": "^9.0.13",
"@types/fs-extra": "^11.0.0",
"@types/is-ci": "^3.0.0",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
@@ -155,7 +155,7 @@
"file-type": "^16.2.0",
"flat": "^5.0.2",
"fork-ts-checker-webpack-plugin": "7.2.13",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"html-webpack-plugin": "5.5.0",
"http-server": "14.1.0",
"husky": "^8.0.1",
2 changes: 1 addition & 1 deletion packages/cra-to-nx/package.json
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
},
"homepage": "https://nx.dev",
"dependencies": {
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"glob": "7.1.4",
"nx": "file:../nx",
"tslib": "^2.3.0",
2 changes: 1 addition & 1 deletion packages/create-nx-plugin/package.json
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
"dependencies": {
"@nrwl/devkit": "file:../devkit",
"enquirer": "~2.3.6",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"nx": "file:../nx",
"tmp": "~0.2.1",
"yargs-parser": "21.1.1"
11 changes: 10 additions & 1 deletion packages/cypress/src/executors/cypress/cypress.impl.ts
Original file line number Diff line number Diff line change
@@ -173,6 +173,7 @@ async function* startDevServer(
for await (const output of await runExecutor<{
success: boolean;
baseUrl?: string;
info?: { port: number; baseUrl?: string };
}>(
{ project, target, configuration },
// @NOTE: Do not forward watch option if not supported by the target dev server,
@@ -183,7 +184,15 @@ async function* startDevServer(
)) {
if (!output.success && !opts.watch)
throw new Error('Could not compile application files');
yield opts.baseUrl || (output.baseUrl as string);
if (
!opts.baseUrl &&
!output.baseUrl &&
!output.info.baseUrl &&
output.info.port
) {
output.baseUrl = `http://localhost:${output.info.port}`;
}
yield opts.baseUrl || output.baseUrl || output.info.baseUrl;
}
}

2 changes: 1 addition & 1 deletion packages/esbuild/package.json
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
"chalk": "4.1.0",
"dotenv": "~10.0.0",
"fast-glob": "3.2.7",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"tslib": "^2.3.0"
},
"peerDependencies": {
2 changes: 1 addition & 1 deletion packages/expo/package.json
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
"@nrwl/workspace": "file:../workspace",
"chalk": "^4.1.0",
"enhanced-resolve": "^5.8.3",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"metro-resolver": "^0.73.3",
"node-fetch": "^2.6.7",
"tar-fs": "^2.1.1",
2 changes: 1 addition & 1 deletion packages/js/package.json
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
"@nrwl/workspace": "file:../workspace",
"chalk": "4.1.0",
"fast-glob": "3.2.7",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"ignore": "^5.0.4",
"js-tokens": "^4.0.0",
"minimatch": "3.0.5",
7 changes: 2 additions & 5 deletions packages/js/src/utils/inline.ts
Original file line number Diff line number Diff line change
@@ -76,10 +76,7 @@ export function postProcessInlinedDependencies(
const isBuildable = !!inlineDependency.buildOutputPath;

if (isBuildable) {
copySync(depOutputPath, destDepOutputPath, {
overwrite: true,
recursive: true,
});
copySync(depOutputPath, destDepOutputPath, { overwrite: true });
} else {
movePackage(depOutputPath, destDepOutputPath);
}
@@ -248,7 +245,7 @@ function buildInlineGraphExternals(
}

function movePackage(from: string, to: string) {
copySync(from, to, { overwrite: true, recursive: true });
copySync(from, to, { overwrite: true });
removeSync(from);
}

2 changes: 1 addition & 1 deletion packages/next/package.json
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@
"@svgr/webpack": "^6.1.2",
"chalk": "4.1.0",
"dotenv": "~10.0.0",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"ignore": "^5.0.4",
"semver": "7.3.4",
"ts-node": "10.9.1",
4 changes: 2 additions & 2 deletions packages/next/src/executors/server/schema.json
Original file line number Diff line number Diff line change
@@ -36,8 +36,8 @@
},
"customServerPath": {
"type": "string",
"description": "Use a custom server script. (Use `customServerTarget` instead)",
"x-deprecated": true
"description": "Use a custom server script.",
"x-deprecated": "Use `customServerTarget` instead."
},
"hostname": {
"type": "string",
2 changes: 1 addition & 1 deletion packages/nx-plugin/package.json
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
"@nrwl/js": "file:../js",
"@nrwl/linter": "file:../linter",
"dotenv": "~10.0.0",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"tslib": "^2.3.0"
},
"publishConfig": {
4 changes: 2 additions & 2 deletions packages/nx-plugin/src/executors/e2e/schema.json
Original file line number Diff line number Diff line change
@@ -57,12 +57,12 @@
"tsConfig": {
"description": "The name of the Typescript configuration file. Set the tsconfig option in the jest config file. ",
"type": "string",
"x-deprecated": true
"x-deprecated": "Use the ts-jest configuration options in the jest config file instead."
},
"setupFile": {
"description": "The name of a setup file used by Jest. (use Jest config file https://jestjs.io/docs/en/configuration#setupfilesafterenv-array)",
"type": "string",
"x-deprecated": true
"x-deprecated": "Use the setupFilesAfterEnv option in the jest config file. https://jestjs.io/docs/en/configuration#setupfilesafterenv-array"
},
"bail": {
"alias": "b",
5 changes: 0 additions & 5 deletions packages/nx-plugin/src/generators/e2e-project/schema.json
Original file line number Diff line number Diff line change
@@ -26,11 +26,6 @@
"type": "string",
"description": "Jest config file."
},
"tsSpecConfig": {
"type": "string",
"description": "Spec `tsconfig` file.",
"x-deprecated": true
},
"standaloneConfig": {
"description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
"type": "boolean"
2 changes: 1 addition & 1 deletion packages/nx/package.json
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@
"fast-glob": "3.2.7",
"figures": "3.2.0",
"flat": "^5.0.2",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"glob": "7.1.4",
"ignore": "^5.0.4",
"js-yaml": "4.1.0",
2 changes: 1 addition & 1 deletion packages/nx/src/command-line/nx-commands.ts
Original file line number Diff line number Diff line change
@@ -731,7 +731,7 @@ function withRunOneOptions(yargs: yargs.Argv) {
);

const res = withRunOptions(
withOutputStyleOption(withTargetAndConfigurationOption(yargs, false), [
withOutputStyleOption(withConfiguration(yargs), [
'dynamic',
'static',
'stream',
18 changes: 14 additions & 4 deletions packages/nx/src/tasks-runner/forked-process-task-runner.ts
Original file line number Diff line number Diff line change
@@ -60,6 +60,7 @@ export class ForkedProcessTaskRunner {
this.processes.add(p);

p.once('exit', (code, signal) => {
this.processes.delete(p);
if (code === null) code = this.signalToCode(signal);
if (code !== 0) {
const results: BatchResults = {};
@@ -171,6 +172,7 @@ export class ForkedProcessTaskRunner {
});

p.on('exit', (code, signal) => {
this.processes.delete(p);
if (code === null) code = this.signalToCode(signal);
// we didn't print any output as we were running the command
// print all the collected output|
@@ -407,28 +409,36 @@ export class ForkedProcessTaskRunner {
// When the nx process gets a message, it will be sent into the task's process
process.on('message', (message: Serializable) => {
this.processes.forEach((p) => {
p.send(message);
if (p.connected) {
p.send(message);
}
});
});

// Terminate any task processes on exit
process.on('SIGINT', () => {
this.processes.forEach((p) => {
p.kill('SIGTERM');
if (p.connected) {
p.kill('SIGTERM');
}
});
// we exit here because we don't need to write anything to cache.
process.exit();
});
process.on('SIGTERM', () => {
this.processes.forEach((p) => {
p.kill('SIGTERM');
if (p.connected) {
p.kill('SIGTERM');
}
});
// no exit here because we expect child processes to terminate which
// will store results to the cache and will terminate this process
});
process.on('SIGHUP', () => {
this.processes.forEach((p) => {
p.kill('SIGTERM');
if (p.connected) {
p.kill('SIGTERM');
}
});
// no exit here because we expect child processes to terminate which
// will store results to the cache and will terminate this process
2 changes: 1 addition & 1 deletion packages/react-native/package.json
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
"@nrwl/workspace": "file:../workspace",
"chalk": "^4.1.0",
"enhanced-resolve": "^5.8.3",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"ignore": "^5.0.4",
"metro-resolver": "^0.73.3",
"minimatch": "3.0.5",
4 changes: 2 additions & 2 deletions packages/react/src/generators/library/schema.json
Original file line number Diff line number Diff line change
@@ -125,8 +125,8 @@
"buildable": {
"type": "boolean",
"default": false,
"description": "Generate a buildable library that uses rollup to bundle. Use 'bundler' option instead for greater control (none, vite, rollup).",
"x-deprecated": true
"description": "Generate a buildable library that uses rollup to bundle.",
"x-deprecated": "Use the `bundler` option for greater control (none, vite, rollup)."
},
"importPath": {
"type": "string",
2 changes: 1 addition & 1 deletion packages/rollup/package.json
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@
"babel-plugin-transform-async-to-promises": "^0.8.15",
"chalk": "4.1.0",
"dotenv": "~10.0.0",
"fs-extra": "^10.1.0",
"fs-extra": "^11.1.0",
"postcss": "^8.4.14",
"rollup": "^2.56.2",
"rollup-plugin-copy": "^3.4.0",
6 changes: 3 additions & 3 deletions packages/storybook/migrations.json
Original file line number Diff line number Diff line change
@@ -54,11 +54,11 @@
"description": "Stop hashing storybook config files and story files for build targets and dependent tasks",
"factory": "./src/migrations/update-15-0-0/add-storybook-inputs"
},
"update-15.5.0": {
"update-15.4.6": {
"cli": "nx",
"version": "15.5.0-beta.0",
"version": "15.4.6-beta.0",
"description": "Refactor the Storybook target options",
"factory": "./src/migrations/update-15-5-0/refactor-executor-options"
"factory": "./src/migrations/update-15-4-6/refactor-executor-options"
}
},
"packageJsonUpdates": {
Loading