Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use yarn pnp #511

Merged
merged 1 commit into from
Nov 5, 2023
Merged

feat: use yarn pnp #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@
"@swc/jest": "^0.2.26",
"@testing-library/jest-dom": "^6.0.0",
"@testing-library/react": "^14.0.0",
"@types/jest": "^29.5.0",
"@types/jest": "^29.5.7",
"@types/lodash": "^4.14.195",
"@types/node": "^20.0.0",
"@types/react": "^18.2.31",
"@types/react-dom": "^18.2.14",
"@types/react-virtualized-auto-sizer": "^1.0.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"copy-webpack-plugin": "^11.0.0",
Expand Down Expand Up @@ -64,6 +66,7 @@
"webpack-livereload-plugin": "^3.0.2"
},
"dependencies": {
"@emotion/css": "^11.11.2",
"@grafana/data": "^10.1.5",
"@grafana/experimental": "^1.7.4",
"@grafana/runtime": "^10.1.5",
Expand All @@ -78,6 +81,5 @@
},
"homepage": "https://github.com/simPod/GrafanaJsonDatasource",
"engineStrict": true,
"nodeLinker": "node-modules",
"packageManager": "[email protected]"
}
4 changes: 2 additions & 2 deletions src/Component/QueryBuilderTag.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ export const QueryBuilderTag: ComponentType<QueryBuilderTagProps> = ({ name, val
const theme = useTheme();
const styles = getStyles({ theme, name });

const formattedValue = match(typeof value)
const formattedValue: React.ReactNode = match(typeof value)
.with('string', () => `"${value}"`)
.with('number', () => value)
.with('number', () => value as number)
.with('boolean', () => (value as boolean).toString())
.with('object', () => (value === null ? 'null' : `"${JSON.stringify(value)}"`))
.otherwise(() => `"${JSON.stringify(value)}"`);
Expand Down
31 changes: 17 additions & 14 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ __metadata:
languageName: node
linkType: hard

"@emotion/css@npm:11.11.2":
"@emotion/css@npm:11.11.2, @emotion/css@npm:^11.11.2":
version: 11.11.2
resolution: "@emotion/css@npm:11.11.2"
dependencies:
Expand Down Expand Up @@ -2427,13 +2427,13 @@ __metadata:
languageName: node
linkType: hard

"@types/jest@npm:^29.5.0":
version: 29.5.2
resolution: "@types/jest@npm:29.5.2"
"@types/jest@npm:^29.5.7":
version: 29.5.7
resolution: "@types/jest@npm:29.5.7"
dependencies:
expect: "npm:^29.0.0"
pretty-format: "npm:^29.0.0"
checksum: e85525fe83a0792632a31ca32968b33a0014d617442e9a515357d2aa8890052ef622b1f6fd25d48f4f1a3ab806bed94e6d9b056dea23a897464e0e35957ff654
checksum: 231c873f3d1ddac973b8f8f2ad7760677d941d85fb52d1c5dc4a311bafba4c2c1658a1040fd7054a51f4d1841f51c6ca4cabf70675ee4fa9e10fc5b8066e1de1
languageName: node
linkType: hard

Expand Down Expand Up @@ -2515,12 +2515,12 @@ __metadata:
languageName: node
linkType: hard

"@types/react-dom@npm:^18.0.0":
version: 18.0.10
resolution: "@types/react-dom@npm:18.0.10"
"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.14":
version: 18.2.14
resolution: "@types/react-dom@npm:18.2.14"
dependencies:
"@types/react": "npm:*"
checksum: a07b900a2d5559830f88b3e525cf279f9f04b4893f4d17e64f5adb08d8abe0e3151e0d3c0ea17d836104ae47594be577529a004265600e4304a43a93b0d5d61e
checksum: 1f79a7708d038cd651bdb21e01a99c594761bc9a40a565abe98958e1d27facfeb6e9824ddf6ae3504e7a56568f0f3da2380fe52ac18477b5864d2d5cf1386a9e
languageName: node
linkType: hard

Expand Down Expand Up @@ -2554,14 +2554,14 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:*":
version: 17.0.35
resolution: "@types/react@npm:17.0.35"
"@types/react@npm:*, @types/react@npm:^18.2.31":
version: 18.2.35
resolution: "@types/react@npm:18.2.35"
dependencies:
"@types/prop-types": "npm:*"
"@types/scheduler": "npm:*"
csstype: "npm:^3.0.2"
checksum: c24aeae3ca1b2621e30d98b28b9cfd3bcb3971ab3fc2273547543fa2bd98f9d5bffda841953297aaee6fe946ad0c22df6516258e00bb47f4b5e41a23164839ed
checksum: dbc19612ab404f06c3c9f150954a377ab223db5724905d39e3468a61e2be0a9fd9240e935af5c13cb5b3307a13bbaf2e8c09a810d720118120a8d0ac5aa9ff10
languageName: node
linkType: hard

Expand Down Expand Up @@ -5726,6 +5726,7 @@ __metadata:
resolution: "grafana-json-datasource@workspace:."
dependencies:
"@babel/core": "npm:^7.22.5"
"@emotion/css": "npm:^11.11.2"
"@grafana/data": "npm:^10.1.5"
"@grafana/eslint-config": "npm:^6.0.0"
"@grafana/experimental": "npm:^1.7.4"
Expand All @@ -5738,9 +5739,11 @@ __metadata:
"@swc/jest": "npm:^0.2.26"
"@testing-library/jest-dom": "npm:^6.0.0"
"@testing-library/react": "npm:^14.0.0"
"@types/jest": "npm:^29.5.0"
"@types/jest": "npm:^29.5.7"
"@types/lodash": "npm:^4.14.195"
"@types/node": "npm:^20.0.0"
"@types/react": "npm:^18.2.31"
"@types/react-dom": "npm:^18.2.14"
"@types/react-virtualized-auto-sizer": "npm:^1.0.0"
"@typescript-eslint/eslint-plugin": "npm:^6.0.0"
copy-webpack-plugin: "npm:^11.0.0"
Expand Down