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

chore(repo): format fixes

Browse Source
This commit is contained in:
Victor Savkin 2022-05-03 13:57:37 -04:00
parent 16c61b7001
commit 821fc07723
13 changed files with 105 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/generated/packages/nx.json
View File

@ -6,6 +6,24 @@
"source": "/packages/nx/src", "source": "/packages/nx/src",
"generators": [], "generators": [],
"executors": [ "executors": [
{
"name": "noop",
"implementation": "/packages/nx/src/executors/noop/noop.impl.ts",
"schema": {
"title": "Noop",
"description": "An executor that does nothing",
"type": "object",
"cli": "nx",
"outputCapture": "pipe",
"properties": {},
"additionalProperties": false,
"presets": []
},
"description": "An executor that does nothing",
"aliases": [],
"hidden": false,
"path": "/packages/nx/src/executors/noop/schema.json"
},
{ {
"name": "run-commands", "name": "run-commands",
"implementation": "/packages/nx/src/executors/run-commands/run-commands.impl.ts", "implementation": "/packages/nx/src/executors/run-commands/run-commands.impl.ts",

5
docs/packages.json
View File

@ -172,7 +172,10 @@
{ {
"name": "nx", "name": "nx",
"path": "generated/packages/nx.json", "path": "generated/packages/nx.json",
"schemas": { "executors": ["run-commands", "run-script"], "generators": [] } "schemas": {
"executors": ["noop", "run-commands", "run-script"],
"generators": []
}
}, },
{ {
"name": "nx-plugin", "name": "nx-plugin",

10
e2e/workspace-integrations/src/run-one.test.ts
View File

@ -128,13 +128,13 @@ describe('run-one', () => {
const originalWorkspace = readProjectConfig(myapp); const originalWorkspace = readProjectConfig(myapp);
updateProjectConfig(myapp, (config) => { updateProjectConfig(myapp, (config) => {
config.targets.prep = { config.targets.prep = {
executor: "nx:run-commands", executor: 'nx:run-commands',
options: { options: {
command: "echo PREP" command: 'echo PREP',
} },
}; };
config.targets.build.dependsOn = [ config.targets.build.dependsOn = [
"prep", 'prep',
{ {
target: 'build', target: 'build',
projects: 'dependencies', projects: 'dependencies',
@ -150,7 +150,7 @@ describe('run-one', () => {
expect(output).toContain(myapp); expect(output).toContain(myapp);
expect(output).toContain(mylib1); expect(output).toContain(mylib1);
expect(output).toContain(mylib2); expect(output).toContain(mylib2);
expect(output).toContain("PREP"); expect(output).toContain('PREP');
updateProjectConfig(myapp, () => originalWorkspace); updateProjectConfig(myapp, () => originalWorkspace);
}, 10000); }, 10000);

4
nx.json
View File

@ -2,9 +2,7 @@
"implicitDependencies": { "implicitDependencies": {
"package.json": "*", "package.json": "*",
".eslintrc.json": "*", ".eslintrc.json": "*",
"scripts/vercel/*": [ "scripts/vercel/*": ["nx-dev"],
"nx-dev"
],
".circleci/config.yml": "*", ".circleci/config.yml": "*",
"tools/eslint-rules/**/*": "*" "tools/eslint-rules/**/*": "*"
}, },

4
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@nrwl/nx-source", "name": "@nrwl/nx-source",
"version": "14.0.3", "version": "14.1.0-beta.2",
"description": "Smart, Fast and Extensible Build System", "description": "Smart, Fast and Extensible Build System",
"homepage": "https://nx.dev", "homepage": "https://nx.dev",
"private": true, "private": true,
@ -305,4 +305,4 @@
"**/xmlhttprequest-ssl": "~1.6.2", "**/xmlhttprequest-ssl": "~1.6.2",
"minimist": "^1.2.6" "minimist": "^1.2.6"
} }
} }

5
packages/nx/executors.json
View File

@ -1,5 +1,10 @@
{ {
"executors": { "executors": {
"noop": {
"implementation": "./src/executors/noop/noop.impl",
"schema": "./src/executors/noop/schema.json",
"description": "An executor that does nothing"
},
"run-commands": { "run-commands": {
"implementation": "./src/executors/run-commands/run-commands.impl", "implementation": "./src/executors/run-commands/run-commands.impl",
"schema": "./src/executors/run-commands/schema.json", "schema": "./src/executors/run-commands/schema.json",

2
packages/nx/src/config/workspace-json-project-json.ts
View File

@ -126,7 +126,7 @@ export interface TargetConfiguration {
/** /**
* This describes other targets that a target depends on. * This describes other targets that a target depends on.
*/ */
dependsOn?: (TargetDependencyConfig|string)[]; dependsOn?: (TargetDependencyConfig | string)[];
/** /**
* Target's options. They are passed in to the executor. * Target's options. They are passed in to the executor.

1
packages/nx/src/config/workspaces.ts
View File

@ -524,6 +524,7 @@ export function globForProjectFiles(
projectGlobCacheKey = cacheKey; projectGlobCacheKey = cacheKey;
const projectGlobPatterns: string[] = [ const projectGlobPatterns: string[] = [
'project.json',
'**/project.json', '**/project.json',
...getGlobPatternsFromPackageManagerWorkspaces(root), ...getGlobPatternsFromPackageManagerWorkspaces(root),
]; ];

18
packages/nx/src/executors/run-commands/schema.json
View File

@ -7,23 +7,15 @@
"presets": [ "presets": [
{ {
"name": "Arguments forwarding", "name": "Arguments forwarding",
"keys": [ "keys": ["commands"]
"commands"
]
}, },
{ {
"name": "Custom done conditions", "name": "Custom done conditions",
"keys": [ "keys": ["commands", "readyWhen"]
"commands",
"readyWhen"
]
}, },
{ {
"name": "Setting the cwd", "name": "Setting the cwd",
"keys": [ "keys": ["commands", "cwd"]
"commands",
"cwd"
]
} }
], ],
"properties": { "properties": {
@ -81,9 +73,7 @@
} }
}, },
"additionalProperties": false, "additionalProperties": false,
"required": [ "required": ["command"]
"command"
]
}, },
{ {
"type": "string" "type": "string"

12
packages/nx/src/tasks-runner/run-command.ts
View File

@ -212,7 +212,10 @@ export function createTasksForProjectToRun(
params: Omit<TaskParams, 'project' | 'errorIfCannotFindConfiguration'>, params: Omit<TaskParams, 'project' | 'errorIfCannotFindConfiguration'>,
projectGraph: ProjectGraph, projectGraph: ProjectGraph,
initiatingProject: string | null, initiatingProject: string | null,
defaultDependencyConfigs: Record<string, (TargetDependencyConfig|string)[]> = {} defaultDependencyConfigs: Record<
string,
(TargetDependencyConfig | string)[]
> = {}
) { ) {
const tasksMap: Map<string, Task> = new Map<string, Task>(); const tasksMap: Map<string, Task> = new Map<string, Task>();
const seenSet = new Set<string>(); const seenSet = new Set<string>();
@ -251,7 +254,10 @@ function addTasksForProjectTarget(
overrides, overrides,
errorIfCannotFindConfiguration, errorIfCannotFindConfiguration,
}: TaskParams, }: TaskParams,
defaultDependencyConfigs: Record<string, (TargetDependencyConfig|string)[]> = {}, defaultDependencyConfigs: Record<
string,
(TargetDependencyConfig | string)[]
> = {},
projectGraph: ProjectGraph, projectGraph: ProjectGraph,
originalTargetExecutor: string, originalTargetExecutor: string,
tasksMap: Map<string, Task>, tasksMap: Map<string, Task>,
@ -349,7 +355,7 @@ function addTasksForProjectDependencyConfig(
overrides, overrides,
}: Pick<TaskParams, 'target' | 'configuration' | 'overrides'>, }: Pick<TaskParams, 'target' | 'configuration' | 'overrides'>,
dependencyConfig: TargetDependencyConfig, dependencyConfig: TargetDependencyConfig,
defaultDependencyConfigs: Record<string, (TargetDependencyConfig|string)[]>, defaultDependencyConfigs: Record<string, (TargetDependencyConfig | string)[]>,
projectGraph: ProjectGraph, projectGraph: ProjectGraph,
originalTargetExecutor: string, originalTargetExecutor: string,
tasksMap: Map<string, Task>, tasksMap: Map<string, Task>,

2
packages/nx/src/tasks-runner/task-graph-creator.ts
View File

@ -8,7 +8,7 @@ export class TaskGraphCreator {
private readonly projectGraph: ProjectGraph, private readonly projectGraph: ProjectGraph,
private readonly defaultTargetDependencies: Record< private readonly defaultTargetDependencies: Record<
string, string,
(TargetDependencyConfig|string)[] (TargetDependencyConfig | string)[]
> >
) {} ) {}

2
packages/nx/src/tasks-runner/utils.ts
View File

@ -21,7 +21,7 @@ export function getCommandAsString(task: Task) {
export function getDependencyConfigs( export function getDependencyConfigs(
{ project, target }: { project: string; target: string }, { project, target }: { project: string; target: string },
defaultDependencyConfigs: Record<string, (TargetDependencyConfig|string)[]>, defaultDependencyConfigs: Record<string, (TargetDependencyConfig | string)[]>,
projectGraph: ProjectGraph projectGraph: ProjectGraph
): TargetDependencyConfig[] | undefined { ): TargetDependencyConfig[] | undefined {
// DependencyConfigs configured in workspace.json override configurations at the root. // DependencyConfigs configured in workspace.json override configurations at the root.

213
tsconfig.base.json
View File

@ -9,87 +9,36 @@
"experimentalDecorators": true, "experimentalDecorators": true,
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"skipLibCheck": true, "skipLibCheck": true,
"types": [ "types": ["node", "jest"],
"node", "lib": ["es2019"],
"jest"
],
"lib": [
"es2019"
],
"declaration": true, "declaration": true,
"resolveJsonModule": true, "resolveJsonModule": true,
"baseUrl": ".", "baseUrl": ".",
"rootDir": ".", "rootDir": ".",
"paths": { "paths": {
"@nrwl/angular": [ "@nrwl/angular": ["./packages/angular"],
"./packages/angular" "@nrwl/angular/*": ["./packages/angular/*"],
], "@nrwl/cli": ["./packages/cli"],
"@nrwl/angular/*": [ "@nrwl/cli/*": ["./packages/cli/*"],
"./packages/angular/*" "@nrwl/cypress": ["./packages/cypress"],
], "@nrwl/cypress/*": ["./packages/cypress/*"],
"@nrwl/cli": [ "@nrwl/detox": ["./packages/detox"],
"./packages/cli" "@nrwl/devkit": ["./packages/devkit"],
], "@nrwl/devkit/ngcli-adapter": ["./packages/devkit/ngcli-adapter"],
"@nrwl/cli/*": [ "@nrwl/devkit/testing": ["./packages/devkit/testing"],
"./packages/cli/*" "@nrwl/e2e/cli": ["./e2e/cli"],
], "@nrwl/e2e/utils": ["./e2e/utils"],
"@nrwl/cypress": [ "@nrwl/eslint-plugin-nx": ["./packages/eslint-plugin-nx/src"],
"./packages/cypress" "@nrwl/express": ["./packages/express"],
], "@nrwl/jest": ["./packages/jest"],
"@nrwl/cypress/*": [ "@nrwl/jest/*": ["./packages/jest/*"],
"./packages/cypress/*" "@nrwl/js": ["./packages/js/src"],
], "@nrwl/js/*": ["./packages/js/*"],
"@nrwl/detox": [ "@nrwl/linter": ["./packages/linter"],
"./packages/detox" "@nrwl/nest": ["./packages/nest"],
], "@nrwl/next": ["./packages/next"],
"@nrwl/devkit": [ "@nrwl/node": ["./packages/node"],
"./packages/devkit" "@nrwl/node/*": ["./packages/node/*"],
],
"@nrwl/devkit/ngcli-adapter": [
"./packages/devkit/ngcli-adapter"
],
"@nrwl/devkit/testing": [
"./packages/devkit/testing"
],
"@nrwl/e2e/cli": [
"./e2e/cli"
],
"@nrwl/e2e/utils": [
"./e2e/utils"
],
"@nrwl/eslint-plugin-nx": [
"./packages/eslint-plugin-nx/src"
],
"@nrwl/express": [
"./packages/express"
],
"@nrwl/jest": [
"./packages/jest"
],
"@nrwl/jest/*": [
"./packages/jest/*"
],
"@nrwl/js": [
"./packages/js/src"
],
"@nrwl/js/*": [
"./packages/js/*"
],
"@nrwl/linter": [
"./packages/linter"
],
"@nrwl/nest": [
"./packages/nest"
],
"@nrwl/next": [
"./packages/next"
],
"@nrwl/node": [
"./packages/node"
],
"@nrwl/node/*": [
"./packages/node/*"
],
"@nrwl/nx-dev-feature-package-schema-viewer": [ "@nrwl/nx-dev-feature-package-schema-viewer": [
"./nx-dev/feature-package-schema-viewer/src/index.ts" "./nx-dev/feature-package-schema-viewer/src/index.ts"
], ],
@ -114,93 +63,37 @@
"@nrwl/nx-dev/feature-flavor-selection": [ "@nrwl/nx-dev/feature-flavor-selection": [
"./nx-dev/feature-flavor-selection/src/index.ts" "./nx-dev/feature-flavor-selection/src/index.ts"
], ],
"@nrwl/nx-dev/feature-search": [ "@nrwl/nx-dev/feature-search": ["./nx-dev/feature-search/src/index.ts"],
"./nx-dev/feature-search/src/index.ts" "@nrwl/nx-dev/feature-storage": ["./nx-dev/feature-storage/src/index.ts"],
],
"@nrwl/nx-dev/feature-storage": [
"./nx-dev/feature-storage/src/index.ts"
],
"@nrwl/nx-dev/feature-versions-and-flavors": [ "@nrwl/nx-dev/feature-versions-and-flavors": [
"./nx-dev/feature-versions-and-flavors/src/index.ts" "./nx-dev/feature-versions-and-flavors/src/index.ts"
], ],
"@nrwl/nx-dev/models-document": [ "@nrwl/nx-dev/models-document": ["./nx-dev/models-document/src/index.ts"],
"./nx-dev/models-document/src/index.ts" "@nrwl/nx-dev/models-menu": ["./nx-dev/models-menu/src/index.ts"],
], "@nrwl/nx-dev/models-package": ["./nx-dev/models-package/src/index.ts"],
"@nrwl/nx-dev/models-menu": [ "@nrwl/nx-dev/ui-commands": ["./nx-dev/ui-commands/src/index.ts"],
"./nx-dev/models-menu/src/index.ts" "@nrwl/nx-dev/ui-common": ["./nx-dev/ui-common/src/index.ts"],
], "@nrwl/nx-dev/ui-community": ["./nx-dev/ui-community/src/index.ts"],
"@nrwl/nx-dev/models-package": [ "@nrwl/nx-dev/ui-conference": ["./nx-dev/ui-conference/src/index.ts"],
"./nx-dev/models-package/src/index.ts" "@nrwl/nx-dev/ui-home": ["./nx-dev/ui-home/src/index.ts"],
], "@nrwl/nx-dev/ui-member-card": ["./nx-dev/ui-member-card/src/index.ts"],
"@nrwl/nx-dev/ui-commands": [ "@nrwl/nx-dev/ui-sponsor-card": ["./nx-dev/ui-sponsor-card/src/index.ts"],
"./nx-dev/ui-commands/src/index.ts" "@nrwl/nx-plugin": ["./packages/nx-plugin"],
], "@nrwl/react": ["./packages/react"],
"@nrwl/nx-dev/ui-common": [ "@nrwl/react-native": ["./packages/react-native"],
"./nx-dev/ui-common/src/index.ts" "@nrwl/react/*": ["./packages/react/*"],
], "@nrwl/storybook": ["./packages/storybook"],
"@nrwl/nx-dev/ui-community": [ "@nrwl/storybook/*": ["./packages/storybook/*"],
"./nx-dev/ui-community/src/index.ts" "@nrwl/tao": ["./packages/tao"],
], "@nrwl/tao/*": ["./packages/tao/*"],
"@nrwl/nx-dev/ui-conference": [ "@nrwl/typedoc-theme": ["/typedoc-theme/src/index.ts"],
"./nx-dev/ui-conference/src/index.ts" "@nrwl/web": ["./packages/web"],
], "@nrwl/web/*": ["./packages/web/*"],
"@nrwl/nx-dev/ui-home": [ "@nrwl/workspace": ["./packages/workspace"],
"./nx-dev/ui-home/src/index.ts" "@nrwl/workspace/*": ["./packages/workspace/*"],
], "@nrwl/workspace/testing": ["./packages/workspace/testing"],
"@nrwl/nx-dev/ui-member-card": [ "nx": ["./packages/nx"],
"./nx-dev/ui-member-card/src/index.ts" "nx/*": ["./packages/nx/*"]
],
"@nrwl/nx-dev/ui-sponsor-card": [
"./nx-dev/ui-sponsor-card/src/index.ts"
],
"@nrwl/nx-plugin": [
"./packages/nx-plugin"
],
"@nrwl/react": [
"./packages/react"
],
"@nrwl/react-native": [
"./packages/react-native"
],
"@nrwl/react/*": [
"./packages/react/*"
],
"@nrwl/storybook": [
"./packages/storybook"
],
"@nrwl/storybook/*": [
"./packages/storybook/*"
],
"@nrwl/tao": [
"./packages/tao"
],
"@nrwl/tao/*": [
"./packages/tao/*"
],
"@nrwl/typedoc-theme": [
"/typedoc-theme/src/index.ts"
],
"@nrwl/web": [
"./packages/web"
],
"@nrwl/web/*": [
"./packages/web/*"
],
"@nrwl/workspace": [
"./packages/workspace"
],
"@nrwl/workspace/*": [
"./packages/workspace/*"
],
"@nrwl/workspace/testing": [
"./packages/workspace/testing"
],
"nx": [
"./packages/nx"
],
"nx/*": [
"./packages/nx/*"
]
} }
} }
} }