Skip to content

Commit

Permalink
Merge branch 'main' into SHIELD-1187-decoupling-data-table-manager-co…
Browse files Browse the repository at this point in the history
…mponents
  • Loading branch information
ddouglasz committed May 10, 2024
2 parents 91736fa + 0232120 commit 91cedb5
Show file tree
Hide file tree
Showing 22 changed files with 1,486 additions and 1,331 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
id: yarn-cache
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock', 'patches/*.patch') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
id: yarn-cache
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ steps.yarn-cache.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock', 'patches/*.patch') }}
Expand Down
875 changes: 0 additions & 875 deletions .yarn/releases/yarn-3.7.0.cjs

This file was deleted.

875 changes: 875 additions & 0 deletions .yarn/releases/yarn-3.8.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ plugins:

postinstall: ./scripts/postinstall.sh

yarnPath: .yarn/releases/yarn-3.7.0.cjs
yarnPath: .yarn/releases/yarn-3.8.0.cjs
2 changes: 1 addition & 1 deletion docs/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
nodeLinker: node-modules

yarnPath: ../.yarn/releases/yarn-3.7.0.cjs
yarnPath: ../.yarn/releases/yarn-3.8.0.cjs

postinstall: echo 0
8 changes: 4 additions & 4 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "NODE_ENV=production build-storybook -o public -s assets"
},
"dependencies": {
"@babel/core": "7.23.7",
"@babel/core": "7.24.0",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@manypkg/get-packages": "1.1.3",
Expand All @@ -33,8 +33,8 @@
"react-dom": "17.0.2",
"storybook-readme": "5.0.9",
"style-loader": "2.0.0",
"yaml": "2.3.4",
"yaml-loader": "0.8.0"
"yaml": "2.4.0",
"yaml-loader": "0.8.1"
},
"devDependencies": {
"@commercetools-frontend/babel-preset-mc-app": "21.25.2",
Expand All @@ -45,7 +45,7 @@
"prismjs": "1.29.0"
},
"resolutions": {
"@types/react": "17.0.75",
"@types/react": "17.0.76",
"@types/react-dom": "17.0.25",
"node-fetch": "^2.6.7",
"prismjs": "^1.29.0",
Expand Down
112 changes: 68 additions & 44 deletions docs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,26 @@ __metadata:
languageName: node
linkType: hard

"@babel/core@npm:7.23.7":
version: 7.23.7
resolution: "@babel/core@npm:7.23.7"
"@babel/core@npm:7.24.0":
version: 7.24.0
resolution: "@babel/core@npm:7.24.0"
dependencies:
"@ampproject/remapping": ^2.2.0
"@babel/code-frame": ^7.23.5
"@babel/generator": ^7.23.6
"@babel/helper-compilation-targets": ^7.23.6
"@babel/helper-module-transforms": ^7.23.3
"@babel/helpers": ^7.23.7
"@babel/parser": ^7.23.6
"@babel/template": ^7.22.15
"@babel/traverse": ^7.23.7
"@babel/types": ^7.23.6
"@babel/helpers": ^7.24.0
"@babel/parser": ^7.24.0
"@babel/template": ^7.24.0
"@babel/traverse": ^7.24.0
"@babel/types": ^7.24.0
convert-source-map: ^2.0.0
debug: ^4.1.0
gensync: ^1.0.0-beta.2
json5: ^2.2.3
semver: ^6.3.1
checksum: 32d5bf73372a47429afaae9adb0af39e47bcea6a831c4b5dcbb4791380cda6949cb8cb1a2fea8b60bb1ebe189209c80e333903df1fa8e9dcb04798c0ce5bf59e
checksum: 3124a8a1c550f3818a55dc6f621af9c580b4959bc780cce7220f671088c404830f41870573f5acf7f837878f8aa82e84675ea148a9852c1b053533cb899300d3
languageName: node
linkType: hard

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

"@babel/helpers@npm:^7.23.7":
version: 7.23.8
resolution: "@babel/helpers@npm:7.23.8"
"@babel/helpers@npm:^7.24.0":
version: 7.24.0
resolution: "@babel/helpers@npm:7.24.0"
dependencies:
"@babel/template": ^7.22.15
"@babel/traverse": ^7.23.7
"@babel/types": ^7.23.6
checksum: 8b522d527921f8df45a983dc7b8e790c021250addf81ba7900ba016e165442a527348f6f877aa55e1debb3eef9e860a334b4e8d834e6c9b438ed61a63d9a7ad4
"@babel/template": ^7.24.0
"@babel/traverse": ^7.24.0
"@babel/types": ^7.24.0
checksum: 2c1d9547c7a6e5aa648d4f3959252f825d4176ee52ed5430d65e50e68a138776adfd87ff3c8f9719ea6cd36601e935936d006340770ad8282b8664770aca8e33
languageName: node
linkType: hard

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

"@babel/parser@npm:^7.23.6":
version: 7.23.6
resolution: "@babel/parser@npm:7.23.6"
"@babel/parser@npm:^7.24.0":
version: 7.24.0
resolution: "@babel/parser@npm:7.24.0"
bin:
parser: ./bin/babel-parser.js
checksum: 140801c43731a6c41fd193f5c02bc71fd647a0360ca616b23d2db8be4b9739b9f951a03fc7c2db4f9b9214f4b27c1074db0f18bc3fa653783082d5af7c8860d5
checksum: 4a6afec49487a212e7a27345b0c090b56905efb62c0b3a1499b0a57a5b3bf43d9d1e99e31b137080eacc24dee659a29699740d0a6289999117c0d8c5a04bd68f
languageName: node
linkType: hard

Expand Down Expand Up @@ -1737,6 +1737,17 @@ __metadata:
languageName: node
linkType: hard

"@babel/template@npm:^7.24.0":
version: 7.24.0
resolution: "@babel/template@npm:7.24.0"
dependencies:
"@babel/code-frame": ^7.23.5
"@babel/parser": ^7.24.0
"@babel/types": ^7.24.0
checksum: f257b003c071a0cecdbfceca74185f18fe62c055469ab5c1d481aab12abeebed328e67e0a19fd978a2a8de97b28953fa4bc3da6d038a7345fdf37923b9fcdec8
languageName: node
linkType: hard

"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.21.4":
version: 7.23.2
resolution: "@babel/traverse@npm:7.23.2"
Expand All @@ -1755,21 +1766,21 @@ __metadata:
languageName: node
linkType: hard

"@babel/traverse@npm:^7.23.7":
version: 7.23.7
resolution: "@babel/traverse@npm:7.23.7"
"@babel/traverse@npm:^7.24.0":
version: 7.24.0
resolution: "@babel/traverse@npm:7.24.0"
dependencies:
"@babel/code-frame": ^7.23.5
"@babel/generator": ^7.23.6
"@babel/helper-environment-visitor": ^7.22.20
"@babel/helper-function-name": ^7.23.0
"@babel/helper-hoist-variables": ^7.22.5
"@babel/helper-split-export-declaration": ^7.22.6
"@babel/parser": ^7.23.6
"@babel/types": ^7.23.6
"@babel/parser": ^7.24.0
"@babel/types": ^7.24.0
debug: ^4.3.1
globals: ^11.1.0
checksum: d4a7afb922361f710efc97b1e25ec343fab8b2a4ddc81ca84f9a153f22d4482112cba8f263774be8d297918b6c4767c7a98988ab4e53ac73686c986711dd002e
checksum: 790cf14a6452575ceef767285bad0dd96d14b3640ed4e6a4ddb5b592e4e66020424bac21e4a4b965ac0d2fe9ed504fe3644748b1922fb8ac37c681cb435c3995
languageName: node
linkType: hard

Expand Down Expand Up @@ -1817,6 +1828,17 @@ __metadata:
languageName: node
linkType: hard

"@babel/types@npm:^7.24.0":
version: 7.24.0
resolution: "@babel/types@npm:7.24.0"
dependencies:
"@babel/helper-string-parser": ^7.23.4
"@babel/helper-validator-identifier": ^7.22.20
to-fast-properties: ^2.0.0
checksum: 4b574a37d490f621470ff36a5afaac6deca5546edcb9b5e316d39acbb20998e9c2be42f3fc0bf2b55906fc49ff2a5a6a097e8f5a726ee3f708a0b0ca93aed807
languageName: node
linkType: hard

"@base2/pretty-print-object@npm:1.0.1":
version: 1.0.1
resolution: "@base2/pretty-print-object@npm:1.0.1"
Expand Down Expand Up @@ -1875,7 +1897,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@commercetools-local/docs@workspace:."
dependencies:
"@babel/core": 7.23.7
"@babel/core": 7.24.0
"@commercetools-frontend/babel-preset-mc-app": 21.25.2
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
Expand Down Expand Up @@ -1904,8 +1926,8 @@ __metadata:
storybook-readme: 5.0.9
style-loader: 2.0.0
webpack: 4.47.0
yaml: 2.3.4
yaml-loader: 0.8.0
yaml: 2.4.0
yaml-loader: 0.8.1
peerDependencies:
prismjs: 1.29.0
languageName: unknown
Expand Down Expand Up @@ -3373,14 +3395,14 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:17.0.75":
version: 17.0.75
resolution: "@types/react@npm:17.0.75"
"@types/react@npm:17.0.76":
version: 17.0.76
resolution: "@types/react@npm:17.0.76"
dependencies:
"@types/prop-types": "*"
"@types/scheduler": "*"
csstype: ^3.0.2
checksum: aa503d1643049043fa491966cfc23996a56fb69c2018162ac97fb9ed89c9f26b906afd54ba2a81539f0e6c3487b4fa212d24c881a3efbfb8208a15cd45779e0a
checksum: 2bee42fc8328b3e93281601e53d0f1e6e6a8826c3b2a41635432fc859839a614245486d9bf559e98695d658a72f71f97d487f46c06a6148cfc827c7c50876af0
languageName: node
linkType: hard

Expand Down Expand Up @@ -8179,9 +8201,9 @@ __metadata:
linkType: hard

"ip@npm:^1.1.5":
version: 1.1.8
resolution: "ip@npm:1.1.8"
checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb
version: 1.1.9
resolution: "ip@npm:1.1.9"
checksum: b6d91fd45a856e3bd6d4f601ea0619d90f3517638f6918ebd079f959a8a6308568d8db5ef4fdf037e0d9cfdcf264f46833dfeea81ca31309cf0a7eb4b1307b84
languageName: node
linkType: hard

Expand Down Expand Up @@ -13871,21 +13893,23 @@ __metadata:
languageName: node
linkType: hard

"yaml-loader@npm:0.8.0":
version: 0.8.0
resolution: "yaml-loader@npm:0.8.0"
"yaml-loader@npm:0.8.1":
version: 0.8.1
resolution: "yaml-loader@npm:0.8.1"
dependencies:
javascript-stringify: ^2.0.1
loader-utils: ^2.0.0
yaml: ^2.0.0
checksum: d12dd264666b80baec23cea9f81cb677a9102d6f34ab45d8b6c085ace4d05b7285db9ce317db57264c3317af01128ce6e5b754e6866d15ccd75e8141902fb529
checksum: 2969eb7d6083a95a8d95369906bbc73d124125be5f61556506d230a57b7acc872abe836bf631f89aa97d9e8198bee8d100fa68d5a6524be84cd8eb5062cf76d3
languageName: node
linkType: hard

"yaml@npm:2.3.4":
version: 2.3.4
resolution: "yaml@npm:2.3.4"
checksum: e6d1dae1c6383bcc8ba11796eef3b8c02d5082911c6723efeeb5ba50fc8e881df18d645e64de68e421b577296000bea9c75d6d9097c2f6699da3ae0406c030d8
"yaml@npm:2.4.0":
version: 2.4.0
resolution: "yaml@npm:2.4.0"
bin:
yaml: bin.mjs
checksum: 3c25ebae34ee702af772ebbd1855a980b1487cd21d6220d952592edb4f7d89322aafd14753d99924ba7076eb4c5b3d809c64bb532402b01af280f7af674277f1
languageName: node
linkType: hard

Expand Down
2 changes: 1 addition & 1 deletion generators/package-json/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@manypkg/find-root": "1.1.0",
"@manypkg/get-packages": "1.1.3",
"@types/node": "18.19.8",
"@types/node": "18.19.21",
"cac": "6.7.14",
"omit-empty-es": "1.2.0",
"rcfile": "1.0.3"
Expand Down
2 changes: 1 addition & 1 deletion generators/readme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@types/listr": "0.14.9",
"@types/lodash": "4.14.202",
"@types/mdast": "3.0.15",
"@types/node": "18.19.8",
"@types/node": "18.19.21",
"@types/shelljs": "0.8.15",
"@types/unist": "3.0.2",
"@types/vfile": "4.0.0",
Expand Down
31 changes: 16 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
]
},
"dependencies": {
"@babel/core": "7.23.7",
"@babel/core": "7.24.0",
"@changesets/changelog-github": "0.5.0",
"@changesets/cli": "2.27.1",
"@commercetools-frontend/babel-preset-mc-app": "21.25.2",
Expand All @@ -77,11 +77,11 @@
"@commercetools/github-labels": "1.1.0",
"@commitlint/cli": "17.8.1",
"@commitlint/config-conventional": "17.8.1",
"@formatjs/cli": "6.2.6",
"@formatjs/cli": "6.2.7",
"@formatjs/intl-relativetimeformat": "11.2.12",
"@manypkg/cli": "0.21.2",
"@manypkg/get-packages": "1.1.3",
"@percy/cli": "1.27.7",
"@percy/cli": "1.28.0",
"@percy/puppeteer": "2.0.2",
"@preconstruct/cli": "2.8.3",
"@stylelint/postcss-css-in-js": "^0.38.0",
Expand All @@ -94,10 +94,10 @@
"@testing-library/react": "12.1.5",
"@testing-library/react-hooks": "8.0.1",
"@types/is-hotkey": "^0.1.7",
"@types/node": "18.19.8",
"@types/node": "18.19.21",
"@types/prettier": "^2.7.3",
"@typescript-eslint/eslint-plugin": "6.19.0",
"@typescript-eslint/parser": "6.19.0",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"babel-jest": "29.7.0",
"babel-loader": "8.3.0",
"babel-plugin-typescript-to-proptypes": "1.4.2",
Expand All @@ -107,7 +107,7 @@
"colors": "1.4.0",
"conventional-changelog-cli": "2.2.2",
"cross-env": "7.0.3",
"eslint": "8.56.0",
"eslint": "8.57.0",
"eslint-formatter-pretty": "4.1.0",
"execa": "6.1.0",
"formik": "^2.2.9",
Expand All @@ -127,7 +127,7 @@
"jest-watch-typeahead": "2.2.2",
"lint-staged": "13.3.0",
"moment": "2.30.1",
"moment-timezone": "0.5.44",
"moment-timezone": "0.5.45",
"omit-empty-es": "1.2.0",
"patch-package": "6.5.1",
"postcss": "8.4.38",
Expand All @@ -151,31 +151,32 @@
"stylelint-config-prettier": "9.0.5",
"stylelint-config-standard": "34.0.0",
"stylelint-order": "5.0.0",
"ts-jest": "29.1.1",
"ts-jest": "29.1.2",
"ts-node": "10.9.2",
"tsc-files": "1.1.4",
"typescript": "5.3.3",
"webpack": "5.89.0"
"webpack": "5.90.3"
},
"resolutions": {
"@babel/preset-env": "^7.18.6",
"@jest/types": "29.6.3",
"@types/eslint": "^8.2.2",
"@types/react": "17.0.75",
"@types/react": "17.0.76",
"@types/react-dom": "17.0.25",
"@types/react-router": "5.1.20",
"@types/unist": "3.0.2",
"@typescript-eslint/eslint-plugin": "6.19.0",
"@typescript-eslint/parser": "6.19.0",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"core-js-compat": "^3.23.4",
"trim": "^0.0.3",
"minimatch": "^3.0.5",
"json5": "^1.0.2"
"json5": "^2.0.0",
"react-from-dom": "0.6.2"
},
"engines": {
"node": ">=18 <19",
"npm": ">=6",
"yarn": ">=3"
},
"packageManager": "yarn@3.7.0"
"packageManager": "yarn@3.8.0"
}
Loading

0 comments on commit 91cedb5

Please sign in to comment.