diff --git a/packages/design-system-website/package-lock.json b/packages/design-system-website/package-lock.json index 33d61abe4..a08c153a4 100644 --- a/packages/design-system-website/package-lock.json +++ b/packages/design-system-website/package-lock.json @@ -63,7 +63,7 @@ "sinon": "^7.5.0", "sinon-chai": "^3.5.0", "webpack": "^5.95.0", - "webpack-bundle-analyzer": "^3.8.0", + "webpack-bundle-analyzer": "^4.10.2", "webpack-cli": "^5.1.4", "webpack-dev-server": "^3.11.0", "webpack-node-externals": "^1.7.2" @@ -2157,6 +2157,12 @@ "node": ">= 8" } }, + "node_modules/@polka/url": { + "version": "1.0.0-next.28", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz", + "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==", + "dev": true + }, "node_modules/@popperjs/core": { "version": "2.11.8", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", @@ -5159,27 +5165,6 @@ "tweetnacl": "^0.14.3" } }, - "node_modules/bfj": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.2.tgz", - "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==", - "dev": true, - "dependencies": { - "bluebird": "^3.5.5", - "check-types": "^8.0.3", - "hoopy": "^0.1.4", - "tryer": "^1.0.1" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/bfj/node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, "node_modules/big.js": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", @@ -5726,12 +5711,6 @@ "node": "*" } }, - "node_modules/check-types": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/check-types/-/check-types-8.0.3.tgz", - "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==", - "dev": true - }, "node_modules/cheerio": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", @@ -6983,6 +6962,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/debounce": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz", + "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==", + "dev": true + }, "node_modules/debug": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", @@ -7568,9 +7553,9 @@ } }, "node_modules/duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" }, "node_modules/duplexer3": { "version": "0.1.5", @@ -7603,16 +7588,6 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, - "node_modules/ejs": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz", - "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==", - "dev": true, - "hasInstallScript": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/electron-to-chromium": { "version": "1.5.28", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.28.tgz", @@ -10351,15 +10326,6 @@ "node": ">=0.10.0" } }, - "node_modules/hoopy": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", - "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==", - "dev": true, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/hpack.js": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", @@ -10419,6 +10385,12 @@ "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz", "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==" }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, "node_modules/htmlparser2": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", @@ -12820,6 +12792,15 @@ "node": ">=4" } }, + "node_modules/mrmime": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", + "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -17039,6 +17020,20 @@ "sinon": ">=4.0.0" } }, + "node_modules/sirv": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz", + "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==", + "dev": true, + "dependencies": { + "@polka/url": "^1.0.0-next.24", + "mrmime": "^2.0.0", + "totalist": "^3.0.0" + }, + "engines": { + "node": ">= 10" + } + }, "node_modules/slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", @@ -18098,6 +18093,15 @@ "node": ">=0.6" } }, + "node_modules/totalist": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", + "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/tough-cookie": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", @@ -18159,12 +18163,6 @@ "integrity": "sha512-yHeaPjCBzVaXwWl5IMUapTaTC2rn/eBYg2fsG2L+CvJd+ttFbk0ylDnpTO3wVhosmE1tQEvcebbBeKLCwScQSQ==", "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info." }, - "node_modules/tryer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", - "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==", - "dev": true - }, "node_modules/tryor": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz", @@ -18946,36 +18944,35 @@ } }, "node_modules/webpack-bundle-analyzer": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz", - "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==", - "dev": true, - "dependencies": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1", - "bfj": "^6.1.1", - "chalk": "^2.4.1", - "commander": "^2.18.0", - "ejs": "^2.6.1", - "express": "^4.16.3", - "filesize": "^3.6.1", - "gzip-size": "^5.0.0", - "lodash": "^4.17.19", - "mkdirp": "^0.5.1", - "opener": "^1.5.1", - "ws": "^6.0.0" + "version": "4.10.2", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz", + "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==", + "dev": true, + "dependencies": { + "@discoveryjs/json-ext": "0.5.7", + "acorn": "^8.0.4", + "acorn-walk": "^8.0.0", + "commander": "^7.2.0", + "debounce": "^1.2.1", + "escape-string-regexp": "^4.0.0", + "gzip-size": "^6.0.0", + "html-escaper": "^2.0.2", + "opener": "^1.5.2", + "picocolors": "^1.0.0", + "sirv": "^2.0.3", + "ws": "^7.3.1" }, "bin": { "webpack-bundle-analyzer": "lib/bin/analyzer.js" }, "engines": { - "node": ">= 6.14.4" + "node": ">= 10.13.0" } }, "node_modules/webpack-bundle-analyzer/node_modules/acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.13.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.13.0.tgz", + "integrity": "sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -18985,14 +18982,74 @@ } }, "node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "version": "8.3.4", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", + "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", "dev": true, + "dependencies": { + "acorn": "^8.11.0" + }, "engines": { "node": ">=0.4.0" } }, + "node_modules/webpack-bundle-analyzer/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/webpack-bundle-analyzer/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/webpack-bundle-analyzer/node_modules/gzip-size": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", + "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", + "dev": true, + "dependencies": { + "duplexer": "^0.1.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/webpack-bundle-analyzer/node_modules/ws": { + "version": "7.5.10", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", + "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", + "dev": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/webpack-cli": { "version": "5.1.4", "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", diff --git a/packages/design-system-website/package.json b/packages/design-system-website/package.json index 553c50877..30ecf7ec5 100644 --- a/packages/design-system-website/package.json +++ b/packages/design-system-website/package.json @@ -50,16 +50,16 @@ "sinon": "^7.5.0", "sinon-chai": "^3.5.0", "webpack": "^5.95.0", - "webpack-bundle-analyzer": "^3.8.0", + "webpack-bundle-analyzer": "^4.10.2", "webpack-cli": "^5.1.4", "webpack-dev-server": "^3.11.0", "webpack-node-externals": "^1.7.2" }, "dependencies": { "@popperjs/core": "^2.9.2", - "@puppet/data-grid": "^0.2.7", - "@puppet/react-components": "^5.34.10", - "@puppet/react-layouts": "^2.0.0-alpha.4", + "@puppet/data-grid": "^1.0.0-alpha.5", + "@puppet/react-components": "^6.0.0-alpha.17", + "@puppet/react-layouts": "^2.0.0-alpha.6", "brace": "^0.11.1", "prop-types": "^15.7.2", "react": "^16.13.1", diff --git a/packages/react-components/package.json b/packages/react-components/package.json index be2ade08a..e98a691f2 100644 --- a/packages/react-components/package.json +++ b/packages/react-components/package.json @@ -73,7 +73,7 @@ }, "dependencies": { "@popperjs/core": "^2.11.8", - "@puppet/sass-variables": "^1.4.4", + "@puppet/sass-variables": "^2.0.0-alpha.3", "classnames": "^2.5.1", "core-js": "^3.38.1", "hoist-non-react-statics": "^3.3.2", diff --git a/packages/react-components/source/index.js b/packages/react-components/source/index.js index 96e0f2f93..5078ff230 100644 --- a/packages/react-components/source/index.js +++ b/packages/react-components/source/index.js @@ -61,7 +61,6 @@ export { Copy, Drawer, Detail, - Filters, Form, Heading, Icon, diff --git a/packages/react-components/source/react/library/radiobutton/RadioButton.js b/packages/react-components/source/react/library/radiobutton/RadioButton.js index 2979ae406..7ddac1a85 100644 --- a/packages/react-components/source/react/library/radiobutton/RadioButton.js +++ b/packages/react-components/source/react/library/radiobutton/RadioButton.js @@ -73,7 +73,7 @@ const RadioButton = ({ className={classNames('rc-radiobutton', { 'rc-radiobutton-error': error, })} - onChange={(e) => onChange(e.target.checked, e)} + onChange={(e) => onChange(value, e)} {...otherProps} /> diff --git a/packages/react-components/test/radiobutton/radiobutton.js b/packages/react-components/test/radiobutton/radiobutton.js index 3040ca571..695a90f3d 100644 --- a/packages/react-components/test/radiobutton/radiobutton.js +++ b/packages/react-components/test/radiobutton/radiobutton.js @@ -17,19 +17,25 @@ describe('', () => { it('should have expected input element type', () => { expect( - shallow().find('input'), + shallow().find( + 'input', + ), ).to.have.prop('type', 'radio'); }); it('should have expected input element name', () => { expect( - shallow().find('input'), + shallow().find( + 'input', + ), ).to.have.prop('name', 'test-name'); }); it('should have expected input element id', () => { expect( - shallow().find('input'), + shallow().find( + 'input', + ), ).to.have.prop('id', 'test-name-foo'); }); @@ -61,7 +67,7 @@ describe('', () => { wrapper.find('input').simulate('change'); - expect(onChange.calledWith('foo')).to.equal(true); + expect(onChange.called).to.equal(true); }); it('should respond to focus if onFocus is provided', () => { @@ -86,13 +92,21 @@ describe('', () => { }); it('should be checked if selected', () => { - expect(shallow().find('input')) + expect( + shallow().find( + 'input', + ), + ) .to.have.prop('checked') .to.equal(true); }); it('should be unchecked if not selected', () => { - expect(shallow().find('input')) + expect( + shallow().find( + 'input', + ), + ) .to.have.prop('checked') .to.equal(false); }); diff --git a/packages/react-components/webpack.config.js b/packages/react-components/webpack.config.js index 8ac8ddfd8..678c24c39 100644 --- a/packages/react-components/webpack.config.js +++ b/packages/react-components/webpack.config.js @@ -1,7 +1,6 @@ const webpack = require('webpack'); const path = require('path'); const nodeExternals = require('webpack-node-externals'); -const { type } = require('os'); const env = process.env.NODE_ENV || 'development'; let plugins; diff --git a/packages/react-layouts/package.json b/packages/react-layouts/package.json index 3a6e4c686..5df645db6 100644 --- a/packages/react-layouts/package.json +++ b/packages/react-layouts/package.json @@ -24,8 +24,8 @@ "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0" }, "dependencies": { - "@puppet/react-components": "^5.34.10", - "@puppet/sass-variables": "^1.4.4", + "@puppet/react-components": "^6.0.0-alpha.17", + "@puppet/sass-variables": "^2.0.0-alpha.3", "classnames": "^2.5.1", "prop-types": "^15.8.1" }, diff --git a/packages/react-layouts/src/index.js b/packages/react-layouts/src/index.js index 7ec17abf7..3e6af7316 100644 --- a/packages/react-layouts/src/index.js +++ b/packages/react-layouts/src/index.js @@ -1,6 +1,4 @@ import Authentication from './Authentication'; -import Columns from './Columns'; -import PageContent from './PageContent'; import 'index.scss'; -export { Authentication, Columns, PageContent }; +export default { Authentication }; diff --git a/packages/sass-variables/_typography.scss b/packages/sass-variables/_typography.scss index 1aeef83f8..084b2f53d 100644 --- a/packages/sass-variables/_typography.scss +++ b/packages/sass-variables/_typography.scss @@ -224,7 +224,7 @@ $puppet-type-code-block-line-height: calc(22 / 16) !default; } @mixin puppet-type-large($color: base) { - color: map-get($puppet-type-colors, $color); + color: map.get($puppet-type-colors, $color); font-family: $puppet-type-large-font-family; font-size: $puppet-type-large-font-size; font-weight: $puppet-type-large-font-weight; @@ -232,7 +232,7 @@ $puppet-type-code-block-line-height: calc(22 / 16) !default; } @mixin puppet-type-medium($color: base) { - color: map-get($puppet-type-colors, $color); + color: map.get($puppet-type-colors, $color); font-family: $puppet-type-medium-font-family; font-size: $puppet-type-medium-font-size; font-weight: $puppet-type-medium-font-weight; @@ -316,12 +316,6 @@ $puppet-type-code-block-line-height: calc(22 / 16) !default; line-height: $puppet-type-code-tiny-line-height; } - // background-color: $puppet-n100; - // border-left: 8px solid $puppet-n300; - // display: block; - // padding: 0; - // white-space: pre; - @mixin puppet-type-code-block() { background-color: $puppet-n50; border-left: 8px solid $puppet-n300;