Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into smouillour/fix/chro…
Browse files Browse the repository at this point in the history
…matic-in-error
  • Loading branch information
smouillour committed Oct 6, 2023
2 parents 7cef5d1 + 9d137cb commit 600ba3a
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 22 deletions.
6 changes: 6 additions & 0 deletions .changeset/silent-boxes-pretend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@talend/scripts-config-react-webpack': minor
'@talend/bootstrap-theme': minor
---

feat: upgrade some webpack loader
11 changes: 11 additions & 0 deletions .changeset/twelve-pears-admire.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@talend/bootstrap-sass': minor
---

* 275e7da72 2023-08-03 feat(TDOPS-4875): use elevation tokens (#4821)
* bfc02c4fb 2023-07-24 feat(ARCH-720): use design-tokens for colors (#4779)
* c18aabb97 2023-01-12 feat(ARCH-662/scripts-core): move to ESM and remove presets (#4531)
* aa5223cf3 2021-12-20 chore(ARCH-404/CI): decrease time needed (#3564)
* 4842bffc2 2021-11-02 chore: wake up the playground to test UMDs (#3428)
* 667cd0a50 2021-10-05 chore: upgrade dependencies (#3459)

12 changes: 11 additions & 1 deletion packages/theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,19 @@
"@talend/scripts-core": "^15.0.0",
"copy-webpack-plugin": "^10.2.4",
"css-minimizer-webpack-plugin": "^4.2.2",
"css-loader": "^4.3.0",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.5.3",
"mini-css-extract-plugin": "^2.7.6",
"postcss": "^8.4.31",
"postcss-loader": "^7.3.3",
"postcss-preset-env": "^7.8.3",
"rimraf": "^3.0.2"
"rimraf": "^3.0.2",
"sass": "^1.68.0",
"sass-loader": "^13.3.2",
"style-loader": "^3.3.3",
"webpack": "^5.88.2",
"webpack-cli": "^4.10.0"
},
"peerDependencies": {},
"publishConfig": {
Expand Down
6 changes: 3 additions & 3 deletions tools/scripts-config-react-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
"html-webpack-plugin": "^5.5.3",
"inspectpack": "^4.7.1",
"mini-css-extract-plugin": "^2.7.6",
"postcss": "^8.4.29",
"postcss": "^8.4.31",
"postcss-loader": "^7.3.3",
"postcss-safe-parser": "^6.0.0",
"regenerator-runtime": "^0.13.11",
"resolve-url-loader": "^5.0.0",
"sass": "^1.67.0",
"sass-loader": "^12.6.0",
"sass": "^1.68.0",
"sass-loader": "^13.3.2",
"source-map-loader": "^4.0.1",
"style-loader": "^3.3.3",
"svg64": "^1.2.0",
Expand Down
30 changes: 12 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12458,11 +12458,6 @@ kleur@^4.1.5:
resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==

klona@^2.0.4:
version "2.0.6"
resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==

known-css-properties@^0.28.0:
version "0.28.0"
resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.28.0.tgz#8a8be010f368b3036fe6ab0ef4bbbed972bd6274"
Expand Down Expand Up @@ -14863,10 +14858,10 @@ postcss@^7.0.14, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
picocolors "^0.2.1"
source-map "^0.6.1"

postcss@^8.1.10, postcss@^8.2.14, postcss@^8.4.17, postcss@^8.4.21, postcss@^8.4.27, postcss@^8.4.29:
version "8.4.29"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.29.tgz#33bc121cf3b3688d4ddef50be869b2a54185a1dd"
integrity sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==
postcss@^8.1.10, postcss@^8.2.14, postcss@^8.4.17, postcss@^8.4.21, postcss@^8.4.27, postcss@^8.4.31:
version "8.4.31"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
dependencies:
nanoid "^3.3.6"
picocolors "^1.0.0"
Expand Down Expand Up @@ -16484,18 +16479,17 @@ safe-regex-test@^1.0.0:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

sass-loader@^12.6.0:
version "12.6.0"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz#5148362c8e2cdd4b950f3c63ac5d16dbfed37bcb"
integrity sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==
sass-loader@^13.3.2:
version "13.3.2"
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.2.tgz#460022de27aec772480f03de17f5ba88fa7e18c6"
integrity sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==
dependencies:
klona "^2.0.4"
neo-async "^2.6.2"

sass@^1.67.0:
version "1.67.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.67.0.tgz#fed84d74b9cd708db603b1380d6dc1f71bb24f6f"
integrity sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==
sass@^1.68.0:
version "1.68.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.68.0.tgz#0034b0cc9a50248b7d1702ac166fd25990023669"
integrity sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
Expand Down

0 comments on commit 600ba3a

Please sign in to comment.