Skip to content

Commit

Permalink
feat(linter): support eslint v8 (nrwl#7800)
Browse files Browse the repository at this point in the history 
* feat(core): support eslint v8

* fix(core): align version of eslint across all packages
  • Loading branch information
@JamesHenry @vsavkin
JamesHenry authored and vsavkin committed Nov 19, 2021
1 parent 8fa36ff commit 98ffe85
Show file tree
Hide file tree
Showing 37 changed files with 1,033 additions and 969 deletions.
6 changes: 5 additions & 1 deletion .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ jobs:
- run:
name: Run E2E Tests
command: |
npx nx affected --target=e2e --base=$NX_BASE --head=$NX_HEAD --exclude=e2e-react-native,e2e-detox --parallel --max-parallel=1
npx nx affected --target=e2e --base=$NX_BASE --head=$NX_HEAD --exclude=e2e-react-native,e2e-detox,e2e-gatsby --parallel --max-parallel=1
no_output_timeout: 45m
- run:
name: Stop All Running Agents for This CI Run
Expand Down Expand Up @@ -257,6 +257,10 @@ workflows:
name: 'agent9'
pm: 'npm'
os: 'macos'
- agent:
name: 'agent10'
pm: 'npm'
os: 'macos'
# - agent:
# name: 'agent10'
# pm: 'npm'
Expand Down
44 changes: 22 additions & 22 deletions docs/angular/api-nx-devkit/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1061,9 +1061,9 @@ By default javascript-style comments are allowed.

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |

#### Parameters

Expand Down Expand Up @@ -1113,9 +1113,9 @@ Reads a json file, removes all comments and parses JSON.

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |

#### Parameters

Expand All @@ -1139,9 +1139,9 @@ Reads a JSON file and returns the object the JSON content represents.

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |

#### Parameters

Expand Down Expand Up @@ -1346,9 +1346,9 @@ By default the JSON string is formatted with a 2 space intendation to be easy re

#### Type parameters

| Name | Type |
| :--- | :------------------------- |
| `T` | extends ` object``object ` |
| Name | Type |
| :--- | :-------------------------- |
| `T` | extends `object` = `object` |

#### Parameters

Expand Down Expand Up @@ -1459,10 +1459,10 @@ Updates a JSON value to the file system tree

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| `U` | extends ` object``T ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |
| `U` | extends `object` = `T` |

#### Parameters

Expand Down Expand Up @@ -1569,9 +1569,9 @@ Writes a JSON value to the file system tree

#### Type parameters

| Name | Type |
| :--- | :------------------------- |
| `T` | extends ` object``object ` |
| Name | Type |
| :--- | :-------------------------- |
| `T` | extends `object` = `object` |

#### Parameters

Expand All @@ -1596,9 +1596,9 @@ Serializes the given data to JSON and writes it to a file.

#### Type parameters

| Name | Type |
| :--- | :------------------------- |
| `T` | extends ` object``object ` |
| Name | Type |
| :--- | :-------------------------- |
| `T` | extends `object` = `object` |

#### Parameters

Expand Down
44 changes: 22 additions & 22 deletions docs/node/api-nx-devkit/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1061,9 +1061,9 @@ By default javascript-style comments are allowed.

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |

#### Parameters

Expand Down Expand Up @@ -1113,9 +1113,9 @@ Reads a json file, removes all comments and parses JSON.

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |

#### Parameters

Expand All @@ -1139,9 +1139,9 @@ Reads a JSON file and returns the object the JSON content represents.

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |

#### Parameters

Expand Down Expand Up @@ -1346,9 +1346,9 @@ By default the JSON string is formatted with a 2 space intendation to be easy re

#### Type parameters

| Name | Type |
| :--- | :------------------------- |
| `T` | extends ` object``object ` |
| Name | Type |
| :--- | :-------------------------- |
| `T` | extends `object` = `object` |

#### Parameters

Expand Down Expand Up @@ -1459,10 +1459,10 @@ Updates a JSON value to the file system tree

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| `U` | extends ` object``T ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |
| `U` | extends `object` = `T` |

#### Parameters

Expand Down Expand Up @@ -1569,9 +1569,9 @@ Writes a JSON value to the file system tree

#### Type parameters

| Name | Type |
| :--- | :------------------------- |
| `T` | extends ` object``object ` |
| Name | Type |
| :--- | :-------------------------- |
| `T` | extends `object` = `object` |

#### Parameters

Expand All @@ -1596,9 +1596,9 @@ Serializes the given data to JSON and writes it to a file.

#### Type parameters

| Name | Type |
| :--- | :------------------------- |
| `T` | extends ` object``object ` |
| Name | Type |
| :--- | :-------------------------- |
| `T` | extends `object` = `object` |

#### Parameters

Expand Down
44 changes: 22 additions & 22 deletions docs/react/api-nx-devkit/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1061,9 +1061,9 @@ By default javascript-style comments are allowed.

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |

#### Parameters

Expand Down Expand Up @@ -1113,9 +1113,9 @@ Reads a json file, removes all comments and parses JSON.

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |

#### Parameters

Expand All @@ -1139,9 +1139,9 @@ Reads a JSON file and returns the object the JSON content represents.

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |

#### Parameters

Expand Down Expand Up @@ -1346,9 +1346,9 @@ By default the JSON string is formatted with a 2 space intendation to be easy re

#### Type parameters

| Name | Type |
| :--- | :------------------------- |
| `T` | extends ` object``object ` |
| Name | Type |
| :--- | :-------------------------- |
| `T` | extends `object` = `object` |

#### Parameters

Expand Down Expand Up @@ -1459,10 +1459,10 @@ Updates a JSON value to the file system tree

#### Type parameters

| Name | Type |
| :--- | :---------------------- |
| `T` | extends ` object``any ` |
| `U` | extends ` object``T ` |
| Name | Type |
| :--- | :----------------------- |
| `T` | extends `object` = `any` |
| `U` | extends `object` = `T` |

#### Parameters

Expand Down Expand Up @@ -1569,9 +1569,9 @@ Writes a JSON value to the file system tree

#### Type parameters

| Name | Type |
| :--- | :------------------------- |
| `T` | extends ` object``object ` |
| Name | Type |
| :--- | :-------------------------- |
| `T` | extends `object` = `object` |

#### Parameters

Expand All @@ -1596,9 +1596,9 @@ Serializes the given data to JSON and writes it to a file.

#### Type parameters

| Name | Type |
| :--- | :------------------------- |
| `T` | extends ` object``object ` |
| Name | Type |
| :--- | :-------------------------- |
| `T` | extends `object` = `object` |

#### Parameters

Expand Down
9 changes: 7 additions & 2 deletions nx.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,13 @@
"sitemap"
],
"useDaemonProcess": true,
"runtimeCacheInputs": ["echo $SELECTED_CLI", "echo $E2E_CI_CACHE_KEY"],
"cacheDirectory": "/tmp/nx-cache"
"runtimeCacheInputs": [
"echo $SELECTED_CLI",
"echo $NX_E2E_CI_CACHE_KEY"
],
"cacheDirectory": "/tmp/nx-cache",
"parallel": 1,
"scan": false
}
}
},
Expand Down
30 changes: 15 additions & 15 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nrwl/nx-source",
"version": "13.1.3",
"version": "13.3.0-beta.2",
"description": "Smart, Extensible Build Framework",
"homepage": "https://nx.dev",
"private": true,
Expand Down Expand Up @@ -61,18 +61,19 @@
"@ngrx/schematics": "~13.0.0",
"@ngrx/store": "~13.0.0",
"@ngrx/store-devtools": "~13.0.0",
"@nrwl/cli": "13.2.0-rc.4",
"@nrwl/cypress": "13.2.0-rc.4",
"@nrwl/eslint-plugin-nx": "13.2.0-rc.4",
"@nrwl/jest": "13.2.0-rc.4",
"@nrwl/linter": "13.2.0-rc.4",
"@nrwl/next": "13.2.0-rc.4",
"@nrwl/node": "13.2.0-rc.4",
"@nrwl/nx-cloud": "13.0.0-beta.11",
"@nrwl/react": "13.2.0-rc.4",
"@nrwl/tao": "13.2.0-rc.4",
"@nrwl/web": "13.2.0-rc.4",
"@nrwl/workspace": "13.2.0-rc.4",
"@nrwl/cli": "13.3.0-beta.2",
"@nrwl/js": "13.3.0-beta.2",
"@nrwl/workspace": "13.3.0-beta.2",
"@nrwl/cypress": "13.3.0-beta.2",
"@nrwl/eslint-plugin-nx": "13.3.0-beta.2",
"@nrwl/jest": "13.3.0-beta.2",
"@nrwl/linter": "13.3.0-beta.2",
"@nrwl/next": "13.3.0-beta.2",
"@nrwl/node": "13.3.0-beta.2",
"@nrwl/nx-cloud": "13.0.0-beta.12",
"@nrwl/react": "13.3.0-beta.2",
"@nrwl/tao": "13.3.0-beta.2",
"@nrwl/web": "13.3.0-beta.2",
"@parcel/watcher": "2.0.0-alpha.11",
"@phenomnomnominal/tsquery": "4.1.1",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.1",
Expand Down Expand Up @@ -298,5 +299,4 @@
"ng-packagr/rxjs": "6.6.7",
"**/xmlhttprequest-ssl": "~1.6.2"
}
}

}
4 changes: 1 addition & 3 deletions packages/angular/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
"outputs": ["coverage/packages/angular"]
},
"build-base": {
"executor": "@nrwl/node:package",
"executor": "@nrwl/js:tsc",
"options": {
"outputPath": "build/packages/angular",
"tsConfig": "packages/angular/tsconfig.lib.json",
"packageJson": "packages/angular/package.json",
"main": "packages/angular/index.ts",
"updateBuildableProjectDepsInPackageJson": false,
"assets": [
{
"input": "packages/angular",
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function buildAppWithCustomWebpackConfiguration(
context: BuilderContext,
pathToWebpackConfig: string
) {
return executeBrowserBuilder(options, context, {
return executeBrowserBuilder(options, context as any, {
webpackConfiguration: async (baseWebpackConfig) => {
const customWebpackConfiguration = require(pathToWebpackConfig);
// The extra Webpack configuration file can export a synchronous or asynchronous function,
Expand Down Expand Up @@ -127,4 +127,4 @@ function run(
);
}

export default createBuilder<JsonObject & BrowserBuilderSchema>(run);
export default createBuilder<JsonObject & BrowserBuilderSchema>(run) as any;
Loading

0 comments on commit 98ffe85

Please sign in to comment.