Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: update postcss [security] #5314

Merged
merged 17 commits into from
Sep 10, 2024
Merged

fix: update postcss [security] #5314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
004989b
fix: update postcss [security]
jmfrancois May 21, 2024
cc6955e
fix: axios
jmfrancois May 21, 2024
a73aea0
Merge branch 'master' into jmfrancois/chore/update-postcss
jmfrancois May 21, 2024
ce526ce
Merge branch 'master' into jmfrancois/chore/update-postcss
jmfrancois May 24, 2024
54cd1de
Merge branch 'master' into jmfrancois/chore/update-postcss
jmfrancois Aug 27, 2024
c096b88
fix: try to add the config to go back on 6.x behavior
jmfrancois Aug 27, 2024
a04cd0e
fix: update icons postcss too
jmfrancois Aug 27, 2024
67724ad
Merge a04cd0ed833e67c364991e7d2164ae0f5f9aaca3 into 820ca0ab84984f6a8…
jmfrancois Aug 27, 2024
21df4c4
chore: yarn-deduplicate
github-actions[bot] Aug 27, 2024
eb55ea5
chore: commit formatting to trigger the CI
jmfrancois Aug 27, 2024
ee5a127
fix: add as-is to the webpack config
jmfrancois Aug 28, 2024
df7ea67
fix css-loader configuration for bootstrap.scss
yyanwang Sep 9, 2024
5a6e6e2
remove file-loader, it's deprecated
yyanwang Sep 9, 2024
69fe56e
rm url-loader
yyanwang Sep 9, 2024
2e7f839
rm url-loader
yyanwang Sep 9, 2024
628d035
fix css modules config
yyanwang Sep 9, 2024
7f85b0a
Merge branch 'master' into jmfrancois/chore/update-postcss
yyanwang Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .changeset/spicy-bananas-report.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@talend/scripts-config-react-webpack": patch
"@talend/storybook-docs": patch
"@talend/icons": patch
"@talend/bootstrap-theme": patch
---

fix: update postcss
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"prepare": "husky install"
},
"resolutions": {
"**/axios": "0.28.0",
"**/ace-builds": "1.10.1",
"**/cypress": "^13.6.0",
"**/@types/react": "^18.2.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/design-system/src/components/Button/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { forwardRef, Ref } from 'react';

import { AvailableSizes, ButtonVariantType } from './Primitive/ButtonPrimitive';
import ButtonDestructive, { ButtonDestructivePropsType } from './variations/ButtonDestructive';
import { ButtonPrimary, ButtonPrimaryPropsType } from './variations/ButtonPrimary';
import ButtonSecondary, { ButtonSecondaryPropsType } from './variations/ButtonSecondary';
import ButtonTertiary, { ButtonTertiaryPropsType } from './variations/ButtonTertiary';
import ButtonDestructive, { ButtonDestructivePropsType } from './variations/ButtonDestructive';
import { AvailableSizes, ButtonVariantType } from './Primitive/ButtonPrimitive';

type Primary<S extends AvailableSizes> = ButtonVariantType<'primary', ButtonPrimaryPropsType<S>>;
type Secondary<S extends AvailableSizes> = ButtonVariantType<
Expand Down
1 change: 1 addition & 0 deletions packages/design-system/src/components/Button/variations/ButtonPrimary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { forwardRef, Ref } from 'react';

import ButtonPrimitive, { AvailableSizes, BaseButtonProps } from '../Primitive/ButtonPrimitive';

import styles from './ButtonPrimary.module.scss';
Expand Down
3 changes: 1 addition & 2 deletions packages/icons/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"@talend/design-tokens": "^3.4.1",
"babel-loader": "^9.1.3",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^4.3.0",
"css-loader": "^7.1.2",
"mini-css-extract-plugin": "^2.9.0",
"mkdirp": "^1.0.4",
"prettier": "^3.3.2",
Expand All @@ -82,7 +82,6 @@
"string-replace-loader": "^2.3.0",
"style-loader": "^1.3.0",
"svgo": "^1.3.2",
"url-loader": "^4.1.1",
"webfonts-loader": "^8.0.1",
"webpack": "^5.92.0",
"webpack-cli": "^4.10.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module.exports = {
},
{
test: /\.(woff|eot|ttf|svg)$/,
loader: require.resolve('url-loader'),
type: 'asset/resource',
},
],
},
Expand Down
4 changes: 2 additions & 2 deletions packages/storybook-docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
"@types/node": "^6.14.13",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"css-loader": "^4.3.0",
"css-loader": "^7.1.1",
"mini-css-extract-plugin": "^2.9.0",
"postcss-loader": "^7.3.4",
"postcss-loader": "^8.1.1",
"resolve-url-loader": "^5.0.0",
"sass": "^1.77.8",
"sass-loader": "^14.2.1",
Expand Down
5 changes: 2 additions & 3 deletions packages/theme/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,11 @@
"@talend/scripts-core": "^16.5.0",
"copy-webpack-plugin": "^11.0.0",
"css-minimizer-webpack-plugin": "^5.0.1",
"css-loader": "^4.3.0",
"file-loader": "^6.2.0",
"css-loader": "^7.1.1",
"html-webpack-plugin": "^5.6.0",
"mini-css-extract-plugin": "^2.9.0",
"postcss": "^8.4.38",
"postcss-loader": "^7.3.4",
"postcss-loader": "^8.1.1",
"postcss-preset-env": "^7.8.3",
"rimraf": "^5.0.7",
"sass": "^1.77.8",
Expand Down
14 changes: 4 additions & 10 deletions packages/theme/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,10 @@ module.exports = (env, argv) => {
rules: [
{
test: /\.woff(2)?(\?[a-z0-9=&.]+)?$/,
use: [
{
loader: require.resolve('file-loader'),
options: {
outputPath: 'fonts',
name: '[name].[ext]',
esModule: false,
},
},
],
type: 'asset/resource',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adapt to breaking changes of css-loader 6:
https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md#notes

generator: {
filename: 'fonts/[name][ext]',
},
},
{
test: /bootstrap\.scss$/,
Expand Down
2 changes: 2 additions & 0 deletions tools/scripts-config-react-webpack/config/webpack.config.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ function getCommonStyleLoaders(enableModules, isEnvDevelopmentServe) {
cssOptions = {
sourceMap,
modules: {
namedExport: false,
exportLocalsConvention: 'as-is',
localIdentName: '[name]__[local]___[hash:base64:5]',
},
importLoaders: 1,
Expand Down
6 changes: 2 additions & 4 deletions tools/scripts-config-react-webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,13 @@
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^11.0.0",
"core-js-bundle": "^3.37.1",
"css-loader": "^4.3.0",
"file-loader": "^6.2.0",
"css-loader": "^7.1.1",
"fork-ts-checker-webpack-plugin": "^9.0.2",
"html-webpack-plugin": "^5.6.0",
"inspectpack": "^4.7.1",
"mini-css-extract-plugin": "^2.9.0",
"postcss": "^8.4.38",
"postcss-loader": "^7.3.4",
"postcss-loader": "^8.1.1",
"postcss-safe-parser": "^6.0.0",
"regenerator-runtime": "^0.13.11",
"resolve-url-loader": "^5.0.0",
Expand All @@ -55,7 +54,6 @@
"terser-webpack-plugin": "^5.3.10",
"tmp": "^0.2.3",
"url": "^0.11.3",
"url-loader": "^4.1.1",
"webpack": "^5.92.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^4.10.0",
Expand Down
Loading
Loading