Skip to content

Commit c6a489c

Browse files
authored
Chore: Bump Nx to 18.1.x (#85185)
* chore: bump nx to latest version * build(plugin-configs): reduce wonky webpack output when logged via nx * revert(plugin-configs): remove infrastructureLogging property
1 parent d290aaf commit c6a489c

File tree

4 files changed

+84
-78
lines changed

4 files changed

+84
-78
lines changed

nx.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@
1212
"outputs": ["{projectRoot}/dist"]
1313
}
1414
},
15-
"affected": {
16-
"defaultBase": "main"
17-
}
15+
"defaultBase": "main"
1816
}

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
"mutationobserver-shim": "0.3.7",
198198
"ngtemplate-loader": "2.1.0",
199199
"node-notifier": "10.0.1",
200-
"nx": "18.0.8",
200+
"nx": "18.1.3",
201201
"postcss": "8.4.38",
202202
"postcss-loader": "8.1.1",
203203
"postcss-reporter": "7.1.0",

packages/grafana-plugin-configs/webpack.config.ts

+23-22
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import CopyWebpackPlugin from 'copy-webpack-plugin';
22
import ESLintPlugin from 'eslint-webpack-plugin';
33
import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
44
import path from 'path';
5+
// @ts-expect-error - there are no types for this package
56
import ReplaceInFileWebpackPlugin from 'replace-in-file-webpack-plugin';
6-
import { Configuration, DefinePlugin } from 'webpack';
7+
import { Configuration } from 'webpack';
78

89
import { DIST_DIR } from './constants';
910
import { getPackageJson, getPluginJson, getEntries, hasLicense } from './utils';
@@ -185,27 +186,27 @@ const config = async (env: Record<string, unknown>): Promise<Configuration> => {
185186
],
186187
},
187188
]),
188-
env.development
189-
? new ForkTsCheckerWebpackPlugin({
190-
async: true,
191-
issue: {
192-
include: [{ file: '**/*.{ts,tsx}' }],
193-
},
194-
typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
195-
})
196-
: new DefinePlugin({}),
197-
env.development
198-
? new ESLintPlugin({
199-
extensions: ['.ts', '.tsx'],
200-
lintDirtyModulesOnly: true, // don't lint on start, only lint changed files
201-
cacheLocation: path.resolve(
202-
__dirname,
203-
'../../node_modules/.cache/eslint-webpack-plugin',
204-
path.basename(process.cwd()),
205-
'.eslintcache'
206-
),
207-
})
208-
: new DefinePlugin({}),
189+
...(env.development
190+
? [
191+
new ForkTsCheckerWebpackPlugin({
192+
async: true,
193+
issue: {
194+
include: [{ file: '**/*.{ts,tsx}' }],
195+
},
196+
typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') },
197+
}),
198+
new ESLintPlugin({
199+
extensions: ['.ts', '.tsx'],
200+
lintDirtyModulesOnly: true, // don't lint on start, only lint changed files
201+
cacheLocation: path.resolve(
202+
__dirname,
203+
'../../node_modules/.cache/eslint-webpack-plugin',
204+
path.basename(process.cwd()),
205+
'.eslintcache'
206+
),
207+
}),
208+
]
209+
: []),
209210
],
210211

