Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ drivers/
error-screenshots/

vite.generated.ts
frontend/generated
src/main/frontend/generated
public
scripts/.cache
scripts/docs-app
Expand Down
2 changes: 1 addition & 1 deletion dspublisher/dspublisher-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const SCRIPTS = {
},
{
func: () => {
const generatedPath = path.resolve(projectRootPath, 'frontend', 'generated');
const generatedPath = path.resolve(projectRootPath, 'src', 'main', 'frontend', 'generated');
if (fs.existsSync(generatedPath)) {
fs.rmSync(generatedPath, { recursive: true });
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
},
"license": "UNLICENSED",
"lint-staged": {
"frontend/**/*.{js,ts,json}": [ "eslint --fix", "prettier --write" ]
"src/main/frontend/**/*.{js,ts,json}": [ "eslint --fix", "prettier --write" ]
},
"name": "docs",
"overrides": {
Expand Down
22 changes: 11 additions & 11 deletions scripts/pick/cherry-pick-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const config = {
"articles",
"src",
"dspublisher",
"frontend",
"src/main/frontend",
// files
"pom.xml",
".eslintrc.js",
Expand Down Expand Up @@ -74,11 +74,11 @@ const config = {
"articles/flow/components/index.asciiidoc",
"articles/flow/compatibility.adoc",

"frontend/demo/fusion",
"frontend/demo/upgrade-tool",
"frontend/demo/tools",
"frontend/demo/flow",
"frontend/demo/pwa",
"src/main/frontend/demo/fusion",
"src/main/frontend/demo/upgrade-tool",
"src/main/frontend/demo/tools",
"src/main/frontend/demo/flow",
"src/main/frontend/demo/pwa",

"src/main/java/com/vaadin/demo/flow",
"src/main/java/com/vaadin/demo/pwa",
Expand All @@ -95,12 +95,12 @@ const config = {

".gitattributes",

"frontend/demo/component/upload/upload-demo-mock-files.ts",
"frontend/demo/react-example.ts",
"frontend/demo/render-banner.ts",
"src/main/frontend/demo/component/upload/upload-demo-mock-files.ts",
"src/main/frontend/demo/react-example.ts",
"src/main/frontend/demo/render-banner.ts",

// Ignore all React examples
/frontend\/demo\/component\/.*\/react.*/,
/src\/main\/frontend\/demo\/component\/.*\/react.*/,
],
},
rename: {
Expand All @@ -121,7 +121,7 @@ const config = {
"dspublisher/.env",
"dspublisher/docs-theme",
"dspublisher/config/default.json",
"frontend/demo/component/upload/upload-demo-mock-files.ts",
"src/main/frontend/demo/component/upload/upload-demo-mock-files.ts",
]
},
// callbacks for changing the content of certain files
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading