Comparing version 19.6.2 to 19.6.3
@@ -103,3 +103,14 @@ { | ||
"prettier", // This is coming from @storybook/builder-manager since it uses the browser polyfill | ||
"util" // This is coming from @storybook/builder-manager since it uses the browser polyfill | ||
"util", // This is coming from @storybook/builder-manager since it uses the browser polyfill | ||
// The native modules are optional and only one of them will ever be installed on a given machine | ||
"@nx/nx-darwin-x64", | ||
"@nx/nx-darwin-arm64", | ||
"@nx/nx-linux-x64-gnu", | ||
"@nx/nx-linux-x64-musl", | ||
"@nx/nx-win32-x64-msvc", | ||
"@nx/nx-linux-arm64-gnu", | ||
"@nx/nx-linux-arm64-musl", | ||
"@nx/nx-linux-arm-gnueabihf", | ||
"@nx/nx-win32-arm64-msvc", | ||
"@nx/nx-freebsd-x64" | ||
] | ||
@@ -106,0 +117,0 @@ } |
{ | ||
"name": "nx", | ||
"version": "19.6.2", | ||
"version": "19.6.3", | ||
"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.2" | ||
"@nrwl/tao": "19.6.3" | ||
}, | ||
@@ -90,12 +90,12 @@ "peerDependencies": { | ||
"optionalDependencies": { | ||
"@nx/nx-darwin-x64": "19.6.2", | ||
"@nx/nx-darwin-arm64": "19.6.2", | ||
"@nx/nx-linux-x64-gnu": "19.6.2", | ||
"@nx/nx-linux-x64-musl": "19.6.2", | ||
"@nx/nx-win32-x64-msvc": "19.6.2", | ||
"@nx/nx-linux-arm64-gnu": "19.6.2", | ||
"@nx/nx-linux-arm64-musl": "19.6.2", | ||
"@nx/nx-linux-arm-gnueabihf": "19.6.2", | ||
"@nx/nx-win32-arm64-msvc": "19.6.2", | ||
"@nx/nx-freebsd-x64": "19.6.2" | ||
"@nx/nx-darwin-x64": "19.6.3", | ||
"@nx/nx-darwin-arm64": "19.6.3", | ||
"@nx/nx-linux-x64-gnu": "19.6.3", | ||
"@nx/nx-linux-x64-musl": "19.6.3", | ||
"@nx/nx-win32-x64-msvc": "19.6.3", | ||
"@nx/nx-linux-arm64-gnu": "19.6.3", | ||
"@nx/nx-linux-arm64-musl": "19.6.3", | ||
"@nx/nx-linux-arm-gnueabihf": "19.6.3", | ||
"@nx/nx-win32-arm64-msvc": "19.6.3", | ||
"@nx/nx-freebsd-x64": "19.6.3" | ||
}, | ||
@@ -102,0 +102,0 @@ "nx-migrations": { |
@@ -1,2 +0,2 @@ | ||
import { ProjectFileMap, ProjectGraphDependency, ProjectGraphProjectNode } from '../../config/project-graph'; | ||
import { ProjectFileMap, ProjectGraph, ProjectGraphDependency, ProjectGraphProjectNode } from '../../config/project-graph'; | ||
import { TaskGraph } from '../../config/task-graph'; | ||
@@ -51,1 +51,18 @@ export interface GraphError { | ||
}, affectedProjects: string[]): Promise<void>; | ||
/** | ||
* The data type that `nx graph --file graph.json` or `nx build --graph graph.json` contains | ||
*/ | ||
export interface GraphJson { | ||
/** | ||
* A graph of tasks populated with `nx build --graph` | ||
*/ | ||
tasks?: TaskGraph; | ||
/** | ||
* The plans for hashing a task in the task graph | ||
*/ | ||
taskPlans?: Record<string, string[]>; | ||
/** | ||
* The project graph | ||
*/ | ||
graph: ProjectGraph; | ||
} |
@@ -1082,35 +1082,13 @@ "use strict"; | ||
} | ||
// TODO (v17): This should just become something like: | ||
// ``` | ||
// return !collection.generators[name] && collection.schematics[name] | ||
// ``` | ||
// TODO (v21): Remove CLI determination of Angular Migration | ||
function isAngularMigration(collection, collectionPath, name) { | ||
const entry = collection.generators?.[name] || collection.schematics?.[name]; | ||
// In the future we will determine this based on the location of the entry in the collection. | ||
// If the entry is under `schematics`, it will be assumed to be an angular cli migration. | ||
// If the entry is under `generators`, it will be assumed to be an nx migration. | ||
// For now, we will continue to obey the cli property, if it exists. | ||
// If it doesn't exist, we will check if the implementation references @angular/devkit. | ||
const shouldBeNx = !!collection.generators?.[name]; | ||
const shouldBeNg = !!collection.schematics?.[name]; | ||
let useAngularDevkitToRunMigration = false; | ||
const { path: implementationPath } = getImplementationPath(collection, collectionPath, name); | ||
const implStringContents = (0, fs_1.readFileSync)(implementationPath, 'utf-8'); | ||
// TODO (v17): Remove this check and the cli property access - it is only here for backwards compatibility. | ||
if (['@angular/material', '@angular/cdk'].includes(collection.name) || | ||
[ | ||
"import('@angular-devkit", | ||
'import("@angular-devkit', | ||
"require('@angular-devkit", | ||
'require("@angular-devkit', | ||
"from '@angular-devkit", | ||
'from "@angular-devkit', | ||
].some((s) => implStringContents.includes(s))) { | ||
useAngularDevkitToRunMigration = true; | ||
} | ||
if (useAngularDevkitToRunMigration && shouldBeNx) { | ||
if (entry.cli && entry.cli !== 'nx' && collection.generators?.[name]) { | ||
output_1.output.warn({ | ||
title: `The migration '${collection.name}:${name}' appears to be an Angular CLI migration, but is located in the 'generators' section of migrations.json.`, | ||
bodyLines: [ | ||
'In Nx 17, migrations inside `generators` will be treated as Angular Devkit migrations.', | ||
'In Nx 21, migrations inside `generators` will be treated as Nx Devkit migrations and therefore may not run correctly if they are using Angular Devkit.', | ||
'If the migration should be run with Angular Devkit, please place the migration inside `schematics` instead.', | ||
"Please open an issue on the plugin's repository if you believe this is an error.", | ||
@@ -1120,14 +1098,5 @@ ], | ||
} | ||
if (!useAngularDevkitToRunMigration && entry.cli === 'nx' && shouldBeNg) { | ||
output_1.output.warn({ | ||
title: `The migration '${collection.name}:${name}' appears to be an Nx migration, but is located in the 'schematics' section of migrations.json.`, | ||
bodyLines: [ | ||
'In Nx 17, migrations inside `generators` will be treated as nx devkit migrations.', | ||
"Please open an issue on the plugin's repository if you believe this is an error.", | ||
], | ||
}); | ||
} | ||
// Currently, if the cli property exists we listen to it. If its nx, its not an ng cli migration. | ||
// If the property is not set, we will fall back to our intuition. | ||
return entry.cli ? entry.cli !== 'nx' : useAngularDevkitToRunMigration; | ||
return entry.cli ? entry.cli !== 'nx' : !shouldBeNx && shouldBeNg; | ||
} | ||
@@ -1134,0 +1103,0 @@ const getNgCompatLayer = (() => { |
@@ -1,5 +0,6 @@ | ||
import { Argv } from 'yargs'; | ||
import { Argv, ParserConfigurationOptions } from 'yargs'; | ||
interface ExcludeOptions { | ||
exclude: string[]; | ||
} | ||
export declare const defaultYargsParserConfiguration: Partial<ParserConfigurationOptions>; | ||
export declare function withExcludeOption(yargs: Argv): Argv<ExcludeOptions>; | ||
@@ -6,0 +7,0 @@ export interface RunOptions { |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.defaultYargsParserConfiguration = void 0; | ||
exports.withExcludeOption = withExcludeOption; | ||
@@ -15,2 +16,9 @@ exports.withRunOptions = withRunOptions; | ||
exports.parseCSV = parseCSV; | ||
exports.defaultYargsParserConfiguration = { | ||
'strip-dashed': true, | ||
'unknown-options-as-args': true, | ||
'populate--': true, | ||
'parse-numbers': false, | ||
'parse-positional-numbers': false, | ||
}; | ||
function withExcludeOption(yargs) { | ||
@@ -132,7 +140,3 @@ return yargs.option('exclude', { | ||
return withExcludeOption(yargs) | ||
.parserConfiguration({ | ||
'strip-dashed': true, | ||
'unknown-options-as-args': true, | ||
'populate--': true, | ||
}) | ||
.parserConfiguration(exports.defaultYargsParserConfiguration) | ||
.option('files', { | ||
@@ -174,7 +178,3 @@ describe: 'Change the way Nx is calculating the affected command by providing directly changed files, list of files delimited by commas or spaces', | ||
return withRunOptions(yargs) | ||
.parserConfiguration({ | ||
'strip-dashed': true, | ||
'unknown-options-as-args': true, | ||
'populate--': true, | ||
}) | ||
.parserConfiguration(exports.defaultYargsParserConfiguration) | ||
.option('projects', { | ||
@@ -231,7 +231,3 @@ type: 'string', | ||
const res = withRunOptions(withOutputStyleOption(withConfiguration(yargs), allOutputStyles)) | ||
.parserConfiguration({ | ||
'strip-dashed': true, | ||
'unknown-options-as-args': true, | ||
'populate--': true, | ||
}) | ||
.parserConfiguration(exports.defaultYargsParserConfiguration) | ||
.option('project', { | ||
@@ -238,0 +234,0 @@ describe: 'Target project', |
@@ -1,1 +0,1 @@ | ||
"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{79207:()=>{}},s=>{var e;e=79207,s(s.s=e)}]); | ||
"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[532],{46134:()=>{}},s=>{var e;e=46134,s(s.s=e)}]); |
@@ -74,5 +74,7 @@ "use strict"; | ||
// CI=true,env=true => daemon | ||
// docker=true,env=undefined => no daemon | ||
// docker=true,env=false => no daemon | ||
// docker=true,env=true => daemon | ||
// WASM => no daemon because file watching does not work | ||
if (((0, is_ci_1.isCI)() && env !== 'true') || | ||
isDocker() || | ||
if ((((0, is_ci_1.isCI)() || isDocker()) && env !== 'true') || | ||
(0, tmp_dir_1.isDaemonDisabled)() || | ||
@@ -79,0 +81,0 @@ nxJsonIsNotPresent() || |
@@ -70,2 +70,3 @@ /** | ||
export type { ProjectFileMap, FileMap, FileData, ProjectGraph, ProjectGraphDependency, ProjectGraphNode, ProjectGraphProjectNode, ProjectGraphExternalNode, ProjectGraphProcessorContext, } from './config/project-graph'; | ||
export type { GraphJson } from './command-line/graph/graph'; | ||
/** | ||
@@ -72,0 +73,0 @@ * @category Project Graph |
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
7296614
51445
+ Added@nrwl/tao@19.6.3(transitive)
+ Added@nx/nx-darwin-arm64@19.6.3(transitive)
+ Added@nx/nx-darwin-x64@19.6.3(transitive)
+ Added@nx/nx-freebsd-x64@19.6.3(transitive)
+ Added@nx/nx-linux-arm-gnueabihf@19.6.3(transitive)
+ Added@nx/nx-linux-arm64-gnu@19.6.3(transitive)
+ Added@nx/nx-linux-arm64-musl@19.6.3(transitive)
+ Added@nx/nx-linux-x64-gnu@19.6.3(transitive)
+ Added@nx/nx-linux-x64-musl@19.6.3(transitive)
+ Added@nx/nx-win32-arm64-msvc@19.6.3(transitive)
+ Added@nx/nx-win32-x64-msvc@19.6.3(transitive)
- Removed@nrwl/tao@19.6.2(transitive)
- Removed@nx/nx-darwin-arm64@19.6.2(transitive)
- Removed@nx/nx-darwin-x64@19.6.2(transitive)
- Removed@nx/nx-freebsd-x64@19.6.2(transitive)
- Removed@nx/nx-linux-arm-gnueabihf@19.6.2(transitive)
- Removed@nx/nx-linux-arm64-gnu@19.6.2(transitive)
- Removed@nx/nx-linux-arm64-musl@19.6.2(transitive)
- Removed@nx/nx-linux-x64-gnu@19.6.2(transitive)
- Removed@nx/nx-linux-x64-musl@19.6.2(transitive)
- Removed@nx/nx-win32-arm64-msvc@19.6.2(transitive)
- Removed@nx/nx-win32-x64-msvc@19.6.2(transitive)
Updated@nrwl/tao@19.6.3