Skip to content

Commit

Permalink
Updated the profile.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicholasnet
nicholasnet committed Apr 19, 2024
1 parent d19c7d5 commit 3680480
Show file tree
Hide file tree
Showing 22 changed files with 529 additions and 503 deletions.
4 changes: 2 additions & 2 deletions e2e/app.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ test('visits the app root url and show dependency dialog', async ({ page }) => {

// Make sure that items are displayed
await expect(page.locator('div[role="dialog"]')).toHaveCount(1)
await expect(page.locator('div[data-package-item="true"]')).toHaveCount(94)
await expect(page.locator('div[data-package-item="true"]')).toHaveCount(95)
await expect(page.locator('div[data-package-item-id="lombok"]')).toHaveCount(1)

// Make sure package filter works
Expand All @@ -35,7 +35,7 @@ test('visits the app root url and show dependency dialog', async ({ page }) => {

// Make sure that remove package button works
await expect(page.locator('button[title="Remove this package"]')).toHaveCount(1)
page.locator('button[title="Remove this package"]').click()
await page.locator('button[title="Remove this package"]').click()
await expect(page.locator('div[data-selected-package-item="true"]')).toHaveCount(0)

// Make sure that multiple works
Expand Down
790 changes: 398 additions & 392 deletions package-lock.json
View file

Large diffs are not rendered by default.

37 changes: 19 additions & 18 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@
"liquidjs": "^10.8.3",
"lodash.partition": "^4.6.0",
"marked": "^12.0.1",
"pinia": "^2.1.4",
"pinia": "^2.1.7",
"prismjs": "^1.29.0",
"vue": "^3.3.7"
"vue": "^3.4.21"
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.3",
"@tailwindcss/typography": "^0.5.9",
"@tsconfig/node20": "^20.1.2",
"@types/file-saver": "^2.0.5",
"@types/lodash.partition": "^4.6.7",
"@types/prismjs": "^1.26.1",
Expand All @@ -47,23 +46,25 @@
"postcss": "^8.4.23",
"prettier-plugin-tailwindcss": "^0.5.3",
"tailwindcss": "^3.4.0",
"@playwright/test": "^1.41.1",
"@rushstack/eslint-patch": "^1.3.3",
"@playwright/test": "^1.43.0",
"@rushstack/eslint-patch": "^1.8.0",
"@tsconfig/node20": "^20.1.4",
"@types/jsdom": "^21.1.6",
"@types/node": "^20.10.5",
"@vitejs/plugin-vue": "^5.0.3",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/test-utils": "^2.4.4",
"@vue/tsconfig": "^0.5.0",
"eslint": "^8.49.0",
"eslint-plugin-vue": "^9.17.0",
"@types/node": "^20.12.5",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/test-utils": "^2.4.5",
"@vue/tsconfig": "^0.5.1",
"eslint": "^8.57.0",
"eslint-plugin-playwright": "^1.5.4",
"eslint-plugin-vue": "^9.23.0",
"jsdom": "^24.0.0",
"npm-run-all2": "^6.1.1",
"prettier": "^3.0.3",
"npm-run-all2": "^6.1.2",
"prettier": "^3.2.5",
"typescript": "~5.4.0",
"vite": "^5.0.10",
"vitest": "^1.2.2",
"vue-tsc": "^2.0.6"
"vite": "^5.2.8",
"vitest": "^1.4.0",
"vue-tsc": "^2.0.11"
}
}
2 changes: 1 addition & 1 deletion src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const springProject = ref<{ active: boolean; valid: boolean; metaData: SpringPro
valid: true,
metaData: {
language: Language.Java,
springBootVersion: SpringBootVersion['3_2_4'] as SpringBootVersion,
springBootVersion: SpringBootVersion['3_2_5'] as SpringBootVersion,
group: defaultGroup,
name: 'demo',
artifact: 'demo',
Expand Down
8 changes: 4 additions & 4 deletions src/components/SpringProject.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,17 +156,17 @@ function validate() {
<div class="flex space-x-4">
<BaseInput
v-model="springBootVersion"
:label="SpringBootVersion['3_2_4']"
:label="SpringBootVersion['3_2_5']"
name="springBootVersion"
type="radio"
:value="SpringBootVersion['3_2_4']"
:value="SpringBootVersion['3_2_5']"
></BaseInput>
<BaseInput
v-model="springBootVersion"
:label="SpringBootVersion['3_1_10']"
:label="SpringBootVersion['3_1_11']"
name="springBootVersion"
type="radio"
:value="SpringBootVersion['3_1_10']"
:value="SpringBootVersion['3_1_11']"
></BaseInput>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/__tests__/SpringProject.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ describe('SpringProject works correctly', () => {
valid: false,
metaData: {
language: Language.Java,
springBootVersion: SpringBootVersion['3_1_10'] as SpringBootVersion,
springBootVersion: SpringBootVersion['3_1_11'] as SpringBootVersion,
group: 'test',
name: 'demo',
artifact: 'demo',
Expand All @@ -37,7 +37,7 @@ describe('SpringProject works correctly', () => {
valid: false,
metaData: {
language: Language.Java,
springBootVersion: SpringBootVersion['3_1_10'] as SpringBootVersion,
springBootVersion: SpringBootVersion['3_1_11'] as SpringBootVersion,
group: 'test',
name: 'demo',
artifact: 'demo',
Expand Down
4 changes: 2 additions & 2 deletions src/entity/SpringBootVersion.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export enum SpringBootVersion {
'3_2_4' = '3.2.4',
'3_1_10' = '3.1.10'
'3_2_5' = '3.2.5',
'3_1_11' = '3.1.11'
}
12 changes: 6 additions & 6 deletions src/generator/spring/SpringProjectGenerator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ function getMinimumJdkCompatibility(
return selectedJavaVersion
}

if (selectedSpringBootVersion === SpringBootVersion['3_1_10']) {
if (selectedSpringBootVersion === SpringBootVersion['3_1_11']) {
return 17
}

Expand Down Expand Up @@ -523,23 +523,23 @@ export function getContent(projectMetaData: { metadata: SpringProject; dependenc
springAIVersion: springAIVersion,
java: Language.Java,
ormVersion:
projectMetaData.metadata.springBootVersion === SpringBootVersion['3_1_10']
projectMetaData.metadata.springBootVersion === SpringBootVersion['3_1_11']
? '"6.2.22.Final"'
: '"6.4.4.Final"',
explicitDockerImageForGradleIsRequired:
SpringBootVersion['3_1_10'] === projectMetaData.metadata.springBootVersion,
SpringBootVersion['3_1_11'] === projectMetaData.metadata.springBootVersion,
kotlinSelected: projectMetaData.metadata.language === Language.Kotlin,
javaSelected: projectMetaData.metadata.language === Language.Java,
springCloudVersion:
projectMetaData.metadata.springBootVersion === SpringBootVersion['3_1_10'] ? '2022.0.5' : '2023.0.1',
projectMetaData.metadata.springBootVersion === SpringBootVersion['3_1_11'] ? '2022.0.5' : '2023.0.1',
springShellVersion:
projectMetaData.metadata.springBootVersion === SpringBootVersion['3_1_10'] ? '3.1.7' : '3.2.0',
projectMetaData.metadata.springBootVersion === SpringBootVersion['3_1_11'] ? '3.1.7' : '3.2.0',
jdkSourceCompatibility: getMinimumJdkCompatibility(
projectMetaData.metadata.language,
projectMetaData.metadata.javaVersion,
projectMetaData.metadata.springBootVersion
),
kotlinPlugin: projectMetaData.metadata.springBootVersion === SpringBootVersion['3_1_10'] ? '1.8.22' : '1.9.23'
kotlinPlugin: projectMetaData.metadata.springBootVersion === SpringBootVersion['3_1_11'] ? '1.8.22' : '1.9.23'
}

const contentTree: Array<File | Folder> =
Expand Down
22 changes: 11 additions & 11 deletions src/generator/spring/__tests__/SpringProjectGenerator.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ import type { SpringProject } from '@/entity/SpringProject'
import type { File } from '@/entity/File'
import type { Package } from '@/entity/Dependency'
import { Language } from '../../../entity/Language'
import spring3_1_10 from '../../../stores/spring-3_1_10'
import spring3_2_4 from '../../../stores/spring-3_2_4'
import spring3_1_11 from '../../../stores/spring-3_1_11'
import spring3_2_5 from '../../../stores/spring-3_2_5'

const spring3_1_6Packages: Package[] = spring3_1_10.flatMap((it) => {
const spring3_1_6Packages: Package[] = spring3_1_11.flatMap((it) => {
return it.packages.map((pack) => {
return pack
})
})

const spring3_2_4Packages: Package[] = spring3_2_4.flatMap((it) => {
const spring3_2_5Packages: Package[] = spring3_2_5.flatMap((it) => {
return it.packages.map((pack) => {
return pack
})
Expand All @@ -31,7 +31,7 @@ function getOutput(fileName: string) {

function getMetadata(
language: Language.Kotlin | Language.Java = Language.Java,
springBootVersion: SpringBootVersion = SpringBootVersion['3_1_10'],
springBootVersion: SpringBootVersion = SpringBootVersion['3_1_11'],
jdkVersion: 17 | 21 = 17
): SpringProject {
return {
Expand All @@ -50,7 +50,7 @@ function getMetadata(
function getGradleContent(
dependencies: Package[],
language: Language.Kotlin | Language.Java = Language.Java,
springBootVersion: SpringBootVersion = SpringBootVersion['3_1_10'],
springBootVersion: SpringBootVersion = SpringBootVersion['3_1_11'],
jdkVersion: 17 | 21 = 17
): string {
return (
Expand All @@ -61,12 +61,12 @@ function getGradleContent(
).content!!
}

function getDependencies(input: string[], springBootVersion: SpringBootVersion = SpringBootVersion['3_1_10']) {
if (springBootVersion === SpringBootVersion['3_1_10']) {
function getDependencies(input: string[], springBootVersion: SpringBootVersion = SpringBootVersion['3_1_11']) {
if (springBootVersion === SpringBootVersion['3_1_11']) {
return spring3_1_6Packages.filter((it) => input.includes(it.id))
}

return spring3_2_4Packages.filter((it) => input.includes(it.id))
return spring3_2_5Packages.filter((it) => input.includes(it.id))
}

describe('Can generate build.gradle properly', () => {
Expand Down Expand Up @@ -99,7 +99,7 @@ describe('Can generate build.gradle properly', () => {
'docker-compose-setup'
]),
Language.Kotlin,
SpringBootVersion['3_2_4']
SpringBootVersion['3_2_5']
)
).toBe(getOutput('all-developer-tools-selected-with-kotlin-for-spring-3-2'))
})
Expand All @@ -109,7 +109,7 @@ describe('Can generate build.gradle properly', () => {
getGradleContent(
getDependencies(['wavefront', 'distributed-tracing']),
Language.Java,
SpringBootVersion['3_2_4'],
SpringBootVersion['3_2_5'],
21
)
).toBe(getOutput('distributed-tracing-with-wavefront-with-java-spring_3_2_JDK_21'))
Expand Down
2 changes: 1 addition & 1 deletion ...r/spring/__tests__/outputs/all-developer-tools-selected-with-kotlin-for-spring-3-2.output
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("org.springframework.boot") version "3.2.4"
id("org.springframework.boot") version "3.2.5"
id("io.spring.dependency-management") version "1.1.4"
id("org.graalvm.buildtools.native") version "0.9.28"
id("com.netflix.dgs.codegen") version "6.0.3"
Expand Down
2 changes: 1 addition & 1 deletion src/generator/spring/__tests__/outputs/all-developer-tools-selected-with-kotlin.output
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("org.springframework.boot") version "3.1.10"
id("org.springframework.boot") version "3.1.11"
id("io.spring.dependency-management") version "1.1.4"
id("org.graalvm.buildtools.native") version "0.9.28"
kotlin("jvm") version "1.8.22"
Expand Down
2 changes: 1 addition & 1 deletion ...g/__tests__/outputs/distributed-tracing-with-wavefront-with-java-spring_3_2_JDK_21.output
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
java
id("org.springframework.boot") version "3.2.4"
id("org.springframework.boot") version "3.2.5"
id("io.spring.dependency-management") version "1.1.4"
}

Expand Down
2 changes: 1 addition & 1 deletion src/generator/spring/__tests__/outputs/nothing-selected-with-kotlin.output
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("org.springframework.boot") version "3.1.10"
id("org.springframework.boot") version "3.1.11"
id("io.spring.dependency-management") version "1.1.4"
kotlin("jvm") version "1.8.22"
kotlin("plugin.spring") version "1.8.22"
Expand Down
2 changes: 1 addition & 1 deletion src/generator/spring/__tests__/outputs/nothing-selected.output
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
java
id("org.springframework.boot") version "3.1.10"
id("org.springframework.boot") version "3.1.11"
id("io.spring.dependency-management") version "1.1.4"
}

Expand Down
33 changes: 19 additions & 14 deletions src/generator/vuejs/VueJsProjectGenerator.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,36 +218,36 @@ function getPackageJson(projectMetaData: VueJsProject, dependencies: Package[],
},
devDependencies: {
...{
'@vitejs/plugin-vue': '^5.0.3',
vite: '^5.0.10'
'@vitejs/plugin-vue': '^5.0.4',
vite: '^5.2.8'
},
...(typescriptSelected
? {
[`@tsconfig/node${projectMetaData.nodeVersion}`]:
projectMetaData.nodeVersion === 18 ? '^18.2.2' : '^20.1.2',
projectMetaData.nodeVersion === 18 ? '^18.2.2' : '^20.1.4',
'@types/node': projectMetaData.nodeVersion === 18 ? '^18.18.7' : '^20.11.28',
'@vue/tsconfig': '^0.5.1',
'npm-run-all2': '^6.1.2',
'vue-tsc': '^2.0.6',
'vue-tsc': '^2.0.11',
typescript: '~5.4.0'
}
: {}),
...(projectMetaData.includeEslint
? {
'@rushstack/eslint-patch': '^1.3.3',
eslint: '^8.49.0',
'eslint-plugin-vue': '^9.17.1'
'@rushstack/eslint-patch': '^1.8.0',
eslint: '^8.57.0',
'eslint-plugin-vue': '^9.23.0'
}
: {}),
...(projectMetaData.includeEslint && typescriptSelected
? {
'@vue/eslint-config-typescript': '^12.0.0'
'@vue/eslint-config-typescript': '^13.0.0'
}
: {}),
...(projectMetaData.includePrettier
? {
prettier: '^3.0.3',
'@vue/eslint-config-prettier': '^8.0.0'
prettier: '^3.2.5',
'@vue/eslint-config-prettier': '^9.0.0'
}
: {}),
...(projectMetaData.includeUnitTest
Expand All @@ -264,21 +264,21 @@ function getPackageJson(projectMetaData: VueJsProject, dependencies: Package[],
: {}),
...(projectMetaData.integrationTest === 'playwright'
? {
'@playwright/test': '^1.42.1'
'@playwright/test': '^1.43.0'
}
: {}),
...(projectMetaData.integrationTest === 'cypress'
? {
cypress: '^13.7.0',
cypress: '^13.7.2',
'start-server-and-test': '^2.0.3'
}
: {}),
...(projectMetaData.integrationTest === 'nightwatch'
? {
'@nightwatch/vue': '^3.1.0',
chromedriver: '^122.0.6',
chromedriver: '^123.0.1',
geckodriver: '^4.3.3',
nightwatch: '^3.5.0',
nightwatch: '^3.6.0',
'vite-plugin-nightwatch': '^0.4.6',
'ts-node': '^10.9.2'
}
Expand All @@ -288,6 +288,11 @@ function getPackageJson(projectMetaData: VueJsProject, dependencies: Package[],
'eslint-plugin-cypress': '^2.15.1'
}
: {}),
...(projectMetaData.integrationTest === 'playwright' && projectMetaData.includeEslint
? {
'eslint-plugin-playwright': '^1.5.4'
}
: {}),
...userChosenExplicitDevDependency
}
}
Expand Down
Loading

0 comments on commit 3680480

Please sign in to comment.