211212
resolve: {

yarn.lock

+59-52
Original file line numberDiff line numberDiff line change
@@ -5483,15 +5483,15 @@ __metadata:
54835483
languageName: node
54845484
linkType: hard
54855485

5486-
"@nrwl/tao@npm:18.0.8":
5487-
version: 18.0.8
5488-
resolution: "@nrwl/tao@npm:18.0.8"
5486+
"@nrwl/tao@npm:18.1.3":
5487+
version: 18.1.3
5488+
resolution: "@nrwl/tao@npm:18.1.3"
54895489
dependencies:
5490-
nx: "npm:18.0.8"
5490+
nx: "npm:18.1.3"
54915491
tslib: "npm:^2.3.0"
54925492
bin:
54935493
tao: index.js
5494-
checksum: 10/136b855a496cbaa857a2341048178ef5e54f26a9de9edb314a8c7f6ca799c4c56d3eea83d72a94ae38c374b7cd0bec0f3745d67d05ffed36b43a1df5b4b54e45
5494+
checksum: 10/338bf2cf323dc1accf252ce6650f182b8550948cf647005178679ed36ef8e5ec49ef11f20f249b83e1be671fac9f1b6c186662a4412a0c086068209de0afdd58
54955495
languageName: node
54965496
linkType: hard
54975497

@@ -5513,72 +5513,72 @@ __metadata:
55135513
languageName: node
55145514
linkType: hard
55155515

5516-
"@nx/nx-darwin-arm64@npm:18.0.8":
5517-
version: 18.0.8
5518-
resolution: "@nx/nx-darwin-arm64@npm:18.0.8"
5516+
"@nx/nx-darwin-arm64@npm:18.1.3":
5517+
version: 18.1.3
5518+
resolution: "@nx/nx-darwin-arm64@npm:18.1.3"
55195519
conditions: os=darwin & cpu=arm64
55205520
languageName: node
55215521
linkType: hard
55225522

5523-
"@nx/nx-darwin-x64@npm:18.0.8":
5524-
version: 18.0.8
5525-
resolution: "@nx/nx-darwin-x64@npm:18.0.8"
5523+
"@nx/nx-darwin-x64@npm:18.1.3":
5524+
version: 18.1.3
5525+
resolution: "@nx/nx-darwin-x64@npm:18.1.3"
55265526
conditions: os=darwin & cpu=x64
55275527
languageName: node
55285528
linkType: hard
55295529

5530-
"@nx/nx-freebsd-x64@npm:18.0.8":
5531-
version: 18.0.8
5532-
resolution: "@nx/nx-freebsd-x64@npm:18.0.8"
5530+
"@nx/nx-freebsd-x64@npm:18.1.3":
5531+
version: 18.1.3
5532+
resolution: "@nx/nx-freebsd-x64@npm:18.1.3"
55335533
conditions: os=freebsd & cpu=x64
55345534
languageName: node
55355535
linkType: hard
55365536

5537-
"@nx/nx-linux-arm-gnueabihf@npm:18.0.8":
5538-
version: 18.0.8
5539-
resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.0.8"
5537+
"@nx/nx-linux-arm-gnueabihf@npm:18.1.3":
5538+
version: 18.1.3
5539+
resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.1.3"
55405540
conditions: os=linux & cpu=arm
55415541
languageName: node
55425542
linkType: hard
55435543

5544-
"@nx/nx-linux-arm64-gnu@npm:18.0.8":
5545-
version: 18.0.8
5546-
resolution: "@nx/nx-linux-arm64-gnu@npm:18.0.8"
5544+
"@nx/nx-linux-arm64-gnu@npm:18.1.3":
5545+
version: 18.1.3
5546+
resolution: "@nx/nx-linux-arm64-gnu@npm:18.1.3"
55475547
conditions: os=linux & cpu=arm64 & libc=glibc
55485548
languageName: node
55495549
linkType: hard
55505550

5551-
"@nx/nx-linux-arm64-musl@npm:18.0.8":
5552-
version: 18.0.8
5553-
resolution: "@nx/nx-linux-arm64-musl@npm:18.0.8"
5551+
"@nx/nx-linux-arm64-musl@npm:18.1.3":
5552+
version: 18.1.3
5553+
resolution: "@nx/nx-linux-arm64-musl@npm:18.1.3"
55545554
conditions: os=linux & cpu=arm64 & libc=musl
55555555
languageName: node
55565556
linkType: hard
55575557

5558-
"@nx/nx-linux-x64-gnu@npm:18.0.8":
5559-
version: 18.0.8
5560-
resolution: "@nx/nx-linux-x64-gnu@npm:18.0.8"
5558+
"@nx/nx-linux-x64-gnu@npm:18.1.3":
5559+
version: 18.1.3
5560+
resolution: "@nx/nx-linux-x64-gnu@npm:18.1.3"
55615561
conditions: os=linux & cpu=x64 & libc=glibc
55625562
languageName: node
55635563
linkType: hard
55645564

5565-
"@nx/nx-linux-x64-musl@npm:18.0.8":
5566-
version: 18.0.8
5567-
resolution: "@nx/nx-linux-x64-musl@npm:18.0.8"
5565+
"@nx/nx-linux-x64-musl@npm:18.1.3":
5566+
version: 18.1.3
5567+
resolution: "@nx/nx-linux-x64-musl@npm:18.1.3"
55685568
conditions: os=linux & cpu=x64 & libc=musl
55695569
languageName: node
55705570
linkType: hard
55715571

5572-
"@nx/nx-win32-arm64-msvc@npm:18.0.8":
5573-
version: 18.0.8
5574-
resolution: "@nx/nx-win32-arm64-msvc@npm:18.0.8"
5572+
"@nx/nx-win32-arm64-msvc@npm:18.1.3":
5573+
version: 18.1.3
5574+
resolution: "@nx/nx-win32-arm64-msvc@npm:18.1.3"
55755575
conditions: os=win32 & cpu=arm64
55765576
languageName: node
55775577
linkType: hard
55785578

5579-
"@nx/nx-win32-x64-msvc@npm:18.0.8":
5580-
version: 18.0.8
5581-
resolution: "@nx/nx-win32-x64-msvc@npm:18.0.8"
5579+
"@nx/nx-win32-x64-msvc@npm:18.1.3":
5580+
version: 18.1.3
5581+
resolution: "@nx/nx-win32-x64-msvc@npm:18.1.3"
55825582
conditions: os=win32 & cpu=x64
55835583
languageName: node
55845584
linkType: hard
@@ -7026,13 +7026,20 @@ __metadata:
70267026
languageName: node
70277027
linkType: hard
70287028

7029-
"@remix-run/router@npm:1.14.2, @remix-run/router@npm:^1.5.0":
7029+
"@remix-run/router@npm:1.14.2":
70307030
version: 1.14.2
70317031
resolution: "@remix-run/router@npm:1.14.2"
70327032
checksum: 10/422844e88b985f1e287301b302c6cf8169c9eea792f80d40464f97b25393bb2e697228ebd7a7b61444d5a51c5873c4a637aad20acde5886a5caf62e833c5ceee
70337033
languageName: node
70347034
linkType: hard
70357035

7036+
"@remix-run/router@npm:^1.5.0":
7037+
version: 1.11.0
7038+
resolution: "@remix-run/router@npm:1.11.0"
7039+
checksum: 10/629ec578b9dfd3c5cb5de64a0798dd7846ec5ba0351aa66f42b1c65efb43da8f30366be59b825303648965b0df55b638c110949b24ef94fd62e98117fdfb0c0f
7040+
languageName: node
7041+
linkType: hard
7042+
70367043
"@rollup/plugin-image@npm:3.0.3":
70377044
version: 3.0.3
70387045
resolution: "@rollup/plugin-image@npm:3.0.3"
@@ -18762,7 +18769,7 @@ __metadata:
1876218769
ngtemplate-loader: "npm:2.1.0"
1876318770
node-forge: "npm:^1.3.1"
1876418771
node-notifier: "npm:10.0.1"
18765-
nx: "npm:18.0.8"
18772+
nx: "npm:18.1.3"
1876618773
ol: "npm:7.4.0"
1876718774
ol-ext: "npm:4.0.17"
1876818775
papaparse: "npm:5.4.1"
@@ -23825,21 +23832,21 @@ __metadata:
2382523832
languageName: node
2382623833
linkType: hard
2382723834

23828-
"nx@npm:18.0.8, nx@npm:>=17.1.2 < 19":
23829-
version: 18.0.8
23830-
resolution: "nx@npm:18.0.8"
23835+
"nx@npm:18.1.3, nx@npm:>=17.1.2 < 19":
23836+
version: 18.1.3
23837+
resolution: "nx@npm:18.1.3"
2383123838
dependencies:
23832-
"@nrwl/tao": "npm:18.0.8"
23833-
"@nx/nx-darwin-arm64": "npm:18.0.8"
23834-
"@nx/nx-darwin-x64": "npm:18.0.8"
23835-
"@nx/nx-freebsd-x64": "npm:18.0.8"
23836-
"@nx/nx-linux-arm-gnueabihf": "npm:18.0.8"
23837-
"@nx/nx-linux-arm64-gnu": "npm:18.0.8"
23838-
"@nx/nx-linux-arm64-musl": "npm:18.0.8"
23839-
"@nx/nx-linux-x64-gnu": "npm:18.0.8"
23840-
"@nx/nx-linux-x64-musl": "npm:18.0.8"
23841-
"@nx/nx-win32-arm64-msvc": "npm:18.0.8"
23842-
"@nx/nx-win32-x64-msvc": "npm:18.0.8"
23839+
"@nrwl/tao": "npm:18.1.3"
23840+
"@nx/nx-darwin-arm64": "npm:18.1.3"
23841+
"@nx/nx-darwin-x64": "npm:18.1.3"
23842+
"@nx/nx-freebsd-x64": "npm:18.1.3"
23843+
"@nx/nx-linux-arm-gnueabihf": "npm:18.1.3"
23844+
"@nx/nx-linux-arm64-gnu": "npm:18.1.3"
23845+
"@nx/nx-linux-arm64-musl": "npm:18.1.3"
23846+
"@nx/nx-linux-x64-gnu": "npm:18.1.3"
23847+
"@nx/nx-linux-x64-musl": "npm:18.1.3"
23848+
"@nx/nx-win32-arm64-msvc": "npm:18.1.3"
23849+
"@nx/nx-win32-x64-msvc": "npm:18.1.3"
2384323850
"@yarnpkg/lockfile": "npm:^1.1.0"
2384423851
"@yarnpkg/parsers": "npm:3.0.0-rc.46"
2384523852
"@zkochan/js-yaml": "npm:0.0.6"
@@ -23905,7 +23912,7 @@ __metadata:
2390523912
bin:
2390623913
nx: bin/nx.js
2390723914
nx-cloud: bin/nx-cloud.js
23908-
checksum: 10/f590a9a8d314161555c4a3d8fa7b2e57997eb7c3cd8d9639c24e735af23299850843898da1c682c08b6f60d1b9ab3e99e29b3caa8be8a3bd654419f427d7caa9
23915+
checksum: 10/216b91cda546c949fb4cc64ee036d1510482ceb6668f6f157d5c25c47dae179e26792867b163a68ca735f90559dfb04f7c811c791ef4d26cdd8799c498fec880
2390923916
languageName: node
2391023917
linkType: hard
2391123918

0 commit comments

Comments
 (0)