diff --git a/docs/angular/api-jest/builders/jest.md b/docs/angular/api-jest/builders/jest.md index c1f15080db..beca0edde6 100644 --- a/docs/angular/api-jest/builders/jest.md +++ b/docs/angular/api-jest/builders/jest.md @@ -10,7 +10,7 @@ Builder properties can be configured in angular.json when defining the builder, Alias(es): b -Type: `number | boolean` +Type: `number | boolean ` Exit the test suite immediately after `n` number of failing tests. (https://jestjs.io/docs/en/cli#bail) @@ -94,7 +94,7 @@ Prints the test results in JSON. This mode will send all other test output and u Alias(es): w -Type: `number | string` +Type: `number | string ` Specifies the maximum number of workers the worker-pool will spawn for running tests. This defaults to the number of the cores available on your machine. Useful for CI. (its usually best not to override this default) (https://jestjs.io/docs/en/cli#maxworkers-num) diff --git a/docs/angular/api-linter/builders/lint.md b/docs/angular/api-linter/builders/lint.md index a4336467d1..ebe4e1a3ff 100644 --- a/docs/angular/api-linter/builders/lint.md +++ b/docs/angular/api-linter/builders/lint.md @@ -104,6 +104,6 @@ Hide output text. ### tsConfig -Type: `string | string[]` +Type: `string | string[] ` The name of the TypeScript configuration file. diff --git a/docs/angular/api-node/builders/build.md b/docs/angular/api-node/builders/build.md index a45e0b511e..1080381520 100644 --- a/docs/angular/api-node/builders/build.md +++ b/docs/angular/api-node/builders/build.md @@ -24,7 +24,7 @@ Read buildable libraries from source instead of building them separately. Default: `all` -Type: `string | string[]` +Type: `string | string[] ` Dependencies to keep external to the bundle. ("all" (default), "none", or an array of module names) diff --git a/docs/angular/api-node/builders/execute.md b/docs/angular/api-node/builders/execute.md index da28d63188..73f1a5c3f0 100644 --- a/docs/angular/api-node/builders/execute.md +++ b/docs/angular/api-node/builders/execute.md @@ -30,7 +30,7 @@ The host to inspect the process on Default: `inspect` -Type: `string | boolean` +Type: `string | boolean ` Ensures the app is starting with debugging diff --git a/docs/angular/api-workspace/builders/run-commands.md b/docs/angular/api-workspace/builders/run-commands.md index 4d985093cd..c10a295449 100644 --- a/docs/angular/api-workspace/builders/run-commands.md +++ b/docs/angular/api-workspace/builders/run-commands.md @@ -200,7 +200,7 @@ You may specify a custom .env file path ### outputPath -Type: `string | string[]` +Type: `string | string[] ` Allows you to specify where the build artifacts are stored. This allows Nx Cloud to pick them up correctly, in the case that the build artifacts are placed somewhere other than the top level dist folder. diff --git a/docs/angular/cli/migrate.md b/docs/angular/cli/migrate.md index 4ce4814282..2fcd071917 100644 --- a/docs/angular/cli/migrate.md +++ b/docs/angular/cli/migrate.md @@ -4,7 +4,6 @@ - Migrate packages and create migrations.json (e.g., nx migrate @nrwl/workspace@latest) - Run migrations (e.g., nx migrate --run-migrations=migrations.json) - ## Usage ```bash nx migrate diff --git a/docs/node/api-jest/builders/jest.md b/docs/node/api-jest/builders/jest.md index 82b8c527c2..78e065f5ca 100644 --- a/docs/node/api-jest/builders/jest.md +++ b/docs/node/api-jest/builders/jest.md @@ -11,7 +11,7 @@ Read more about how to use builders and the CLI here: https://nx.dev/node/guides Alias(es): b -Type: `number | boolean` +Type: `number | boolean ` Exit the test suite immediately after `n` number of failing tests. (https://jestjs.io/docs/en/cli#bail) @@ -95,7 +95,7 @@ Prints the test results in JSON. This mode will send all other test output and u Alias(es): w -Type: `number | string` +Type: `number | string ` Specifies the maximum number of workers the worker-pool will spawn for running tests. This defaults to the number of the cores available on your machine. Useful for CI. (its usually best not to override this default) (https://jestjs.io/docs/en/cli#maxworkers-num) diff --git a/docs/node/api-linter/builders/lint.md b/docs/node/api-linter/builders/lint.md index ed4ae84772..c8e382a1d4 100644 --- a/docs/node/api-linter/builders/lint.md +++ b/docs/node/api-linter/builders/lint.md @@ -105,6 +105,6 @@ Hide output text. ### tsConfig -Type: `string | string[]` +Type: `string | string[] ` The name of the TypeScript configuration file. diff --git a/docs/node/api-node/builders/build.md b/docs/node/api-node/builders/build.md index fef281cc1e..03df2afe9f 100644 --- a/docs/node/api-node/builders/build.md +++ b/docs/node/api-node/builders/build.md @@ -25,7 +25,7 @@ Read buildable libraries from source instead of building them separately. Default: `all` -Type: `string | string[]` +Type: `string | string[] ` Dependencies to keep external to the bundle. ("all" (default), "none", or an array of module names) diff --git a/docs/node/api-node/builders/execute.md b/docs/node/api-node/builders/execute.md index 59a19bf197..b08dfb6134 100644 --- a/docs/node/api-node/builders/execute.md +++ b/docs/node/api-node/builders/execute.md @@ -31,7 +31,7 @@ The host to inspect the process on Default: `inspect` -Type: `string | boolean` +Type: `string | boolean ` Ensures the app is starting with debugging diff --git a/docs/node/api-workspace/builders/run-commands.md b/docs/node/api-workspace/builders/run-commands.md index 4de5d3a326..5ab1354885 100644 --- a/docs/node/api-workspace/builders/run-commands.md +++ b/docs/node/api-workspace/builders/run-commands.md @@ -201,7 +201,7 @@ You may specify a custom .env file path ### outputPath -Type: `string | string[]` +Type: `string | string[] ` Allows you to specify where the build artifacts are stored. This allows Nx Cloud to pick them up correctly, in the case that the build artifacts are placed somewhere other than the top level dist folder. diff --git a/docs/node/cli/migrate.md b/docs/node/cli/migrate.md index 4ce4814282..2fcd071917 100644 --- a/docs/node/cli/migrate.md +++ b/docs/node/cli/migrate.md @@ -4,7 +4,6 @@ - Migrate packages and create migrations.json (e.g., nx migrate @nrwl/workspace@latest) - Run migrations (e.g., nx migrate --run-migrations=migrations.json) - ## Usage ```bash nx migrate diff --git a/docs/react/api-jest/builders/jest.md b/docs/react/api-jest/builders/jest.md index c14d02cda7..db8bcb0e4e 100644 --- a/docs/react/api-jest/builders/jest.md +++ b/docs/react/api-jest/builders/jest.md @@ -11,7 +11,7 @@ Read more about how to use builders and the CLI here: https://nx.dev/react/guide Alias(es): b -Type: `number | boolean` +Type: `number | boolean ` Exit the test suite immediately after `n` number of failing tests. (https://jestjs.io/docs/en/cli#bail) @@ -95,7 +95,7 @@ Prints the test results in JSON. This mode will send all other test output and u Alias(es): w -Type: `number | string` +Type: `number | string ` Specifies the maximum number of workers the worker-pool will spawn for running tests. This defaults to the number of the cores available on your machine. Useful for CI. (its usually best not to override this default) (https://jestjs.io/docs/en/cli#maxworkers-num) diff --git a/docs/react/api-linter/builders/lint.md b/docs/react/api-linter/builders/lint.md index 146176d809..199f5123b0 100644 --- a/docs/react/api-linter/builders/lint.md +++ b/docs/react/api-linter/builders/lint.md @@ -105,6 +105,6 @@ Hide output text. ### tsConfig -Type: `string | string[]` +Type: `string | string[] ` The name of the TypeScript configuration file. diff --git a/docs/react/api-node/builders/build.md b/docs/react/api-node/builders/build.md index 36e6ef7f3a..d281db4314 100644 --- a/docs/react/api-node/builders/build.md +++ b/docs/react/api-node/builders/build.md @@ -25,7 +25,7 @@ Read buildable libraries from source instead of building them separately. Default: `all` -Type: `string | string[]` +Type: `string | string[] ` Dependencies to keep external to the bundle. ("all" (default), "none", or an array of module names) diff --git a/docs/react/api-node/builders/execute.md b/docs/react/api-node/builders/execute.md index c56a5976f4..142e72e3f7 100644 --- a/docs/react/api-node/builders/execute.md +++ b/docs/react/api-node/builders/execute.md @@ -31,7 +31,7 @@ The host to inspect the process on Default: `inspect` -Type: `string | boolean` +Type: `string | boolean ` Ensures the app is starting with debugging diff --git a/docs/react/api-workspace/builders/run-commands.md b/docs/react/api-workspace/builders/run-commands.md index 6edfddf119..b8bed6f2f8 100644 --- a/docs/react/api-workspace/builders/run-commands.md +++ b/docs/react/api-workspace/builders/run-commands.md @@ -201,7 +201,7 @@ You may specify a custom .env file path ### outputPath -Type: `string | string[]` +Type: `string | string[] ` Allows you to specify where the build artifacts are stored. This allows Nx Cloud to pick them up correctly, in the case that the build artifacts are placed somewhere other than the top level dist folder. diff --git a/docs/react/cli/migrate.md b/docs/react/cli/migrate.md index 4ce4814282..2fcd071917 100644 --- a/docs/react/cli/migrate.md +++ b/docs/react/cli/migrate.md @@ -4,7 +4,6 @@ - Migrate packages and create migrations.json (e.g., nx migrate @nrwl/workspace@latest) - Run migrations (e.g., nx migrate --run-migrations=migrations.json) - ## Usage ```bash nx migrate diff --git a/package.json b/package.json index e922ebcc58..1463594e10 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "postcss-import": "12.0.1", "postcss-loader": "3.0.0", "precise-commits": "1.0.2", - "prettier": "2.0.4", + "prettier": "2.1.2", "pretty-quick": "^2.0.1", "protractor": "5.4.3", "raw-loader": "3.1.0", diff --git a/packages/web/README.md b/packages/web/README.md index d0fcc09be6..16a74e4b18 100644 --- a/packages/web/README.md +++ b/packages/web/README.md @@ -10,7 +10,7 @@ {{getting-started}} -```angular [a workspace with a single Angular application] +```angular [a workspace with a single Angular application] ? Workspace name (e.g., org name) happyorg ? What to create in the new workspace web components [a workspace with a single app built using web components] ? Application name myapp ? Default stylesheet format CSS diff --git a/packages/workspace/migrations.json b/packages/workspace/migrations.json index 72cd4af18d..6d8a1926a0 100644 --- a/packages/workspace/migrations.json +++ b/packages/workspace/migrations.json @@ -782,6 +782,15 @@ "alwaysAddToPackageJson": false } } + }, + "10.4.0": { + "version": "10.4.0-beta.1", + "packages": { + "prettier": { + "version": "2.1.2", + "alwaysAddToPackageJson": false + } + } } } } diff --git a/packages/workspace/src/utils/versions.ts b/packages/workspace/src/utils/versions.ts index 9b254441e4..fca8d617bf 100644 --- a/packages/workspace/src/utils/versions.ts +++ b/packages/workspace/src/utils/versions.ts @@ -2,7 +2,7 @@ export const nxVersion = '*'; export const angularCliVersion = '~10.1.3'; export const typescriptVersion = '~4.0.3'; -export const prettierVersion = '2.0.4'; +export const prettierVersion = '2.1.2'; export const typescriptESLintVersion = '4.3.0'; export const eslintVersion = '7.10.0'; export const eslintConfigPrettierVersion = '6.0.0'; diff --git a/yarn.lock b/yarn.lock index 415556d357..7eb8c85807 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18265,10 +18265,10 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -prettier@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef" - integrity sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w== +prettier@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5" + integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg== pretty-bytes@5.3.0: version "5.3.0"