diff --git a/package.json b/package.json index bd0cc426cd..50ab790e50 100644 --- a/package.json +++ b/package.json @@ -43,67 +43,77 @@ "url": "https://github.com/opensearch-project/oui.git" }, "resolutions": { - "**/trim": "0.0.3", - "**/axios": "^0.21.1", - "**/ansi-html": "^0.0.8", - "**/merge": "^2.1.1", - "**/minimist": "^1.2.6", - "**/ansi-regex": "^5.0.1", - "cacache/y18n": "^4.0.1", - "**/glob-parent": "^6.0.1", - "**/svgo/js-yaml": "^3.13.1", + "@babel/cli/**/ansi-regex": "^5.0.1", + "@babel/cli/**/minimist": "^1.2.6", + "@babel/cli/chokidar/glob-parent": "^6.0.1", + "@elastic/charts/**/d3-color": "^3.1.0", + "@svgr/plugin-svgo/**/nth-check": "^2.0.1", + "@types/jest/**/ansi-regex": "^5.0.1", + "babel-plugin-add-module-exports/chokidar/glob-parent": "^6.0.1", + "babel-plugin-inline-react-svg/**/ansi-regex": "^5.0.1", + "babel-plugin-inline-react-svg/svgo/js-yaml": "^3.13.1", + "babel-template/**/ansi-regex": "^5.0.1", + "codesandbox/**/ansi-regex": "^5.0.1", + "codesandbox/**/got": "^11.8.5", + "codesandbox/axios": "^0.22.0", + "codesandbox/pacote": "^12.0.0", + "cssnano/**/css-select/nth-check": "^2.0.1", + "cssnano/**/postcss": "^7.0.39", + "enzyme/cheerio/cheerio-select-tmp/css-select/css-what": "^6.1.0", + "enzyme/cheerio/cheerio-select-tmp/css-what": "^6.1.0", + "html-webpack-plugin/**/ansi-regex": "^5.0.1", + "jest-cli/**/ansi-regex": "^5.0.1", + "jest/**/node-notifier": "^10.0.1", + "node-sass/sass-graph/scss-tokenizer": "^0.4.3", + "postcss-cli/chokidar/glob-parent": "^6.0.1", + "postcss-inline-svg/css-select/nth-check": "^2.0.1", + "react-view/**/ansi-regex": "^5.0.1", + "react-view/**/minimist": "^1.2.6", + "react-view/@miksu/prettier/minimatch": "^3.0.8", + "remark-parse/trim": "0.0.3", + "sass-lint-auto-fix/**/minimist": "^1.2.6", + "sass-lint-auto-fix/merge": "^2.1.1", + "sass-lint/**/minimist": "^1.2.6", + "sass-lint/eslint": "^7.10.0", + "sass-lint/front-matter": "^4.0.2", + "sass-lint/merge": "^2.1.1", + "start-server-and-test/**/minimist": "^1.2.6", + "webpack-dev-server/**/ansi-regex": "^5.0.1", + "webpack-dev-server/chokidar/glob-parent": "^6.0.1", "webpack-dev-server/selfsigned": "^2.0.1", - "**/eslint/shelljs": "^0.8.5", - "**/css-select/css-what": "^6.1.0", - "**/css-select/nth-check": "^2.0.1", - "**/cheerio-select-tmp/css-what": "^6.1.0", - "**/cheerio-select-tmp/nth-check": "^2.0.1", - "**/find-versions": "^4.0.0", - "codesandbox/**/pacote": "^12.0.0", - "yo/meow": "^9.0.0", - "**/stylelint/micromatch": "^3.1.0", - "webpack/**/serialize-javascript": "^3.1.0", - "**/scss-tokenizer": "^0.4.3", - "**/node-notifier": "^10.0.1", - "**/got": "^11.8.5", - "**/postcss": "^7.0.39", - "**/eslint": "^7.10.0", - "**/har-validator": "^5.1.5", - "**/d3-color": "^3.1.0", - "**/@miksu/prettier/minimatch": "^3.0.8", - "**/request/qs": "^6.11.0", - "**/make-fetch-happen": "^11.0.3", - "nodegit/ramda": "^0.27.1", - "sass-lint/front-matter": "^4.0.2" + "webpack/**/chokidar/glob-parent": "^6.0.1", + "webpack/terser-webpack-plugin/serialize-javascript": "^3.1.0", + "yo/**/find-versions": "^4.0.0", + "yo/**/got": "^11.8.5", + "yo/meow": "^9.0.0" }, "pre-commit": [ "test-staged" ], "dependencies": { - "@types/chroma-js": "^2.0.0", - "@types/lodash": "^4.14.160", - "@types/numeral": "^0.0.28", - "@types/react-beautiful-dnd": "^13.0.0", - "@types/react-input-autosize": "^2.2.0", - "@types/react-virtualized-auto-sizer": "^1.0.0", - "@types/react-window": "^1.8.2", + "@types/chroma-js": "^2.4.0", + "@types/lodash": "^4.14.191", + "@types/numeral": "^2.0.2", + "@types/react-beautiful-dnd": "^13.1.3", + "@types/react-input-autosize": "^2.2.1", + "@types/react-virtualized-auto-sizer": "^1.0.1", + "@types/react-window": "^1.8.5", "@types/refractor": "^3.0.0", - "@types/resize-observer-browser": "^0.1.5", - "@types/vfile-message": "^2.0.0", - "chroma-js": "^2.1.0", - "classnames": "^2.2.6", + "@types/resize-observer-browser": "^0.1.7", + "chroma-js": "^2.4.2", + "classnames": "^2.3.2", "lodash": "^4.17.21", "mdast-util-to-hast": "^10.0.0", "numeral": "^2.0.6", - "prop-types": "^15.6.0", + "prop-types": "^15.8.1", "react-ace": "^7.0.5", - "react-beautiful-dnd": "^13.0.0", - "react-dropzone": "^11.2.0", + "react-beautiful-dnd": "^13.1.1", + "react-dropzone": "^14.2.3", "react-focus-on": "^3.5.0", - "react-input-autosize": "^2.2.2", + "react-input-autosize": "^3.0.0", "react-is": "~16.3.0", - "react-virtualized-auto-sizer": "^1.0.2", - "react-window": "^1.8.5", + "react-virtualized-auto-sizer": "^1.0.7", + "react-window": "^1.8.8", "refractor": "^3.6.0", "rehype-raw": "^5.0.0", "rehype-react": "^6.0.0", @@ -115,12 +125,12 @@ "text-diff": "^1.0.1", "unified": "^9.2.0", "unist-util-visit": "^2.0.3", - "url-parse": "^1.5.9", - "uuid": "^8.3.0", + "url-parse": "^1.5.10", + "uuid": "^9.0.0", "vfile": "^4.2.0" }, "devDependencies": { - "@axe-core/puppeteer": "^4.1.1", + "@axe-core/puppeteer": "^4.6.0", "@babel/cli": "^7.10.5", "@babel/core": "^7.11.4", "@babel/plugin-proposal-class-properties": "^7.10.4", @@ -136,21 +146,20 @@ "@elastic/eslint-config-kibana": "^0.15.0", "@svgr/core": "5.4.0", "@svgr/plugin-svgo": "^4.0.3", - "@types/classnames": "^2.2.10", - "@types/enzyme": "^3.10.5", + "@types/enzyme": "^3.10.12", + "@types/cheerio": "^0.22.31", "@types/jest": "^24.0.6", "@types/node": "^10.17.5", "@types/react": "^16.9.34", "@types/react-dom": "^16.9.6", "@types/react-is": "^16.7.1", - "@types/react-router-dom": "^5.1.5", + "@types/react-router-dom": "^5.3.3", "@types/tabbable": "^3.1.0", - "@types/url-parse": "^1.4.3", - "@types/uuid": "^8.3.0", + "@types/url-parse": "^1.4.8", + "@types/uuid": "^9.0.1", "@typescript-eslint/eslint-plugin": "^4.8.1", "@typescript-eslint/parser": "^4.8.1", "autoprefixer": "^9.8.6", - "axe-core": "^4.1.1", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.1.0", "babel-jest": "^24.1.0", @@ -161,20 +170,20 @@ "babel-plugin-pegjs-inline-precompile": "^0.1.1", "babel-template": "^6.26.0", "cache-loader": "^4.1.0", - "chalk": "^4.1.0", - "chokidar": "^3.4.2", + "chalk": "^4.1.2", + "chokidar": "^3.5.3", "circular-dependency-plugin": "^5.2.0", - "codesandbox": "^2.1.16", - "core-js": "^3.6.5", - "cross-env": "^7.0.2", + "codesandbox": "^2.2.3", + "core-js": "^3.29.1", + "cross-env": "^7.0.3", "css-loader": "^4.2.2", "cssnano": "^4.1.11", - "deasync": "^0.1.20", + "deasync": "^0.1.28", "dedent": "^0.7.0", "dts-generator": "^3.0.0", "enzyme": "^3.11.0", - "enzyme-adapter-react-16": "^1.15.3", - "enzyme-to-json": "^3.5.0", + "enzyme-adapter-react-16": "^1.15.7", + "enzyme-to-json": "^3.6.2", "eslint": "^7.10.0", "eslint-config-prettier": "^6.12.0", "eslint-import-resolver-webpack": "^0.13.0", @@ -189,19 +198,19 @@ "eslint-plugin-react": "^7.21.3", "eslint-plugin-react-hooks": "^4.1.2", "expose-gc": "^1.0.0", - "faker": "^4.1.0", + "faker": "^5.5.3", "file-loader": "^6.1.0", "findup": "^0.1.5", "fork-ts-checker-webpack-plugin": "^5.1.0", "get-port": "^5.1.1", - "glob": "^7.1.6", + "glob": "^8.1.0", "html": "^1.0.0", - "html-format": "^1.0.1", + "html-format": "^1.0.2", "html-webpack-plugin": "^4.4.1", "jest": "^24.1.0", "jest-cli": "^24.1.0", - "moment": "^2.27.0", - "moment-timezone": "^0.5.31", + "moment": "^2.29.4", + "moment-timezone": "^0.5.41", "node-sass": "^8.0.0", "pegjs": "^0.10.0", "postcss-cli": "^7.1.2", @@ -209,30 +218,28 @@ "postcss-loader": "^4.0.1", "pre-commit": "^1.2.2", "prettier": "^2.1.2", - "prop-types": "^15.6.0", - "puppeteer": "^5.5.0", + "puppeteer": "^18.2.1", "raw-loader": "^4.0.1", "react": "^16.14.0", - "react-docgen-typescript": "^1.20.5", + "react-docgen-typescript": "^1.22.0", "react-dom": "^16.12.0", "react-helmet": "^6.1.0", - "react-redux": "^7.2.1", - "react-router": "^5.2.0", - "react-router-dom": "^5.2.0", + "react-redux": "^8.0.5", + "react-router": "^5.3.4", + "react-router-dom": "^5.3.4", "react-router-redux": "^4.0.8", - "react-test-renderer": "^16.12.0", "react-view": "^2.3.2", - "redux": "^4.0.5", - "redux-thunk": "^2.3.0", - "resolve": "^1.17.0", - "rimraf": "^3.0.2", + "redux": "^4.2.1", + "redux-thunk": "^2.4.2", + "resolve": "^1.22.1", + "rimraf": "^4.4.0", "sass-extract": "^2.1.0", "sass-lint": "^1.13.1", "sass-lint-auto-fix": "^0.21.2", "sass-loader": "^10.0.1", "sass-vars-to-js-loader": "^2.1.1", - "shelljs": "^0.8.4", - "start-server-and-test": "^1.11.3", + "shelljs": "^0.8.5", + "start-server-and-test": "^2.0.0", "style-loader": "^1.2.1", "terser-webpack-plugin": "^4.1.0", "typescript": "4.0.5", @@ -240,7 +247,7 @@ "webpack": "^4.44.1", "webpack-cli": "^3.3.12", "webpack-dev-server": "^3.11.0", - "yeoman-generator": "^5.7.0", + "yeoman-generator": "^5.8.0", "yo": "^4.3.1" }, "peerDependencies": { @@ -248,7 +255,6 @@ "@types/react": "^16.9.34", "@types/react-dom": "^16.9.6", "moment": "^2.13.0", - "prop-types": "^15.5.0", "react": "^16.12", "react-dom": "^16.12", "typescript": "^4.0.5" diff --git a/src-docs/src/views/datagrid/schema.js b/src-docs/src/views/datagrid/schema.js index d763c401be..5e698c219a 100644 --- a/src-docs/src/views/datagrid/schema.js +++ b/src-docs/src/views/datagrid/schema.js @@ -56,7 +56,7 @@ for (let i = 1; i < 5; i++) { json = JSON.stringify([ { default: fake('{{name.lastName}}, {{name.firstName}} {{name.suffix}}'), - boolean: fake('{{random.boolean}}'), + boolean: fake('{{datatype.boolean}}'), numeric: fake('{{finance.account}}'), currency: fake('${{finance.amount}}'), date: fake('{{date.past}}'), @@ -74,7 +74,7 @@ for (let i = 1; i < 5; i++) { storeData.push({ default: fake('{{name.lastName}}, {{name.firstName}} {{name.suffix}}'), - boolean: fake('{{random.boolean}}'), + boolean: fake('{{datatype.boolean}}'), numeric: fake('{{finance.account}}'), currency: fake('${{finance.amount}}'), datetime: fake('{{date.past}}'), diff --git a/src/components/datagrid/data_grid.test.tsx b/src/components/datagrid/data_grid.test.tsx index dd80686028..95428c5bdf 100644 --- a/src/components/datagrid/data_grid.test.tsx +++ b/src/components/datagrid/data_grid.test.tsx @@ -594,6 +594,7 @@ describe('OuiDataGrid', () => { "height": 34, "left": 0, "position": "absolute", + "right": undefined, "top": "100px", "width": 100, }, @@ -612,6 +613,7 @@ describe('OuiDataGrid', () => { "height": 34, "left": 100, "position": "absolute", + "right": undefined, "top": "100px", "width": 100, }, @@ -630,6 +632,7 @@ describe('OuiDataGrid', () => { "height": 34, "left": 0, "position": "absolute", + "right": undefined, "top": "134px", "width": 100, }, @@ -648,6 +651,7 @@ describe('OuiDataGrid', () => { "height": 34, "left": 100, "position": "absolute", + "right": undefined, "top": "134px", "width": 100, }, diff --git a/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap b/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap index a8bdb5b7c3..def0944bf8 100644 --- a/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap +++ b/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap @@ -191,6 +191,7 @@ exports[`OuiMarkdownEditor is rendered 1`] = ` >