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.

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

Improve deps in project generator #5872

Merged
merged 8 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
> 1%
last 4 versions
Firefox ESR
not ie 11
not dead
12 changes: 12 additions & 0 deletions packages/generator-volto/generators/app/templates/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"trailingComma": "all",
"singleQuote": true,
"overrides": [
{
"files": "*.overrides",
"options": {
"parser": "less"
}
}
]
}
23 changes: 23 additions & 0 deletions packages/generator-volto/generators/app/templates/.stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"extends": ["stylelint-config-idiomatic-order"],
"plugins": ["stylelint-prettier"],
"overrides": [
{
"files": ["**/*.less"],
"customSyntax": "postcss-less"
},
{
"files": ["**/*.overrides"],
"customSyntax": "postcss-less"
},
{
"files": ["**/*.scss"],
"customSyntax": "postcss-scss"
}
],
"rules": {
"prettier/prettier": true,
"order/properties-alphabetical-order": null
},
"ignoreFiles": "theme/themes/default/**/*.overrides"
}
107 changes: 34 additions & 73 deletions packages/generator-volto/generators/app/templates/package.json.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"start": "razzle start",
"postinstall": "make omelette && make patches",
"build": "razzle build --noninteractive",
"lint": "./node_modules/eslint/bin/eslint.js --max-warnings=0 'src/**/*.{js,jsx,ts,tsx}'",
"lint:fix": "./node_modules/eslint/bin/eslint.js --fix 'src/**/*.{js,jsx,ts,tsx}'",
"lint:ci": "./node_modules/eslint/bin/eslint.js --max-warnings=0 -f checkstyle 'src/**/*.{js,jsx,ts,tsx}' > eslint.xml",
"prettier": "./node_modules/.bin/prettier --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
"prettier:fix": "./node_modules/.bin/prettier --single-quote --write 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
"prettier:ci": "./node_modules/.bin/prettier --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
"lint": "eslint --max-warnings=0 'src/**/*.{js,jsx,ts,tsx}'",
"lint:fix": "eslint --fix 'src/**/*.{js,jsx,ts,tsx}'",
"lint:ci": "eslint --max-warnings=0 -f checkstyle 'src/**/*.{js,jsx,ts,tsx}' > eslint.xml",
"prettier": "prettier --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
"prettier:fix": "prettier --single-quote --write 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
"prettier:ci": "prettier --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}'",
"stylelint": "stylelint 'theme/**/*.{css,scss,less}' 'src/**/*.{css,scss,less}' --allow-empty-input",
"stylelint:overrides": "stylelint 'theme/**/*.overrides' 'src/**/*.overrides' --allow-empty-input",
"stylelint:fix": "yarn stylelint --fix && yarn stylelint:overrides --fix",
Expand Down Expand Up @@ -71,83 +71,44 @@
"__DEV__": true
}
},
"prettier": {
"trailingComma": "all",
"singleQuote": true,
"overrides": [
{
"files": "*.overrides",
"options": {
"parser": "less"
}
}
]
},
"stylelint": {
"extends": [
"stylelint-config-idiomatic-order"
],
"plugins": [
"stylelint-prettier"
],
"overrides": [
{
"files": [
"**/*.less"
],
"customSyntax": "postcss-less"
},
{
"files": [
"**/*.overrides"
],
"customSyntax": "postcss-less"
},
{
"files": [
"**/*.scss"
],
"customSyntax": "postcss-scss"
}
],
"rules": {
"prettier/prettier": true,
"rule-empty-line-before": [
"always-multi-line",
{
"except": [
"first-nested"
],
"ignore": [
"after-comment"
]
}
]
},
"ignoreFiles": "theme/themes/default/**/*.overrides"
},
"browserslist": [
">1%",
"last 4 versions",
"Firefox ESR",
"not ie 11",
"not dead"
],
"engines": {
"node": "^16 || ^18 || ^20"
"node": "^18 || ^20"
},
"dependencies": <%- dependencies %>,
"devDependencies": {
"@plone/scripts": "^3.0.0",
"@plone/scripts": "^3.5.0",
"@plone/types": "^1.0.0-alpha.5",
"@storybook/addon-actions": "^6.3.0",
"@storybook/addon-controls": "6.3.0",
"@storybook/addon-essentials": "^6.3.0",
"@storybook/addon-links": "^6.3.0",
"@storybook/builder-webpack5": "^6.5.15",
"@storybook/manager-webpack5": "^6.5.15",
"@storybook/react": "^6.3.0",
"@typescript-eslint/eslint-plugin": "7.1.1",
"@typescript-eslint/parser": "7.1.1",
"@testing-library/cypress": "10.0.1",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/react": "14.2.0",
"@testing-library/react-hooks": "8.0.1",
"@types/jest": "^29.5.8",
"@types/lodash": "^4.14.201",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/react-router-dom": "^5.3.3",
"@types/uuid": "^9.0.8",
"@typescript-eslint/eslint-plugin": "7.2.0",
"@typescript-eslint/parser": "7.2.0",
"cypress": "13.6.6",
"cypress-axe": "1.5.0",
"cypress-file-upload": "5.0.8",
"eslint": "8.49.0",
"eslint-config-prettier": "9.1.0",
"eslint-config-react-app": "7.0.1",
"eslint-import-resolver-alias": "1.1.2",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react-hooks": "4.6.0",
"jest-junit": "8.0.0",
"mrs-developer": "^2.1.1",
"postcss": "8.4.13",
Expand All @@ -158,7 +119,7 @@
"stylelint-prettier": "5.0.0",
"ts-jest": "^26.4.2",
"ts-loader": "9.4.4",
"typescript": "5.3.3"
"typescript": "5.4.2"
},
"resolutions": {
"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
Expand Down
1 change: 1 addition & 0 deletions packages/generator-volto/news/5870.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improve deps in project generator. @sneridagh @wesleybl