2013-07-21 05:56:59 +08:00
|
|
|
{
|
2019-07-24 08:17:41 +08:00
|
|
|
"author": "Grafana Labs",
|
2021-04-21 01:03:30 +08:00
|
|
|
"license": "AGPL-3.0-only",
|
2018-12-20 16:25:04 +08:00
|
|
|
"private": true,
|
2014-01-19 23:13:28 +08:00
|
|
|
"name": "grafana",
|
2022-02-03 23:52:53 +08:00
|
|
|
"version": "8.5.0-pre",
|
2020-02-28 01:00:36 +08:00
|
|
|
"repository": "github:grafana/grafana",
|
2020-03-25 14:19:57 +08:00
|
|
|
"scripts": {
|
|
|
|
|
"api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
|
2021-12-16 00:00:37 +08:00
|
|
|
"build": "yarn i18n:compile && NODE_ENV=production webpack --config scripts/webpack/webpack.prod.js",
|
2021-11-19 00:38:58 +08:00
|
|
|
"build:nominify": "yarn run build --env noMinify=1",
|
2021-12-16 00:00:37 +08:00
|
|
|
"dev": "yarn i18n:compile && webpack --progress --color --config scripts/webpack/webpack.dev.js",
|
2020-03-25 14:19:57 +08:00
|
|
|
"e2e": "./e2e/start-and-run-suite",
|
2020-05-03 19:51:30 +08:00
|
|
|
"e2e:debug": "./e2e/start-and-run-suite debug",
|
2020-03-25 14:19:57 +08:00
|
|
|
"e2e:dev": "./e2e/start-and-run-suite dev",
|
2022-01-13 02:15:29 +08:00
|
|
|
"e2e:benchmark:live": "./e2e/start-and-run-suite benchmark live",
|
2020-11-09 22:14:04 +08:00
|
|
|
"test": "jest --notify --watch",
|
2022-03-04 18:37:33 +08:00
|
|
|
"test:coverage": "jest --coverage",
|
|
|
|
|
"test:coverage:changes": "jest --coverage --changedSince=origin/main",
|
2021-09-14 19:23:17 +08:00
|
|
|
"test:accessibility-report": "./scripts/generate-a11y-report.sh",
|
2020-12-01 17:32:12 +08:00
|
|
|
"lint": "yarn run lint:ts && yarn run lint:sass",
|
|
|
|
|
"lint:ts": "eslint . --ext .js,.tsx,.ts --cache",
|
2021-10-20 17:34:24 +08:00
|
|
|
"lint:sass": "yarn stylelint '{public/sass,packages}/**/*.scss' --cache",
|
2022-02-09 20:41:39 +08:00
|
|
|
"test:ci": "betterer ci && mkdir -p reports/junit && JEST_JUNIT_OUTPUT_DIR=reports/junit jest --ci --reporters=default --reporters=jest-junit -w ${TEST_MAX_WORKERS:-100%}",
|
2020-03-25 14:19:57 +08:00
|
|
|
"lint:fix": "yarn lint --fix",
|
2020-04-21 16:41:50 +08:00
|
|
|
"packages:build": "lerna run clean && lerna run build --ignore @grafana-plugins/input-datasource",
|
|
|
|
|
"packages:docsExtract": "rm -rf ./reports/docs && lerna run docsExtract",
|
2020-04-28 15:53:58 +08:00
|
|
|
"packages:docsToMarkdown": "api-documenter markdown --input-folder ./reports/docs/ --output-folder ./docs/sources/packages_api/ --hugo",
|
2020-03-25 14:19:57 +08:00
|
|
|
"packages:prepare": "lerna version --no-push --no-git-tag-version --force-publish --exact",
|
2022-03-09 22:29:11 +08:00
|
|
|
"packages:publish": "lerna publish from-package --contents dist --no-verify-access",
|
|
|
|
|
"packages:publishCanary": "lerna publish from-package --contents dist --dist-tag canary --yes --no-verify-access",
|
|
|
|
|
"packages:publishLatest": "lerna publish from-package --contents dist --yes --no-verify-access",
|
|
|
|
|
"packages:publishNext": "lerna publish from-package --contents dist --dist-tag next --yes --no-verify-access",
|
|
|
|
|
"packages:publishTest": "lerna publish from-package --contents dist --dist-tag test --yes --no-verify-access",
|
|
|
|
|
"packages:publishPrevious": "lerna publish from-package --contents dist --dist-tag previous --yes --no-verify-access",
|
2020-07-07 20:07:00 +08:00
|
|
|
"packages:publishDev": "lerna publish from-package --contents dist --dist-tag dev --yes --registry http://grafana-npm.local:4873 --force-publish=*",
|
2020-03-25 14:19:57 +08:00
|
|
|
"packages:typecheck": "lerna run typecheck",
|
2020-10-14 20:35:55 +08:00
|
|
|
"packages:clean": "lerna run clean",
|
2022-02-22 00:16:45 +08:00
|
|
|
"precommit": "yarn run lint-staged",
|
2022-03-04 17:49:50 +08:00
|
|
|
"prettier:check": "prettier --check --list-different=false --loglevel=warn \"**/*.{ts,tsx,scss,md,mdx}\"",
|
2022-03-30 16:44:18 +08:00
|
|
|
"prettier:checkDocs": "prettier --check --list-different=false --loglevel=warn \"docs/**/*.md\" \"packages/**/*.{ts,tsx,scss,md,mdx}\"",
|
2022-03-04 17:49:50 +08:00
|
|
|
"prettier:write": "prettier --list-different \"**/*.{js,ts,tsx,scss,md,mdx}\" --write",
|
2021-12-16 00:00:37 +08:00
|
|
|
"start": "yarn themes:generate && yarn dev --watch",
|
|
|
|
|
"start:noTsCheck": "yarn start --env noTsCheck=1",
|
|
|
|
|
"start:hot": "yarn themes:generate && NODE_ENV=hot yarn dev --config scripts/webpack/webpack.hot.js",
|
2020-03-25 14:19:57 +08:00
|
|
|
"stats": "webpack --mode production --config scripts/webpack/webpack.prod.js --profile --json > compilation-stats.json",
|
2020-11-24 17:38:41 +08:00
|
|
|
"storybook": "yarn workspace @grafana/ui storybook --ci",
|
|
|
|
|
"storybook:build": "yarn workspace @grafana/ui storybook:build",
|
2021-09-01 18:31:50 +08:00
|
|
|
"themes:generate": "ts-node --transpile-only --project ./scripts/cli/tsconfig.json ./scripts/cli/generateSassVariableFiles.ts",
|
2020-12-01 17:32:12 +08:00
|
|
|
"typecheck": "tsc --noEmit && yarn run packages:typecheck",
|
2020-04-21 16:14:14 +08:00
|
|
|
"plugins:build-bundled": "grafana-toolkit plugin:bundle-managed",
|
2020-09-07 19:17:03 +08:00
|
|
|
"watch": "yarn start -d watch,start core:start --watchTheme",
|
2021-11-02 18:53:27 +08:00
|
|
|
"ci:test-frontend": "yarn run test:ci && yarn grafana-toolkit node-version-check",
|
2021-12-16 00:00:37 +08:00
|
|
|
"i18n:extract": "lingui extract",
|
|
|
|
|
"i18n:compile": "lingui compile",
|
2022-02-09 20:41:39 +08:00
|
|
|
"postinstall": "husky install",
|
|
|
|
|
"betterer": "betterer"
|
2020-03-25 14:19:57 +08:00
|
|
|
},
|
2020-04-29 03:26:36 +08:00
|
|
|
"grafana": {
|
2022-02-02 23:43:37 +08:00
|
|
|
"whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v8-4/",
|
2021-05-13 17:37:45 +08:00
|
|
|
"releaseNotesUrl": "https://grafana.com/docs/grafana/next/release-notes/"
|
2020-04-29 03:26:36 +08:00
|
|
|
},
|
2020-03-25 14:19:57 +08:00
|
|
|
"lint-staged": {
|
2020-08-11 23:52:44 +08:00
|
|
|
"*.{js,ts,tsx}": [
|
2022-02-22 00:16:45 +08:00
|
|
|
"betterer precommit",
|
2022-03-04 17:49:50 +08:00
|
|
|
"eslint --ext .js,.tsx,.ts --cache --fix",
|
|
|
|
|
"prettier --write"
|
2020-08-11 23:52:44 +08:00
|
|
|
],
|
2021-08-06 21:52:36 +08:00
|
|
|
"*.{json,scss,md,mdx}": [
|
2020-05-05 17:54:15 +08:00
|
|
|
"prettier --write"
|
2020-03-25 14:19:57 +08:00
|
|
|
],
|
|
|
|
|
"*pkg/**/*.go": [
|
2020-05-05 17:54:15 +08:00
|
|
|
"gofmt -w -s"
|
2020-03-25 14:19:57 +08:00
|
|
|
]
|
|
|
|
|
},
|
2013-07-21 05:56:59 +08:00
|
|
|
"devDependencies": {
|
2022-03-23 22:56:44 +08:00
|
|
|
"@babel/core": "7.17.8",
|
2022-02-21 20:50:53 +08:00
|
|
|
"@babel/plugin-proposal-class-properties": "7.16.7",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@babel/plugin-proposal-nullish-coalescing-operator": "7.16.7",
|
2022-02-17 19:47:59 +08:00
|
|
|
"@babel/plugin-proposal-object-rest-spread": "7.17.3",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@babel/plugin-proposal-optional-chaining": "7.16.7",
|
2021-04-01 16:32:00 +08:00
|
|
|
"@babel/plugin-syntax-dynamic-import": "7.8.3",
|
2022-02-24 19:50:34 +08:00
|
|
|
"@babel/plugin-transform-react-constant-elements": "7.17.6",
|
2022-02-08 21:08:32 +08:00
|
|
|
"@babel/plugin-transform-runtime": "7.17.0",
|
2022-02-07 21:08:10 +08:00
|
|
|
"@babel/plugin-transform-typescript": "7.16.8",
|
|
|
|
|
"@babel/preset-env": "7.16.11",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@babel/preset-react": "7.16.7",
|
|
|
|
|
"@babel/preset-typescript": "7.16.7",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@betterer/cli": "5.1.7",
|
|
|
|
|
"@betterer/regexp": "5.1.7",
|
2022-01-07 17:21:04 +08:00
|
|
|
"@emotion/eslint-plugin": "11.7.0",
|
2020-11-27 17:21:28 +08:00
|
|
|
"@grafana/api-documenter": "7.11.2",
|
2021-10-08 22:19:10 +08:00
|
|
|
"@grafana/e2e": "workspace:*",
|
2022-03-04 17:49:50 +08:00
|
|
|
"@grafana/eslint-config": "3.0.0",
|
2021-10-08 22:19:10 +08:00
|
|
|
"@grafana/toolkit": "workspace:*",
|
2022-02-10 21:37:39 +08:00
|
|
|
"@grafana/tsconfig": "^1.2.0-rc1",
|
2022-02-07 21:08:10 +08:00
|
|
|
"@lingui/cli": "3.13.2",
|
|
|
|
|
"@lingui/macro": "3.13.2",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@microsoft/api-extractor": "7.19.5",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@react-types/button": "3.4.4",
|
|
|
|
|
"@react-types/menu": "3.5.2",
|
|
|
|
|
"@react-types/overlays": "3.5.4",
|
|
|
|
|
"@react-types/shared": "3.11.2",
|
2021-10-27 21:21:07 +08:00
|
|
|
"@rtsao/plugin-proposal-class-properties": "7.0.1-patch.1",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@swc/core": "1.2.160",
|
|
|
|
|
"@swc/helpers": "0.3.8",
|
2022-03-27 01:45:42 +08:00
|
|
|
"@testing-library/dom": "8.12.0",
|
2022-02-07 21:08:10 +08:00
|
|
|
"@testing-library/jest-dom": "5.16.2",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@testing-library/react": "12.1.4",
|
2021-10-20 22:37:17 +08:00
|
|
|
"@testing-library/react-hooks": "7.0.2",
|
2021-11-30 17:45:21 +08:00
|
|
|
"@testing-library/user-event": "13.5.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@types/angular": "1.8.4",
|
|
|
|
|
"@types/angular-route": "1.7.2",
|
2021-12-14 20:15:23 +08:00
|
|
|
"@types/classnames": "2.3.0",
|
2021-05-17 20:18:54 +08:00
|
|
|
"@types/common-tags": "^1.8.0",
|
2021-12-06 23:35:48 +08:00
|
|
|
"@types/d3": "7.1.0",
|
2021-01-19 23:34:43 +08:00
|
|
|
"@types/d3-force": "^2.1.0",
|
2019-08-20 17:14:53 +08:00
|
|
|
"@types/d3-scale-chromatic": "1.3.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@types/debounce-promise": "3.1.4",
|
|
|
|
|
"@types/enzyme": "3.10.11",
|
2020-02-14 22:16:07 +08:00
|
|
|
"@types/enzyme-adapter-react-16": "1.0.6",
|
2022-02-07 21:46:02 +08:00
|
|
|
"@types/eslint": "8.4.1",
|
2022-02-07 21:08:10 +08:00
|
|
|
"@types/file-saver": "2.0.5",
|
2021-12-06 23:34:19 +08:00
|
|
|
"@types/google.analytics": "^0.0.42",
|
2021-10-27 21:21:07 +08:00
|
|
|
"@types/grafana__slate-react": "npm:@types/slate-react@0.22.5",
|
2022-02-07 21:08:10 +08:00
|
|
|
"@types/history": "4.7.11",
|
2021-05-17 20:18:54 +08:00
|
|
|
"@types/hoist-non-react-statics": "3.3.1",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@types/jest": "27.4.1",
|
|
|
|
|
"@types/jquery": "3.5.14",
|
2021-05-18 20:42:57 +08:00
|
|
|
"@types/jsurl": "^1.2.28",
|
2021-12-16 00:00:37 +08:00
|
|
|
"@types/lingui__macro": "^3",
|
2022-03-31 17:19:33 +08:00
|
|
|
"@types/lodash": "4.14.181",
|
2021-05-11 16:38:10 +08:00
|
|
|
"@types/logfmt": "^1.2.1",
|
2022-03-29 19:13:31 +08:00
|
|
|
"@types/mousetrap": "1.6.9",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@types/node": "16.11.26",
|
2022-02-07 21:08:10 +08:00
|
|
|
"@types/papaparse": "5.3.2",
|
2021-05-17 20:18:54 +08:00
|
|
|
"@types/pluralize": "^0.0.29",
|
2022-01-28 17:07:34 +08:00
|
|
|
"@types/prismjs": "1.26.0",
|
2021-10-08 22:19:10 +08:00
|
|
|
"@types/rc-time-picker": "^3",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@types/react": "17.0.42",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@types/react-beautiful-dnd": "13.1.2",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@types/react-dom": "17.0.14",
|
|
|
|
|
"@types/react-grid-layout": "1.3.2",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@types/react-highlight-words": "0.16.4",
|
|
|
|
|
"@types/react-loadable": "5.5.6",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@types/react-redux": "7.1.23",
|
2022-02-07 21:08:10 +08:00
|
|
|
"@types/react-router-dom": "5.3.3",
|
2022-03-31 00:50:32 +08:00
|
|
|
"@types/react-table": "^7",
|
2021-08-18 17:23:34 +08:00
|
|
|
"@types/react-test-renderer": "17.0.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@types/react-transition-group": "4.4.4",
|
|
|
|
|
"@types/react-virtualized-auto-sizer": "1.0.1",
|
|
|
|
|
"@types/react-window": "1.8.5",
|
|
|
|
|
"@types/redux-mock-store": "1.0.3",
|
2019-08-20 17:14:53 +08:00
|
|
|
"@types/reselect": "2.2.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@types/semver": "7.3.9",
|
2021-07-23 22:33:53 +08:00
|
|
|
"@types/slate": "0.47.2",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@types/slate-plain-serializer": "0.7.2",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@types/testing-library__jest-dom": "5.14.3",
|
2020-02-14 22:16:07 +08:00
|
|
|
"@types/testing-library__react-hooks": "^3.2.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@types/tinycolor2": "1.4.3",
|
|
|
|
|
"@types/uuid": "8.3.4",
|
2022-03-22 17:20:05 +08:00
|
|
|
"@typescript-eslint/eslint-plugin": "5.16.0",
|
|
|
|
|
"@typescript-eslint/parser": "5.16.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@wojtekmaj/enzyme-adapter-react-17": "0.6.6",
|
2022-03-23 22:56:44 +08:00
|
|
|
"autoprefixer": "10.4.4",
|
|
|
|
|
"axios": "0.26.1",
|
|
|
|
|
"babel-jest": "27.5.1",
|
|
|
|
|
"babel-loader": "8.2.4",
|
2019-04-17 18:43:00 +08:00
|
|
|
"babel-plugin-angularjs-annotate": "0.10.0",
|
2021-12-16 00:00:37 +08:00
|
|
|
"babel-plugin-macros": "3.1.0",
|
2021-08-31 18:55:05 +08:00
|
|
|
"copy-webpack-plugin": "9.0.1",
|
2022-03-23 22:56:44 +08:00
|
|
|
"css-loader": "6.7.1",
|
2022-01-20 23:35:23 +08:00
|
|
|
"css-minimizer-webpack-plugin": "3.4.1",
|
2022-03-09 17:10:51 +08:00
|
|
|
"cypress": "9.5.1",
|
2020-02-14 22:16:07 +08:00
|
|
|
"enzyme": "3.11.0",
|
2021-12-16 21:03:43 +08:00
|
|
|
"enzyme-to-json": "3.6.2",
|
2022-03-16 17:25:21 +08:00
|
|
|
"eslint": "8.11.0",
|
2022-03-03 16:46:26 +08:00
|
|
|
"eslint-config-prettier": "8.5.0",
|
2022-03-23 22:56:44 +08:00
|
|
|
"eslint-plugin-jest": "26.1.2",
|
|
|
|
|
"eslint-plugin-jsdoc": "38.0.6",
|
2022-02-21 18:10:23 +08:00
|
|
|
"eslint-plugin-lodash": "7.4.0",
|
2022-03-23 22:56:44 +08:00
|
|
|
"eslint-plugin-react": "7.29.4",
|
2022-01-07 18:09:54 +08:00
|
|
|
"eslint-plugin-react-hooks": "4.3.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"eslint-webpack-plugin": "3.1.1",
|
2021-11-11 21:32:34 +08:00
|
|
|
"expose-loader": "3.1.0",
|
2021-08-31 18:55:05 +08:00
|
|
|
"file-loader": "6.2.0",
|
2022-03-23 22:56:44 +08:00
|
|
|
"fork-ts-checker-webpack-plugin": "7.2.1",
|
|
|
|
|
"fs-extra": "10.0.1",
|
2021-12-20 17:32:59 +08:00
|
|
|
"glob": "7.2.0",
|
2022-01-11 23:19:43 +08:00
|
|
|
"html-loader": "3.1.0",
|
2021-11-11 21:32:34 +08:00
|
|
|
"html-webpack-plugin": "5.5.0",
|
2022-01-11 23:19:06 +08:00
|
|
|
"http-server": "14.1.0",
|
2021-11-02 18:53:27 +08:00
|
|
|
"husky": "^7.0.0",
|
2021-10-08 22:19:10 +08:00
|
|
|
"iconscout-unicons-tarball": "https://github.com/grafana/icons/tarball/63056cd833ba7ee4e94904492b3a8c0cabc38d28",
|
2022-03-23 22:56:44 +08:00
|
|
|
"jest": "27.5.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"jest-canvas-mock": "2.3.1",
|
2020-06-15 19:06:37 +08:00
|
|
|
"jest-date-mock": "1.0.8",
|
2022-03-23 01:03:07 +08:00
|
|
|
"jest-fail-on-console": "2.3.0",
|
2021-11-03 22:42:06 +08:00
|
|
|
"jest-junit": "13.0.0",
|
2022-03-23 22:56:44 +08:00
|
|
|
"jest-matcher-utils": "27.5.1",
|
2022-02-09 00:45:20 +08:00
|
|
|
"jest-mock-console": "1.2.3",
|
2021-09-01 17:00:09 +08:00
|
|
|
"lerna": "^4.0.0",
|
2022-03-23 22:56:44 +08:00
|
|
|
"lint-staged": "12.3.7",
|
2022-03-04 20:13:35 +08:00
|
|
|
"mini-css-extract-plugin": "2.6.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"mutationobserver-shim": "0.3.7",
|
2021-08-31 18:55:05 +08:00
|
|
|
"ngtemplate-loader": "2.1.0",
|
2022-02-07 21:08:10 +08:00
|
|
|
"node-notifier": "10.0.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"nodemon": "2.0.15",
|
2022-03-23 22:56:44 +08:00
|
|
|
"postcss": "8.4.12",
|
2022-01-08 00:33:26 +08:00
|
|
|
"postcss-loader": "6.2.1",
|
|
|
|
|
"postcss-reporter": "7.0.5",
|
2022-02-07 21:08:10 +08:00
|
|
|
"postcss-scss": "4.0.3",
|
2022-03-23 19:34:45 +08:00
|
|
|
"prettier": "2.6.0",
|
2021-04-01 22:09:56 +08:00
|
|
|
"raw-loader": "4.0.2",
|
2022-01-07 18:09:54 +08:00
|
|
|
"react-refresh": "0.11.0",
|
2021-02-17 00:19:55 +08:00
|
|
|
"react-select-event": "^5.1.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"react-test-renderer": "17.0.2",
|
2020-04-10 07:53:33 +08:00
|
|
|
"redux-mock-store": "1.5.4",
|
2022-01-08 00:33:26 +08:00
|
|
|
"rimraf": "3.0.2",
|
2022-03-23 22:56:44 +08:00
|
|
|
"sass": "1.49.9",
|
2022-02-21 19:21:32 +08:00
|
|
|
"sass-loader": "12.6.0",
|
2022-02-07 21:08:10 +08:00
|
|
|
"sinon": "13.0.1",
|
2021-11-11 21:32:34 +08:00
|
|
|
"style-loader": "3.3.1",
|
2022-03-23 21:40:54 +08:00
|
|
|
"stylelint": "14.6.0",
|
2021-10-20 17:34:24 +08:00
|
|
|
"stylelint-config-prettier": "9.0.3",
|
2021-11-12 15:40:51 +08:00
|
|
|
"stylelint-config-sass-guidelines": "9.0.1",
|
2022-02-07 21:08:10 +08:00
|
|
|
"terser-webpack-plugin": "5.3.1",
|
2022-01-06 21:55:47 +08:00
|
|
|
"testing-library-selector": "0.2.1",
|
2022-02-07 21:08:10 +08:00
|
|
|
"ts-jest": "27.1.3",
|
2021-11-11 21:32:34 +08:00
|
|
|
"ts-loader": "9.2.6",
|
2022-03-07 15:55:08 +08:00
|
|
|
"ts-node": "10.7.0",
|
2022-01-13 18:08:38 +08:00
|
|
|
"typescript": "4.4.4",
|
2022-03-23 22:56:44 +08:00
|
|
|
"wait-on": "6.0.1",
|
2022-03-03 23:55:00 +08:00
|
|
|
"webpack": "5.70.0",
|
2021-11-11 21:32:34 +08:00
|
|
|
"webpack-bundle-analyzer": "4.5.0",
|
2022-02-07 21:08:10 +08:00
|
|
|
"webpack-cli": "4.9.2",
|
|
|
|
|
"webpack-dev-server": "4.7.4",
|
2021-11-10 01:05:01 +08:00
|
|
|
"webpack-merge": "5.8.0"
|
2013-07-21 05:56:59 +08:00
|
|
|
},
|
2014-05-31 13:46:39 +08:00
|
|
|
"dependencies": {
|
2022-01-07 17:21:04 +08:00
|
|
|
"@emotion/css": "11.7.1",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@emotion/react": "11.8.2",
|
|
|
|
|
"@grafana/aws-sdk": "0.0.35",
|
2021-10-08 22:19:10 +08:00
|
|
|
"@grafana/data": "workspace:*",
|
|
|
|
|
"@grafana/e2e-selectors": "workspace:*",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@grafana/experimental": "0.0.2-canary.22",
|
2022-03-15 20:56:05 +08:00
|
|
|
"@grafana/google-sdk": "0.0.3",
|
2022-03-31 16:51:49 +08:00
|
|
|
"@grafana/lezer-logql": "^0.0.11",
|
2021-10-08 22:19:10 +08:00
|
|
|
"@grafana/runtime": "workspace:*",
|
|
|
|
|
"@grafana/schema": "workspace:*",
|
2021-05-05 21:22:00 +08:00
|
|
|
"@grafana/slate-react": "0.22.10-grafana",
|
2021-10-08 22:19:10 +08:00
|
|
|
"@grafana/ui": "workspace:*",
|
|
|
|
|
"@jaegertracing/jaeger-ui-components": "workspace:*",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@kusto/monaco-kusto": "4.1.6",
|
|
|
|
|
"@lezer/common": "0.15.12",
|
|
|
|
|
"@lezer/lr": "0.15.8",
|
2022-02-07 21:08:10 +08:00
|
|
|
"@lingui/core": "3.13.2",
|
|
|
|
|
"@lingui/react": "3.13.2",
|
2022-01-28 17:04:59 +08:00
|
|
|
"@opentelemetry/api": "1.1.0",
|
2021-12-07 16:58:43 +08:00
|
|
|
"@opentelemetry/exporter-collector": "0.25.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@opentelemetry/semantic-conventions": "1.0.1",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@popperjs/core": "2.11.4",
|
|
|
|
|
"@react-aria/button": "3.4.3",
|
|
|
|
|
"@react-aria/dialog": "3.1.8",
|
|
|
|
|
"@react-aria/focus": "3.5.4",
|
|
|
|
|
"@react-aria/interactions": "3.8.3",
|
|
|
|
|
"@react-aria/menu": "3.4.3",
|
|
|
|
|
"@react-aria/overlays": "3.8.1",
|
|
|
|
|
"@react-aria/utils": "3.11.3",
|
|
|
|
|
"@react-stately/collections": "3.3.7",
|
|
|
|
|
"@react-stately/menu": "3.2.6",
|
|
|
|
|
"@react-stately/tree": "3.2.3",
|
2022-02-07 21:08:10 +08:00
|
|
|
"@reduxjs/toolkit": "1.7.2",
|
2022-03-22 23:06:53 +08:00
|
|
|
"@sentry/browser": "6.19.1",
|
|
|
|
|
"@sentry/types": "6.19.1",
|
|
|
|
|
"@sentry/utils": "6.19.1",
|
2022-01-21 16:24:23 +08:00
|
|
|
"@visx/event": "2.6.0",
|
2021-08-19 20:49:09 +08:00
|
|
|
"@visx/gradient": "2.1.0",
|
2021-10-27 21:21:07 +08:00
|
|
|
"@visx/group": "2.1.0",
|
2021-12-13 22:03:52 +08:00
|
|
|
"@visx/scale": "2.2.2",
|
2021-12-14 00:12:12 +08:00
|
|
|
"@visx/shape": "2.4.0",
|
2022-01-26 22:43:44 +08:00
|
|
|
"@visx/tooltip": "2.8.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"@welldone-software/why-did-you-render": "6.2.3",
|
2020-11-03 20:18:10 +08:00
|
|
|
"angular": "1.8.2",
|
2018-06-26 16:28:37 +08:00
|
|
|
"angular-bindonce": "0.3.1",
|
2020-11-03 20:18:10 +08:00
|
|
|
"angular-route": "1.8.2",
|
|
|
|
|
"angular-sanitize": "1.8.2",
|
2021-10-27 21:21:07 +08:00
|
|
|
"app": "link:./public/app",
|
2019-04-17 18:43:00 +08:00
|
|
|
"baron": "3.0.3",
|
2020-03-16 20:14:57 +08:00
|
|
|
"brace": "0.11.1",
|
2019-04-09 20:25:13 +08:00
|
|
|
"calculate-size": "1.1.1",
|
2021-12-15 01:12:00 +08:00
|
|
|
"centrifuge": "2.8.4",
|
2021-12-14 20:15:23 +08:00
|
|
|
"classnames": "2.3.1",
|
2021-11-10 01:05:01 +08:00
|
|
|
"comlink": "4.3.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"common-tags": "1.8.2",
|
2022-03-23 22:56:44 +08:00
|
|
|
"core-js": "3.21.1",
|
2020-01-07 18:59:11 +08:00
|
|
|
"d3": "5.15.0",
|
2021-01-19 23:34:43 +08:00
|
|
|
"d3-force": "^2.1.1",
|
2019-08-26 12:52:40 +08:00
|
|
|
"d3-scale-chromatic": "1.5.0",
|
2021-08-31 20:10:56 +08:00
|
|
|
"dangerously-set-html-content": "1.0.9",
|
2022-01-04 18:05:22 +08:00
|
|
|
"date-fns": "2.28.0",
|
2021-01-28 22:57:57 +08:00
|
|
|
"debounce-promise": "3.1.2",
|
2021-11-05 01:54:49 +08:00
|
|
|
"emotion": "11.0.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"eventemitter3": "4.0.7",
|
2021-08-17 20:03:18 +08:00
|
|
|
"fast-deep-equal": "^3.1.3",
|
2021-11-03 15:40:17 +08:00
|
|
|
"fast-json-patch": "3.1.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"file-saver": "2.0.5",
|
2021-04-01 16:32:00 +08:00
|
|
|
"history": "4.10.1",
|
2020-10-21 15:06:41 +08:00
|
|
|
"hoist-non-react-statics": "3.3.2",
|
2022-02-07 21:08:10 +08:00
|
|
|
"immer": "9.0.12",
|
2021-11-19 20:02:59 +08:00
|
|
|
"immutable": "4.0.0",
|
2022-01-05 19:08:13 +08:00
|
|
|
"jquery": "3.6.0",
|
2021-03-25 18:51:09 +08:00
|
|
|
"json-source-map": "0.6.1",
|
2020-04-26 04:48:20 +08:00
|
|
|
"jsurl": "^0.1.5",
|
2022-03-03 02:45:08 +08:00
|
|
|
"lezer-promql": "0.22.0",
|
2021-03-02 17:13:27 +08:00
|
|
|
"lodash": "4.17.21",
|
2021-05-11 16:38:10 +08:00
|
|
|
"logfmt": "^1.3.2",
|
2022-03-18 19:30:15 +08:00
|
|
|
"lru-cache": "7.7.1",
|
2021-11-08 22:52:05 +08:00
|
|
|
"memoize-one": "6.0.0",
|
2022-03-18 05:26:48 +08:00
|
|
|
"minisearch": "5.0.0-beta1",
|
2021-05-17 20:18:54 +08:00
|
|
|
"moment": "2.29.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"moment-timezone": "0.5.34",
|
2021-12-15 21:09:44 +08:00
|
|
|
"monaco-editor": "^0.31.1",
|
2021-08-31 19:46:13 +08:00
|
|
|
"monaco-promql": "^1.7.2",
|
2020-03-16 20:14:57 +08:00
|
|
|
"mousetrap": "1.6.5",
|
2019-04-17 18:43:00 +08:00
|
|
|
"mousetrap-global-bind": "1.1.0",
|
2022-01-05 21:06:27 +08:00
|
|
|
"moveable": "0.27.3",
|
2022-03-29 23:50:04 +08:00
|
|
|
"ol": "6.14.1",
|
2022-03-23 22:56:44 +08:00
|
|
|
"papaparse": "5.3.2",
|
2021-04-07 13:42:43 +08:00
|
|
|
"pluralize": "^8.0.0",
|
2022-02-23 00:06:01 +08:00
|
|
|
"prismjs": "1.27.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"prop-types": "15.8.1",
|
2022-03-21 21:29:01 +08:00
|
|
|
"rc-cascader": "3.4.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"rc-drawer": "4.4.3",
|
2022-01-04 17:25:19 +08:00
|
|
|
"rc-slider": "9.7.5",
|
2021-10-27 21:21:07 +08:00
|
|
|
"rc-time-picker": "3.7.3",
|
2022-03-23 22:56:44 +08:00
|
|
|
"re-resizable": "6.9.5",
|
2022-01-08 00:33:26 +08:00
|
|
|
"react": "17.0.2",
|
2021-08-18 17:23:34 +08:00
|
|
|
"react-beautiful-dnd": "13.1.0",
|
2021-03-25 18:51:09 +08:00
|
|
|
"react-diff-viewer": "^3.1.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"react-dom": "17.0.2",
|
2021-10-27 21:21:07 +08:00
|
|
|
"react-draggable": "4.4.4",
|
2022-03-23 22:56:44 +08:00
|
|
|
"react-grid-layout": "1.3.4",
|
2021-05-05 15:12:06 +08:00
|
|
|
"react-highlight-words": "0.17.0",
|
2022-02-23 19:22:45 +08:00
|
|
|
"react-hook-form": "7.5.3",
|
2021-10-08 22:19:10 +08:00
|
|
|
"react-inlinesvg": "2.3.0",
|
2019-11-06 18:04:27 +08:00
|
|
|
"react-loadable": "5.5.0",
|
2022-03-21 20:14:40 +08:00
|
|
|
"react-moveable": "0.31.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"react-popper": "2.2.5",
|
2022-02-09 05:58:20 +08:00
|
|
|
"react-popper-tooltip": "^4.3.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"react-redux": "7.2.6",
|
2021-10-27 21:21:07 +08:00
|
|
|
"react-resizable": "3.0.4",
|
2020-10-21 15:58:23 +08:00
|
|
|
"react-reverse-portal": "^2.0.1",
|
Routing NG: Replace Angular routing with react-router (#31463)
* Add router packages
* Get react app root work instead of Angular one
* Logger util
* Patch Angular routing ($routeProvider, $routeParamsProvider)
* Use react-router-dom history instead of separate dependency
* Add test routes
* Sidemenu - use Link instead of anchors
* Patch Angular $location service (stub)
* WIP: geting rid of $location provider from TimeSrv
* Intercept anchor clicks to use history under the hood
* Sync Redux location slice with history state
* Make login/logout work
* Debug routes for testing
* Make force login work
* Make sure query param change does not recreate page components
* Hide side menu in specified locations
* Make the dashboar route query parameters work, make panel edit menu work
* Enable more routes
* Fix side menu
* Handle view modes
* Disable playlist routes
* Make SafeDynamicImport work again
* Bring back router-debug
* Separate redux location sync from route rendering
* Refactor updateLocation to thunk and move force refresh(login) to it
* Fixing init dashboard issue
* Support switching between dashboards without an unmount of DashboardPage
* More fixes for init dashboard and panel edit
* More type fixes
* Moving angular location wrapper out of main LocationService, and fixing typescript issues
* Fixed last typescript errors
* LocationService: Move to runtime and remove getLocationService and export singleston const instead (#31523)
* Moving location service implementation to runtime and removing get function and making it a package const singleton
* Added test that used locationService directly
* removed unused import
* AngularApp: Moving angular dependencies and the app boot out of the main app into it's own file (#31525)
* Fixes angular panels by calling the monkey patch
* Moving angular stuff to to it's own files
* udpated
* Fixing clicking on divs and spans inside anchor
* Moving app notifications out of angular app and removing angular directive wrapper
* Moving search from angular to react and removing angular search wrapper
* Clean up, tried to remove the redux location wrapper but requires a big update for DashboardPage, so adding it back
* Moving AppWrapper to root to limit circular dependencies (app/core -> app/routing and back)
* Open and close search now works
* Hide sidemenu when in kiosk mode
* Restoring some keybindings like ESC key
* Removed kiosk events and simplified it, just handled through updating URL
* Fixing typescript errors
* Simplified GrafanaRouteComponentProps and renamed to ContainerProps
* renamed back
* Changed AlertRuleList to use GrafanaRouteComponentProps and location.search passed to it
* Removing the reloadOnSearch property, this is not needed now for react as react by default does not unmount components when only url match or query parmas change
* SafeDynamicImport causing unmount un every search update, not sure how to fix yet
* Fix signature for SafeDynamicImport so we do not create new route components on every route render
* Removing the redux location wrapper as it was causing errors, and making dashboard page work with RouteProps (location, match) etc
* Updating DashboardPage and SoloPanelPage to use match params and history location
* Fixed DashboardPage tests
* Fixing solo route tests
* LocationService: Rename getCurrentLocation to just getLocation
* do not intercept link clicks with target blank or self
* Experimental useUrlParams hook
* Update DataSourceSettingsPage to use router match params
* fix links with urls that have no starting / to work like before
* Fix forceLogin
* Add queryParams to GrafanaRouteComponentProps
* PanelEditor get rid of updateLocation and location state
* Improve grafana route query params typing
* Add getSearchObject to LocationService
* Use DashboardPAge queryParams instead of location.search parsing
* Fix DashboardPage typing
* Fix some tests weirdness
* Bring back KeyboardSrv
* Fixes typescript issues
* Team pages now use router match params
* Get rid of from GrafanaRouteComponent props
* Removed unnessary calls to getSearchObject when calling locationService.partial
* Updated DashboardPage tests after queryParams was added
* Fixing dashboard settings back
* GrafanaRoute: Adding tests and remove use of global locationService
* Fixing tests and typescript errors
* Bring back kiosk modes and add tests
* Fix TimeSrv tests
* Fix typecheck errors
* Fixing tests
* Updated SideMenu test to react-testing and wrapped component in Router, and fixed issue importing createMemoryHistory
* Get rid of routeChange event from TimeSrv from
* Fixed TopSectionItem test
* Trying to make basename work but failing
* Update TopSectionItem snapshot
* Fix TopSectionItem snapshot test
* Fix API keys creation
* Remove Angular dependencies from KeybindingSrv (#31617)
* Remove Angular dependency from KeybindingsSrv
* Fix tests and typecheck issues
* basename is starting to work
* Make dashboard save work
* KeybindingSrv: Remove as angular service and no usage angular scope
* So long bridge_srv, we won't miss you
* Update snapshots
* Dashboard: Refactoring ChangeTracker to use History api and no angular (#31653)
* Dashboard: Refactoring ChangeTracker to use History api and no angular
* Updated
* Removed logging
* fixed unit tests
* updated snapshots
* Mechanism for force reloading routes (#31683)
* e2e: Fixes various things in e2e scenarios after router migration (#31685)
* Explore: Update reading query params from router props and updating location via locationService (ReactRouter) (#31688)
* RoutingNG: Initial explore redux location to router location migration
* Updated explore Wrapper tests
* Fixing more tests
* remove loggin
* rename back to make naming consistent
* Fixing return to dashboard button
* fixing navigation to explore from dashboard
* updated routeProps
* Updated tests
* Make DashboardListPage work
* Fixing navigation after add new data source, and fixes explore e2e
* Fixing solo panel page
* PluginsPage now works
* RoutingNG: When parsing and rendering url search/query params preseve old logic of handling booleans and arrays (#31725)
* RoutingNG: When parsing and rendering url search/query params preserve old logic of handling booleans and arrays
* Fixed test
* Make snapshots list work
* fixed alert notification channel edit page
* Simplify LocationService, did not need special handling for login or forceLogin as target _self on link already handles that
* fixed UserAdminPage
* fixed edit orgs page
* Fixing LdapPage
* fixing dashboard import
* Fixed new folder page
* Fixed data source dashboards page
* fixing Folder permissions and folder settings page
* fixing snapshot list page nav model
* remove unused file
* Added placeholder page for playlist
* Moved browser compatability to index-template
* Restored 404/default page
* Fixed reset password page
* Fixed SignUpInvited page
* Fixing CreateTeam, Create user page, add panel widget
* Restore browwser file to make tests happy
* Fixed unit tests
* Removed unused import
* Replacing usage of updateLocation
* Fixed test
* Updating search filters to use history / location service for filters
* remove unused file
* AppRootPage fixed
* Fixing test and search issue
* Changes to support enterprise extensions
* remove console.log
* Removing more use of redux location
* Fixed signup page
* removed unused old angular controllers
* Fixing bugs
* one final bugfix
* Removed location from redux state
* Fixing ts issues and tests
* Fixing test issue
* fixing tests
* Fixing tests
* removed unused stuff
* Fixed search test
* Adding some doc comments
* Routing NG: Angular location provider patch (#31773)
* Patch Angulars $location provider
* Update public/app/angular/bridgeReactAngularRouting.ts
* Remove only test
* Update tests, disable loggers in test env
* Routing NG: remove $location provider usage (#31816)
* Remove dashboard_loaders
* Remove $location from Analytics service, track page views form GrafanaRoute
* Remove NotificationsEditCtrl
* Remove Angular dependencies from uploadDashboardDirective
* Update public/app/features/dashboard/containers/DashboardPage.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Update public/app/features/dashboard/containers/DashboardPage.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Remove unused test helpers (#31831)
* Playlist react (#31829)
* playlist list in react
* Playlist start
* Things started to work
* Updated
* Handle empty list
* Fix ts
* Fixes and kiosk mode stuff
* Removed unused events
* fixing ts issue
* Another ts issue
* Fixing tests
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
* fixed test
* Update public/app/AppWrapper.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Update public/app/AppWrapper.tsx
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
* Remove Angular dependency from DashboardLoaderSrv (#31863)
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
2021-03-11 01:03:36 +08:00
|
|
|
"react-router-dom": "^5.2.0",
|
2022-02-07 21:08:10 +08:00
|
|
|
"react-select": "5.2.2",
|
2022-01-08 00:33:26 +08:00
|
|
|
"react-split-pane": "0.1.92",
|
2022-03-31 00:50:32 +08:00
|
|
|
"react-table": "^7.7.0",
|
2022-01-08 00:33:26 +08:00
|
|
|
"react-transition-group": "4.4.2",
|
2022-01-05 21:52:54 +08:00
|
|
|
"react-use": "17.3.2",
|
2022-01-08 00:33:26 +08:00
|
|
|
"react-virtualized-auto-sizer": "1.0.6",
|
|
|
|
|
"react-window": "1.8.6",
|
|
|
|
|
"redux": "4.1.2",
|
2022-01-05 22:41:02 +08:00
|
|
|
"redux-thunk": "2.4.1",
|
2022-01-08 00:33:26 +08:00
|
|
|
"regenerator-runtime": "0.13.9",
|
2022-01-06 18:10:36 +08:00
|
|
|
"reselect": "4.1.5",
|
2021-10-08 22:19:10 +08:00
|
|
|
"rst2html": "github:thoward/rst2html#990cb89f2a300cdd9151790be377c4c0840df809",
|
2022-03-23 22:56:44 +08:00
|
|
|
"rxjs": "7.5.5",
|
2021-10-27 21:21:07 +08:00
|
|
|
"sass": "link:./public/sass",
|
2022-01-06 19:23:08 +08:00
|
|
|
"search-query-parser": "1.6.0",
|
2022-03-12 04:32:58 +08:00
|
|
|
"selecto": "1.15.0",
|
2021-05-11 16:44:00 +08:00
|
|
|
"semver": "^7.1.3",
|
2019-09-23 19:26:05 +08:00
|
|
|
"slate": "0.47.8",
|
|
|
|
|
"slate-plain-serializer": "0.7.10",
|
2021-11-13 00:13:55 +08:00
|
|
|
"symbol-observable": "4.0.0",
|
2021-10-27 21:21:07 +08:00
|
|
|
"test": "link:./public/test",
|
2021-03-12 18:28:54 +08:00
|
|
|
"tether-drop": "https://github.com/torkelo/drop",
|
2022-01-08 00:33:26 +08:00
|
|
|
"tinycolor2": "1.4.2",
|
2021-12-07 01:32:55 +08:00
|
|
|
"tslib": "2.3.1",
|
2022-02-08 16:44:10 +08:00
|
|
|
"uplot": "1.6.19",
|
2022-01-08 00:33:26 +08:00
|
|
|
"uuid": "8.3.2",
|
2021-10-27 21:21:07 +08:00
|
|
|
"vendor": "link:./public/vendor",
|
2020-11-09 22:31:03 +08:00
|
|
|
"visjs-network": "4.25.0",
|
2022-01-07 17:19:06 +08:00
|
|
|
"whatwg-fetch": "3.6.2"
|
2018-05-11 20:10:54 +08:00
|
|
|
},
|
|
|
|
|
"resolutions": {
|
2022-01-06 23:22:25 +08:00
|
|
|
"underscore": "1.13.2",
|
2021-10-08 22:19:10 +08:00
|
|
|
"@types/slate": "0.47.2",
|
2022-03-23 22:56:44 +08:00
|
|
|
"@microsoft/api-extractor-model": "7.15.4",
|
|
|
|
|
"@rushstack/node-core-library": "3.45.1",
|
|
|
|
|
"@rushstack/rig-package": "0.3.8",
|
|
|
|
|
"@rushstack/ts-command-line": "4.10.7",
|
2022-03-03 23:55:00 +08:00
|
|
|
"@storybook/react/webpack": "5.70.0"
|
2018-12-20 16:25:04 +08:00
|
|
|
},
|
2018-12-25 16:59:23 +08:00
|
|
|
"workspaces": {
|
2018-12-25 15:55:44 +08:00
|
|
|
"packages": [
|
2020-04-07 15:04:24 +08:00
|
|
|
"packages/*",
|
|
|
|
|
"plugins-bundled/internal/*"
|
2018-12-25 15:55:44 +08:00
|
|
|
]
|
2019-05-08 22:50:21 +08:00
|
|
|
},
|
2019-07-05 16:46:25 +08:00
|
|
|
"engines": {
|
2021-11-10 22:23:10 +08:00
|
|
|
"node": ">= 16"
|
2020-03-18 05:08:32 +08:00
|
|
|
},
|
2022-03-09 17:10:51 +08:00
|
|
|
"packageManager": "yarn@3.2.0"
|
2018-05-29 19:23:07 +08:00
|
|
|
}
|
