Comparing version 19.6.0-canary.20240814-6d83ae2 to 19.6.0-rc.0
{ | ||
"name": "nx", | ||
"version": "19.6.0-canary.20240814-6d83ae2", | ||
"version": "19.6.0-rc.0", | ||
"private": false, | ||
@@ -74,3 +74,3 @@ "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.", | ||
"ora": "5.3.0", | ||
"@nrwl/tao": "19.6.0-canary.20240814-6d83ae2" | ||
"@nrwl/tao": "19.6.0-rc.0" | ||
}, | ||
@@ -90,12 +90,12 @@ "peerDependencies": { | ||
"optionalDependencies": { | ||
"@nx/nx-darwin-x64": "19.6.0-canary.20240814-6d83ae2", | ||
"@nx/nx-darwin-arm64": "19.6.0-canary.20240814-6d83ae2", | ||
"@nx/nx-linux-x64-gnu": "19.6.0-canary.20240814-6d83ae2", | ||
"@nx/nx-linux-x64-musl": "19.6.0-canary.20240814-6d83ae2", | ||
"@nx/nx-win32-x64-msvc": "19.6.0-canary.20240814-6d83ae2", | ||
"@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240814-6d83ae2", | ||
"@nx/nx-linux-arm64-musl": "19.6.0-canary.20240814-6d83ae2", | ||
"@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240814-6d83ae2", | ||
"@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240814-6d83ae2", | ||
"@nx/nx-freebsd-x64": "19.6.0-canary.20240814-6d83ae2" | ||
"@nx/nx-darwin-x64": "19.6.0-rc.0", | ||
"@nx/nx-darwin-arm64": "19.6.0-rc.0", | ||
"@nx/nx-linux-x64-gnu": "19.6.0-rc.0", | ||
"@nx/nx-linux-x64-musl": "19.6.0-rc.0", | ||
"@nx/nx-win32-x64-msvc": "19.6.0-rc.0", | ||
"@nx/nx-linux-arm64-gnu": "19.6.0-rc.0", | ||
"@nx/nx-linux-arm64-musl": "19.6.0-rc.0", | ||
"@nx/nx-linux-arm-gnueabihf": "19.6.0-rc.0", | ||
"@nx/nx-win32-arm64-msvc": "19.6.0-rc.0", | ||
"@nx/nx-freebsd-x64": "19.6.0-rc.0" | ||
}, | ||
@@ -196,3 +196,4 @@ "nx-migrations": { | ||
"main": "./bin/nx.js", | ||
"type": "commonjs" | ||
"type": "commonjs", | ||
"types": "./bin/nx.d.ts" | ||
} |
@@ -56,2 +56,3 @@ import { CommandModule } from 'yargs'; | ||
export type ReleaseOptions = NxReleaseArgs & FirstReleaseArgs & { | ||
specifier?: string; | ||
yes?: boolean; | ||
@@ -58,0 +59,0 @@ skipPublish?: boolean; |
@@ -63,2 +63,12 @@ "use strict"; | ||
} | ||
const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)(); | ||
if (args.specifier && rawVersionPlans.length > 0) { | ||
output_1.output.error({ | ||
title: `A specifier option cannot be provided when using version plans.`, | ||
bodyLines: [ | ||
`To override this behavior, use the Nx Release programmatic API directly (https://nx.dev/features/manage-releases#using-the-programmatic-api-for-nx-release).`, | ||
], | ||
}); | ||
process.exit(1); | ||
} | ||
// These properties must never be undefined as this command should | ||
@@ -91,3 +101,2 @@ // always explicitly override the git operations of the subcommands. | ||
} | ||
const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)(); | ||
(0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes)); | ||
@@ -94,0 +103,0 @@ const planFiles = new Set(); |
@@ -86,4 +86,11 @@ "use strict"; | ||
} | ||
const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)(); | ||
(0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes)); | ||
if (!args.specifier) { | ||
const rawVersionPlans = await (0, version_plans_1.readRawVersionPlans)(); | ||
(0, version_plans_1.setResolvedVersionPlansOnGroups)(rawVersionPlans, releaseGroups, Object.keys(projectGraph.nodes)); | ||
} | ||
else { | ||
if (args.verbose && releaseGroups.some((g) => !!g.versionPlans)) { | ||
console.log(`Skipping version plan discovery as a specifier was provided`); | ||
} | ||
} | ||
if (args.deleteVersionPlans === undefined) { | ||
@@ -90,0 +97,0 @@ // default to not delete version plans after versioning as they may be needed for changelog generation |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.syncHandler = syncHandler; | ||
const ora = require("ora"); | ||
const project_graph_1 = require("../../project-graph/project-graph"); | ||
@@ -8,2 +9,3 @@ const output_1 = require("../../utils/output"); | ||
const sync_generators_1 = require("../../utils/sync-generators"); | ||
const chalk = require("chalk"); | ||
function syncHandler(options) { | ||
@@ -19,2 +21,8 @@ if (options.verbose) { | ||
if (!results.length) { | ||
output_1.output.success({ | ||
title: options.check | ||
? 'The workspace is up to date' | ||
: 'The workspace is already up to date', | ||
bodyLines: syncGenerators.map((generator) => `The ${chalk.bold(generator)} sync generator didn't identify any files in the workspace that are out of sync.`), | ||
}); | ||
return 0; | ||
@@ -29,5 +37,15 @@ } | ||
} | ||
output_1.output.warn({ | ||
title: `The workspace is out of sync`, | ||
bodyLines: (0, sync_generators_1.syncGeneratorResultsToMessageLines)(results), | ||
}); | ||
const spinner = ora('Syncing the workspace...'); | ||
spinner.start(); | ||
await (0, sync_generators_1.flushSyncGeneratorChanges)(results); | ||
spinner.succeed(`The workspace was synced successfully! | ||
Please make sure to commit the changes to your repository. | ||
`); | ||
return 0; | ||
}); | ||
} |
@@ -228,3 +228,3 @@ "use strict"; | ||
catch (e) { | ||
if (e.message.indexOf('inotify_add_watch') > -1) { | ||
if (e.message && e.message.indexOf('inotify_add_watch') > -1) { | ||
// common errors with the daemon due to OS settings (cannot watch all the files available) | ||
@@ -231,0 +231,0 @@ output_1.output.note({ |
@@ -143,3 +143,3 @@ "use strict"; | ||
const outOfSyncTitle = 'The workspace is out of sync'; | ||
const resultBodyLines = (0, sync_generators_1.syncGeneratorResultsToMessageLines)(results); | ||
const resultBodyLines = [...(0, sync_generators_1.syncGeneratorResultsToMessageLines)(results), '']; | ||
const fixMessage = 'You can manually run `nx sync` to update your workspace or you can set `sync.applyChanges` to `true` in your `nx.json` to apply the changes automatically when running tasks.'; | ||
@@ -212,19 +212,24 @@ const willErrorOnCiMessage = 'Please note that this will be an error on CI.'; | ||
async function promptForApplyingSyncGeneratorChanges() { | ||
const promptConfig = { | ||
name: 'applyChanges', | ||
type: 'select', | ||
message: 'Would you like to sync the changes to get your worskpace up to date?', | ||
choices: [ | ||
{ | ||
name: 'yes', | ||
message: 'Yes, sync the changes and run the tasks', | ||
}, | ||
{ | ||
name: 'no', | ||
message: 'No, run the tasks without syncing the changes', | ||
}, | ||
], | ||
footer: () => chalk.dim('\nYou can skip this prompt by setting the `sync.applyChanges` option in your `nx.json`.'), | ||
}; | ||
return await (0, enquirer_1.prompt)([promptConfig]).then(({ applyChanges }) => applyChanges === 'yes'); | ||
try { | ||
const promptConfig = { | ||
name: 'applyChanges', | ||
type: 'select', | ||
message: 'Would you like to sync the changes to get your worskpace up to date?', | ||
choices: [ | ||
{ | ||
name: 'yes', | ||
message: 'Yes, sync the changes and run the tasks', | ||
}, | ||
{ | ||
name: 'no', | ||
message: 'No, run the tasks without syncing the changes', | ||
}, | ||
], | ||
footer: () => chalk.dim('\nYou can skip this prompt by setting the `sync.applyChanges` option in your `nx.json`.'), | ||
}; | ||
return await (0, enquirer_1.prompt)([promptConfig]).then(({ applyChanges }) => applyChanges === 'yes'); | ||
} | ||
catch { | ||
process.exit(1); | ||
} | ||
} | ||
@@ -231,0 +236,0 @@ function setEnvVarsBasedOnArgs(nxArgs, loadDotEnvFiles) { |
@@ -106,3 +106,2 @@ "use strict"; | ||
} | ||
messageLines.push(''); | ||
} | ||
@@ -109,0 +108,0 @@ return messageLines; |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
7296650
51499
+ Added@nrwl/tao@19.6.0-rc.0(transitive)
+ Added@nx/nx-darwin-arm64@19.6.0-rc.0(transitive)
+ Added@nx/nx-darwin-x64@19.6.0-rc.0(transitive)
+ Added@nx/nx-freebsd-x64@19.6.0-rc.0(transitive)
+ Added@nx/nx-linux-arm-gnueabihf@19.6.0-rc.0(transitive)
+ Added@nx/nx-linux-arm64-gnu@19.6.0-rc.0(transitive)
+ Added@nx/nx-linux-arm64-musl@19.6.0-rc.0(transitive)
+ Added@nx/nx-linux-x64-gnu@19.6.0-rc.0(transitive)
+ Added@nx/nx-linux-x64-musl@19.6.0-rc.0(transitive)
+ Added@nx/nx-win32-arm64-msvc@19.6.0-rc.0(transitive)
+ Added@nx/nx-win32-x64-msvc@19.6.0-rc.0(transitive)
- Removed@nrwl/tao@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-darwin-arm64@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-darwin-x64@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-freebsd-x64@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-linux-arm-gnueabihf@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-linux-arm64-gnu@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-linux-arm64-musl@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-linux-x64-gnu@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-linux-x64-musl@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-win32-arm64-msvc@19.6.0-canary.20240814-6d83ae2(transitive)
- Removed@nx/nx-win32-x64-msvc@19.6.0-canary.20240814-6d83ae2(transitive)
Updated@nrwl/tao@19.6.0-rc.0