feat: Upgrade and enable svelte-core module #10958
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| package tech.jhipster.lite.generator.client.svelte.core.domain; | ||
|
|
||
| import static tech.jhipster.lite.module.domain.JHipsterModule.append; | ||
| import static tech.jhipster.lite.module.domain.JHipsterModule.from; | ||
| import static tech.jhipster.lite.module.domain.JHipsterModule.lineBeforeText; | ||
| import static tech.jhipster.lite.module.domain.JHipsterModule.moduleBuilder; | ||
|
|
@@ -13,8 +14,10 @@ | |
| import static tech.jhipster.lite.module.domain.npm.JHLiteNpmVersionSource.COMMON; | ||
| import static tech.jhipster.lite.module.domain.npm.JHLiteNpmVersionSource.SVELTE; | ||
|
|
||
| import java.util.function.Consumer; | ||
| import tech.jhipster.lite.module.domain.Indentation; | ||
| import tech.jhipster.lite.module.domain.JHipsterModule; | ||
| import tech.jhipster.lite.module.domain.JHipsterModule.JHipsterModuleBuilder; | ||
| import tech.jhipster.lite.module.domain.file.JHipsterDestination; | ||
| import tech.jhipster.lite.module.domain.file.JHipsterSource; | ||
| import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; | ||
|
|
@@ -26,96 +29,106 @@ public class SvelteModuleFactory { | |
|
|
||
| private static final String ENGINES_NEEDLE = " \"engines\":"; | ||
|
|
||
| private static final JHipsterSource PRIMARY_MAIN_SOURCE = SOURCE.append("src/main/webapp/lib/common/primary/app"); | ||
| private static final JHipsterDestination PRIMARY_MAIN_DESTINATION = to("src/main/webapp/lib/common/primary/app"); | ||
| private static final JHipsterSource CLIENT_COMMON = from("client/common"); | ||
|
|
||
| public JHipsterModule buildSvelteModule(JHipsterModuleProperties properties) { | ||
| Assert.notNull("properties", properties); | ||
|
|
||
| //@formatter:off | ||
| return moduleBuilder(properties) | ||
|
There was a problem hiding this comment. I think we should keep typescript. There was a problem hiding this comment. feel free to push changes, as needed |
||
| .preCommitActions(stagedFilesFilter("{src/**/,}*.{js,svelte}"), preCommitCommands("eslint --fix", "prettier --write", "npm run check")) | ||
|
There was a problem hiding this comment. On other client in jhipster-lite, the pre-commit action doesn't check, it just fixes/reformat. There was a problem hiding this comment. invocation of |
||
| .gitIgnore() | ||
| .comment("Vite") | ||
| .pattern("vite.config.js.timestamp-*") | ||
| .comment("Env") | ||
| .pattern(".env") | ||
| .pattern(".env.*") | ||
| .pattern("!.env.test") | ||
| .and() | ||
| .packageJson() | ||
| .addDevDependency(packageName("@sveltejs/adapter-static"), SVELTE) | ||
| .addDevDependency(packageName("@sveltejs/kit"), SVELTE) | ||
| .addDevDependency(packageName("@sveltejs/vite-plugin-svelte"), SVELTE) | ||
| .addDevDependency(packageName("@testing-library/jest-dom"), SVELTE) | ||
| .addDevDependency(packageName("@testing-library/svelte"), SVELTE) | ||
| .addDevDependency(packageName("@testing-library/user-event"), SVELTE) | ||
| .addDevDependency(packageName("@vitest/coverage-v8"), SVELTE) | ||
| .addDevDependency(packageName("@vitest/ui"), SVELTE) | ||
| .addDevDependency(packageName("@types/eslint"), SVELTE) | ||
| .addDevDependency(packageName("eslint"), COMMON) | ||
| .addDevDependency(packageName("eslint-config-prettier"), COMMON) | ||
| .addDevDependency(packageName("eslint-plugin-svelte"), SVELTE) | ||
| .addDevDependency(packageName("globals"), COMMON) | ||
| .addDevDependency(packageName("jsdom"), COMMON) | ||
| .addDevDependency(packageName("prettier-plugin-svelte"), SVELTE) | ||
| .addDevDependency(packageName("svelte"), SVELTE) | ||
| .addDevDependency(packageName("svelte-check"), SVELTE) | ||
| .addDevDependency(packageName("typescript"), COMMON) | ||
| .addDevDependency(packageName("vite"), COMMON) | ||
| .addDevDependency(packageName("vitest"), COMMON) | ||
| .addDevDependency(packageName("vitest-sonar-reporter"), COMMON) | ||
| .addScript(scriptKey("start"), scriptCommand("vite dev --port 9000 --open")) | ||
| .addScript(scriptKey("build"), scriptCommand("vite build")) | ||
| .addScript(scriptKey("preview"), scriptCommand("vite preview")) | ||
| .addScript(scriptKey("check"), scriptCommand("svelte-kit sync && svelte-check --tsconfig ./jsconfig.json")) | ||
|
There was a problem hiding this comment. I think we should keep the script structure from angular/react/vue modules (to be able to use TikUi) There was a problem hiding this comment. Feel free to push changes to this branch, as needed. There was a problem hiding this comment. I won't :). Those scripts needs to be updated otherwise it will break the current work on frontend modules and we won't be able to integrate styles in svelte and svelte module will be broken, again. I don't care about svelte integration so I won't contribute on that but I do care about frontend modules moving forward :) There was a problem hiding this comment. @DamnClin : Don't worry, I'll take the charge of harmonizing the svelte client with other clients :) @vishal423 is helping us here to bring back the svelte client to life ;) |
||
| .addScript(scriptKey("lint"), scriptCommand("prettier --check . && eslint .")) | ||
| .addScript(scriptKey("format"), scriptCommand("prettier --write '{,src/**/,cypress/**/}*.{md,json,js,cjs,svelte,css,html,yml}'")) | ||
|
There was a problem hiding this comment. The svelte module already depends on the prettier module, that setup a There was a problem hiding this comment. Since we use a different pattern in pre-commit hook, this script allows reuse of same for explicit invocation |
||
| .addScript(scriptKey("test"), scriptCommand("vitest run --coverage")) | ||
| .addScript(scriptKey("test:ui"), scriptCommand("vitest --ui --coverage")) | ||
| .addScript(scriptKey("test:watch"), scriptCommand("vitest")) | ||
| .and() | ||
| .optionalReplacements() | ||
| .in(path("package.json")) | ||
| .add(lineBeforeText(ENGINES_NEEDLE), type(properties.indentation())) | ||
| .and() | ||
| .and() | ||
| .files() | ||
| .add(SOURCE.append("src/main/webapp/routes").template("+page.svelte"), to("src/main/webapp/routes/+page.svelte")) | ||
| .add(PRIMARY_MAIN_SOURCE.template("App.svelte"), PRIMARY_MAIN_DESTINATION.append("App.svelte")) | ||
| .add(PRIMARY_MAIN_SOURCE.template("App.spec.js"), PRIMARY_MAIN_DESTINATION.append("App.spec.js")) | ||
| .batch(CLIENT_COMMON, to(".")) | ||
| .addFile(".npmrc") | ||
| .and() | ||
| .batch(SOURCE, to(".")) | ||
| .addTemplate("svelte.config.js") | ||
| .addTemplate("eslint.config.js") | ||
| .addTemplate("vite.config.js") | ||
| .addFile("vitest-setup.js") | ||
| .addTemplate("jsconfig.json") | ||
| .and() | ||
| .batch(SOURCE.file("src/main/webapp"), to("src/main/webapp")) | ||
| .addTemplate("app.html") | ||
| .and() | ||
| .batch(SOURCE.file("src/main/webapp/assets"), to("src/main/webapp/assets")) | ||
| .addFile("favicon.png") | ||
| .and() | ||
| .batch(SOURCE.file("src/main/webapp/assets/img"), to("src/main/webapp/assets/img")) | ||
| .addFile("jhipster-lite-neon-orange.png") | ||
| .addFile("svelte-logo.png") | ||
| .and() | ||
| .and() | ||
| .apply(patchPrettierConfig(properties)) | ||
| .build(); | ||
| //@formatter:on | ||
| } | ||
|
|
||
| private Consumer<JHipsterModuleBuilder> patchPrettierConfig(JHipsterModuleProperties properties) { | ||
| //@formatter:off | ||
| return moduleBuilder -> moduleBuilder | ||
| .mandatoryReplacements() | ||
| .in(path(".prettierrc")) | ||
| .add(lineBeforeText("plugins:"), properties.indentation().times(1) + "- prettier-plugin-svelte") | ||
| .add(append(), "\n# Svelte rules:") | ||
| .add(append(), "semi: false") | ||
| .add(append(), "svelteSortOrder: options-scripts-styles-markup") | ||
| .add(append(), "svelteStrictMode: true") | ||
| .and() | ||
| .and(); | ||
| //@formatter:on | ||
| } | ||
|
|
||
| private static String type(Indentation indentation) { | ||
| return indentation.spaces() + "\"type\": \"module\","; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| jhlite-hidden-resources.slugs: | ||
| - spring-boot-kafka-sample-producer-consumer | ||
| - angular-core | ||
| - react-core | ||
| - vue-core |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,7 +67,6 @@ application: | |
|
|
||
| jhlite-hidden-resources: | ||
| slugs: | ||
| - tikui | ||
|
|
||
| jhlite-preset-file: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import js from '@eslint/js' | ||
| import svelte from 'eslint-plugin-svelte' | ||
| import prettier from 'eslint-config-prettier'; | ||
| import globals from 'globals' | ||
|
|
||
| /** @type {import('eslint').Linter.Config[]} */ | ||
| export default [ | ||
| js.configs.recommended, | ||
| ...svelte.configs['flat/recommended'], | ||
| prettier, | ||
| ...svelte.configs['flat/prettier'], | ||
| { | ||
| ignores: [ | ||
| '{{projectBuildDirectory}}/', | ||
| 'dist/', | ||
| ], | ||
| }, | ||
| { | ||
| languageOptions: { | ||
| globals: { | ||
| ...globals.browser, | ||
| ...globals.node, | ||
| }, | ||
| }, | ||
| }, | ||
| ]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "extends": "./{{projectBuildDirectory}}/svelte-kit/tsconfig.json", | ||
| "compilerOptions": { | ||
| "allowJs": true, | ||
| "checkJs": true, | ||
| "esModuleInterop": true, | ||
| "forceConsistentCasingInFileNames": true, | ||
| "resolveJsonModule": true, | ||
| "skipLibCheck": true, | ||
| "sourceMap": true, | ||
| "strict": true, | ||
| "moduleResolution": "bundler" | ||
| }, | ||
| "include": ["src/main/webapp/**/*.js", "src/main/webapp/**/*.svelte"] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,15 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <title>{{ projectName }}</title> | ||
| <meta charset="utf-8" /> | ||
| <meta name="viewport" content="width=device-width,initial-scale=1" /> | ||
| <meta name="description" content="JHipster Lite project" /> | ||
| <link rel="icon" type="image/ico" href="%sveltekit.assets%/favicon.png" /> | ||
| <link rel="apple-touch-icon" href="%sveltekit.assets%/favicon.png" /> | ||
| %sveltekit.head% | ||
| </head> | ||
| <body data-sveltekit-preload-data="hover"> | ||
| <div style="display: contents">%sveltekit.body%</div> | ||
| </body> | ||
| </html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,5 @@ | ||
| <script> | ||
| import App from '$lib/common/primary/app/App.svelte'; | ||
| </script> | ||
|
|
||
| <App /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should keep things in the
appfolder: other modules (e.g. ts-pagination-domainà that generates additional content will generate content in the app folder.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
technically it's internal
libcontaining app specific components. feel free to update, if needed