diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54a920e31..31ae8439c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,8 +44,8 @@ jobs: - name: Install dependencies run: npm ci - # - name: Lint - # run: npm run nx affected -- --target=lint --parallel=3 + - name: Lint + run: npm run nx affected -- --target=lint --parallel=3 - name: Unit tests run: npm run nx affected -- --target=test --parallel=3 --ci --code-coverage diff --git a/packages/common/package.json b/packages/common/package.json index b93572d93..c380d0c0f 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -18,7 +18,10 @@ "nx-workspace", "nx-plugin" ], - "peerDependencies": { - "@nx/devkit": ">=16.0.0" + "dependencies": { + "@nx/devkit": "16.10.0", + "axios": "^1.5.1", + "nx": "16.10.0", + "tslib": "^2.6.2" } } diff --git a/packages/common/project.json b/packages/common/project.json index 9f7ce929d..a5710f7bd 100644 --- a/packages/common/project.json +++ b/packages/common/project.json @@ -12,8 +12,6 @@ "main": "packages/common/src/index.ts", "packageJson": "packages/common/package.json", "tsConfig": "packages/common/tsconfig.lib.json", - "updateBuildableProjectDepsInPackageJson": true, - "buildableProjectDepsInPackageJsonType": "dependencies", "assets": [ "packages/common/*.md", { @@ -33,7 +31,10 @@ "executor": "@nx/linter:eslint", "outputs": ["{options.outputFile}"], "options": { - "lintFilePatterns": ["packages/common/**/*.ts"] + "lintFilePatterns": [ + "packages/common/**/*.ts", + "packages/common/package.json" + ] } }, "test": { diff --git a/packages/internal/gradle-executors/package.json b/packages/internal/gradle-executors/package.json index 4abc91d8e..78f37d0cf 100644 --- a/packages/internal/gradle-executors/package.json +++ b/packages/internal/gradle-executors/package.json @@ -1,11 +1,13 @@ { "name": "@jnxplus/internal-gradle-executors", "version": "0.0.1", - "dependencies": { - "tslib": "^2.3.0" - }, "type": "commonjs", "main": "./src/index.js", "typings": "./src/index.d.ts", - "executors": "./executors.json" + "executors": "./executors.json", + "dependencies": { + "tslib": "^2.3.0", + "@jnxplus/common": "*", + "@nx/devkit": "16.10.0" + } } diff --git a/packages/internal/gradle-executors/project.json b/packages/internal/gradle-executors/project.json index 9db9105bd..410542823 100644 --- a/packages/internal/gradle-executors/project.json +++ b/packages/internal/gradle-executors/project.json @@ -37,7 +37,8 @@ "options": { "lintFilePatterns": [ "packages/internal/gradle-executors/**/*.ts", - "packages/internal/gradle-executors/package.json" + "packages/internal/gradle-executors/package.json", + "packages/internal/gradle-executors/executors.json" ] } }, diff --git a/packages/internal/testing/src/lib/testing.ts b/packages/internal/testing/src/lib/testing.ts index 19ff6c4f4..44acf52e0 100644 --- a/packages/internal/testing/src/lib/testing.ts +++ b/packages/internal/testing/src/lib/testing.ts @@ -175,6 +175,15 @@ export function patchRootPackageJson( writeJsonFile(path, json); } +export function addPrettierToPackageJsonFile(pluginDistAbsulutePath: string) { + const packageJsonPath = path.join(pluginDistAbsulutePath, 'package.json'); + const packageJson = readJsonFile(packageJsonPath); + packageJson.dependencies['prettier'] = '^2.8.7'; + packageJson.dependencies['@prettier/plugin-xml'] = '^2.2.0'; + packageJson.dependencies['prettier-plugin-java'] = '^2.1.0'; + writeJsonFile(packageJsonPath, packageJson); +} + export function patchPackageJson( pluginDistAbsulutePath: string, npmPackageName: string, diff --git a/packages/nx-gradle/package.json b/packages/nx-gradle/package.json index 6914e56a2..065967bd7 100644 --- a/packages/nx-gradle/package.json +++ b/packages/nx-gradle/package.json @@ -28,16 +28,15 @@ "scripts": { "postinstall": "node src/scripts/install-linters.js" }, - "dependencies": { - "prettier": "^2.8.7", - "prettier-plugin-java": "^2.1.0" - }, - "peerDependencies": { - "@nx/devkit": ">=16.3.0" - }, "repository": { "type": "git", "url": "https://github.com/khalilou88/jnxplus.git", "directory": "packages/nx-gradle" + }, + "dependencies": { + "@jnxplus/common": "*", + "nx": "16.10.0", + "tslib": "^2.6.2", + "@nx/devkit": "16.10.0" } } diff --git a/packages/nx-gradle/project.json b/packages/nx-gradle/project.json index ab910ec02..6da41e852 100644 --- a/packages/nx-gradle/project.json +++ b/packages/nx-gradle/project.json @@ -12,8 +12,7 @@ "main": "packages/nx-gradle/src/index.ts", "packageJson": "packages/nx-gradle/package.json", "tsConfig": "packages/nx-gradle/tsconfig.lib.json", - "updateBuildableProjectDepsInPackageJson": true, - "buildableProjectDepsInPackageJsonType": "dependencies", + "assets": [ "packages/nx-gradle/*.md", { @@ -158,7 +157,11 @@ "executor": "@nx/linter:eslint", "outputs": ["{options.outputFile}"], "options": { - "lintFilePatterns": ["packages/nx-gradle/**/*.ts"] + "lintFilePatterns": [ + "packages/nx-gradle/**/*.ts", + "packages/nx-gradle/package.json", + "packages/nx-gradle/executors.json" + ] } }, "test": { diff --git a/packages/nx-maven/package.json b/packages/nx-maven/package.json index 8115ae862..27438d8d7 100644 --- a/packages/nx-maven/package.json +++ b/packages/nx-maven/package.json @@ -30,18 +30,17 @@ "scripts": { "postinstall": "node src/scripts/install-linters.js" }, - "dependencies": { - "prettier": "^2.8.7", - "prettier-plugin-java": "^2.1.0", - "@prettier/plugin-xml": "^2.2.0", - "xmldoc": "~1.3.0" - }, - "peerDependencies": { - "@nx/devkit": ">=16.3.0" - }, "repository": { "type": "git", "url": "https://github.com/khalilou88/jnxplus.git", "directory": "packages/nx-maven" + }, + "dependencies": { + "@jnxplus/common": "*", + "@jnxplus/xml": "*", + "nx": "16.10.0", + "tslib": "^2.6.2", + "@nx/devkit": "16.10.0", + "xmldoc": "^1.3.0" } } diff --git a/packages/nx-maven/project.json b/packages/nx-maven/project.json index 292b58c41..781a32d6e 100644 --- a/packages/nx-maven/project.json +++ b/packages/nx-maven/project.json @@ -8,7 +8,11 @@ "executor": "@nx/linter:eslint", "outputs": ["{options.outputFile}"], "options": { - "lintFilePatterns": ["packages/nx-maven/**/*.ts"] + "lintFilePatterns": [ + "packages/nx-maven/**/*.ts", + "packages/nx-maven/package.json", + "packages/nx-maven/executors.json" + ] } }, "test": { @@ -27,8 +31,6 @@ "main": "packages/nx-maven/src/index.ts", "packageJson": "packages/nx-maven/package.json", "tsConfig": "packages/nx-maven/tsconfig.lib.json", - "updateBuildableProjectDepsInPackageJson": true, - "buildableProjectDepsInPackageJsonType": "dependencies", "assets": [ "packages/nx-maven/*.md", { diff --git a/packages/xml/package.json b/packages/xml/package.json index 1c9566e28..2b33e3d72 100644 --- a/packages/xml/package.json +++ b/packages/xml/package.json @@ -21,7 +21,9 @@ "maven", "maven multi-module project" ], - "peerDependencies": { - "@nx/devkit": ">=16.0.0" + "dependencies": { + "xmldoc": "^1.3.0", + "tslib": "^2.6.2", + "@nx/devkit": "16.10.0" } } diff --git a/packages/xml/project.json b/packages/xml/project.json index 1c092e711..7ac95369d 100644 --- a/packages/xml/project.json +++ b/packages/xml/project.json @@ -12,8 +12,6 @@ "main": "packages/xml/src/index.ts", "packageJson": "packages/xml/package.json", "tsConfig": "packages/xml/tsconfig.lib.json", - "updateBuildableProjectDepsInPackageJson": true, - "buildableProjectDepsInPackageJsonType": "dependencies", "assets": [ "packages/xml/*.md", { diff --git a/testing-projects/e2e/nx-boot-gradle-e2e/tests/nx-boot-gradle.spec.ts b/testing-projects/e2e/nx-boot-gradle-e2e/tests/nx-boot-gradle.spec.ts index 8ce7bd8a1..fc342ff07 100644 --- a/testing-projects/e2e/nx-boot-gradle-e2e/tests/nx-boot-gradle.spec.ts +++ b/testing-projects/e2e/nx-boot-gradle-e2e/tests/nx-boot-gradle.spec.ts @@ -13,6 +13,7 @@ import * as fse from 'fs-extra'; import * as path from 'path'; import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addTmpToGitignore, checkFilesDoNotExist, getData, @@ -39,7 +40,7 @@ describe('nx-boot-gradle e2e', () => { runNxNewCommand('', true); const pluginName = '@jnxplus/nx-gradle'; - const nxBootGradleDistAbsolutePath = path.join( + const nxGradleDistAbsolutePath = path.join( workspaceRoot, 'dist', 'packages', @@ -61,7 +62,7 @@ describe('nx-boot-gradle e2e', () => { 'gradle-executors', ); - patchRootPackageJson(pluginName, nxBootGradleDistAbsolutePath); + patchRootPackageJson(pluginName, nxGradleDistAbsolutePath); patchRootPackageJson('@jnxplus/common', commonDistAbsolutePath); patchRootPackageJson( '@jnxplus/internal-gradle-executors', @@ -75,16 +76,17 @@ describe('nx-boot-gradle e2e', () => { ); patchPackageJson( - nxBootGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/common', commonDistAbsolutePath, ); patchPackageJson( - nxBootGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/internal-gradle-executors', gradleDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxGradleDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-boot-gradle-kt-e2e/tests/nx-boot-gradle-kt.spec.ts b/testing-projects/e2e/nx-boot-gradle-kt-e2e/tests/nx-boot-gradle-kt.spec.ts index f36165dfe..6da3a0433 100644 --- a/testing-projects/e2e/nx-boot-gradle-kt-e2e/tests/nx-boot-gradle-kt.spec.ts +++ b/testing-projects/e2e/nx-boot-gradle-kt-e2e/tests/nx-boot-gradle-kt.spec.ts @@ -14,6 +14,7 @@ import * as path from 'path'; import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addTmpToGitignore, checkFilesDoNotExist, getData, @@ -41,7 +42,7 @@ describe('nx-boot-gradle kt e2e', () => { runNxNewCommand('', true); const pluginName = '@jnxplus/nx-gradle'; - const nxBootGradleDistAbsolutePath = path.join( + const nxGradleDistAbsolutePath = path.join( workspaceRoot, 'dist', 'packages', @@ -63,7 +64,7 @@ describe('nx-boot-gradle kt e2e', () => { 'gradle-executors', ); - patchRootPackageJson(pluginName, nxBootGradleDistAbsolutePath); + patchRootPackageJson(pluginName, nxGradleDistAbsolutePath); patchRootPackageJson('@jnxplus/common', commonDistAbsolutePath); patchRootPackageJson( '@jnxplus/internal-gradle-executors', @@ -77,16 +78,17 @@ describe('nx-boot-gradle kt e2e', () => { ); patchPackageJson( - nxBootGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/common', commonDistAbsolutePath, ); patchPackageJson( - nxBootGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/internal-gradle-executors', gradleDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxGradleDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-boot-maven-e2e/tests/nx-boot-maven.spec.ts b/testing-projects/e2e/nx-boot-maven-e2e/tests/nx-boot-maven.spec.ts index 229f44ad6..0ad38d9e2 100644 --- a/testing-projects/e2e/nx-boot-maven-e2e/tests/nx-boot-maven.spec.ts +++ b/testing-projects/e2e/nx-boot-maven-e2e/tests/nx-boot-maven.spec.ts @@ -1,5 +1,6 @@ import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addTmpToGitignore, checkFilesDoNotExist, getData, @@ -79,6 +80,7 @@ describe('nx-boot-maven e2e', () => { xmlDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxBootMavenDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-gradle-e2e/tests/nx-gradle.spec.ts b/testing-projects/e2e/nx-gradle-e2e/tests/nx-gradle.spec.ts index 3fc78d6bf..4037491cb 100644 --- a/testing-projects/e2e/nx-gradle-e2e/tests/nx-gradle.spec.ts +++ b/testing-projects/e2e/nx-gradle-e2e/tests/nx-gradle.spec.ts @@ -1,5 +1,6 @@ import { checkstyleVersion } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addTmpToGitignore, patchPackageJson, patchRootPackageJson, @@ -81,6 +82,7 @@ describe('nx-gradle e2e', () => { gradleDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxGradleDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-gradle-kt-e2e/tests/nx-gradle-kt.spec.ts b/testing-projects/e2e/nx-gradle-kt-e2e/tests/nx-gradle-kt.spec.ts index de1ac9c2a..9ce63d4cf 100644 --- a/testing-projects/e2e/nx-gradle-kt-e2e/tests/nx-gradle-kt.spec.ts +++ b/testing-projects/e2e/nx-gradle-kt-e2e/tests/nx-gradle-kt.spec.ts @@ -14,6 +14,7 @@ import * as path from 'path'; import { checkstyleVersion } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addTmpToGitignore, patchPackageJson, patchRootPackageJson, @@ -82,6 +83,7 @@ describe('nx-gradle kotlin dsl e2e', () => { gradleDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxGradleDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-maven-e2e/tests/nx-maven.spec.ts b/testing-projects/e2e/nx-maven-e2e/tests/nx-maven.spec.ts index 7cc553cd1..8c01774ba 100644 --- a/testing-projects/e2e/nx-maven-e2e/tests/nx-maven.spec.ts +++ b/testing-projects/e2e/nx-maven-e2e/tests/nx-maven.spec.ts @@ -1,8 +1,8 @@ import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addSpringBootVersion, addTmpToGitignore, - checkFilesDoNotExist, getData, killPorts, patchPackageJson, @@ -80,6 +80,7 @@ describe('nx-maven e2e', () => { xmlDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxBootMavenDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-micronaut-gradle-e2e/tests/nx-micronaut-gradle.spec.ts b/testing-projects/e2e/nx-micronaut-gradle-e2e/tests/nx-micronaut-gradle.spec.ts index 030aed666..d7300092e 100644 --- a/testing-projects/e2e/nx-micronaut-gradle-e2e/tests/nx-micronaut-gradle.spec.ts +++ b/testing-projects/e2e/nx-micronaut-gradle-e2e/tests/nx-micronaut-gradle.spec.ts @@ -13,6 +13,7 @@ import * as fse from 'fs-extra'; import * as path from 'path'; import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addTmpToGitignore, checkFilesDoNotExist, getData, @@ -40,7 +41,7 @@ describe('nx-micronaut-gradle e2e', () => { runNxNewCommand('', true); const pluginName = '@jnxplus/nx-gradle'; - const nxmicronautGradleDistAbsolutePath = path.join( + const nxGradleDistAbsolutePath = path.join( workspaceRoot, 'dist', 'packages', @@ -62,7 +63,7 @@ describe('nx-micronaut-gradle e2e', () => { 'gradle-executors', ); - patchRootPackageJson(pluginName, nxmicronautGradleDistAbsolutePath); + patchRootPackageJson(pluginName, nxGradleDistAbsolutePath); patchRootPackageJson('@jnxplus/common', commonDistAbsolutePath); patchRootPackageJson( '@jnxplus/internal-gradle-executors', @@ -76,16 +77,17 @@ describe('nx-micronaut-gradle e2e', () => { ); patchPackageJson( - nxmicronautGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/common', commonDistAbsolutePath, ); patchPackageJson( - nxmicronautGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/internal-gradle-executors', gradleDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxGradleDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-micronaut-gradle-kt-e2e/tests/nx-micronaut-gradle-kt.spec.ts b/testing-projects/e2e/nx-micronaut-gradle-kt-e2e/tests/nx-micronaut-gradle-kt.spec.ts index dc343cedf..353fae4b1 100644 --- a/testing-projects/e2e/nx-micronaut-gradle-kt-e2e/tests/nx-micronaut-gradle-kt.spec.ts +++ b/testing-projects/e2e/nx-micronaut-gradle-kt-e2e/tests/nx-micronaut-gradle-kt.spec.ts @@ -14,6 +14,7 @@ import * as path from 'path'; import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addTmpToGitignore, checkFilesDoNotExist, getData, @@ -41,7 +42,7 @@ describe('nx-micronaut-gradle kt e2e', () => { runNxNewCommand('', true); const pluginName = '@jnxplus/nx-gradle'; - const nxmicronautGradleDistAbsolutePath = path.join( + const nxGradleDistAbsolutePath = path.join( workspaceRoot, 'dist', 'packages', @@ -63,7 +64,7 @@ describe('nx-micronaut-gradle kt e2e', () => { 'gradle-executors', ); - patchRootPackageJson(pluginName, nxmicronautGradleDistAbsolutePath); + patchRootPackageJson(pluginName, nxGradleDistAbsolutePath); patchRootPackageJson('@jnxplus/common', commonDistAbsolutePath); patchRootPackageJson( '@jnxplus/internal-gradle-executors', @@ -77,16 +78,17 @@ describe('nx-micronaut-gradle kt e2e', () => { ); patchPackageJson( - nxmicronautGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/common', commonDistAbsolutePath, ); patchPackageJson( - nxmicronautGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/internal-gradle-executors', gradleDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxGradleDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-micronaut-maven-e2e/tests/nx-micronaut-maven.spec.ts b/testing-projects/e2e/nx-micronaut-maven-e2e/tests/nx-micronaut-maven.spec.ts index 469ca3030..76d005892 100644 --- a/testing-projects/e2e/nx-micronaut-maven-e2e/tests/nx-micronaut-maven.spec.ts +++ b/testing-projects/e2e/nx-micronaut-maven-e2e/tests/nx-micronaut-maven.spec.ts @@ -1,5 +1,6 @@ import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addTmpToGitignore, checkFilesDoNotExist, getData, @@ -40,7 +41,7 @@ describe('nx-micronaut-maven e2e', () => { runNxNewCommand('', true); const pluginName = '@jnxplus/nx-maven'; - const nxmicronautMavenDistAbsolutePath = path.join( + const nxBootMavenDistAbsolutePath = path.join( workspaceRoot, 'dist', 'packages', @@ -61,7 +62,7 @@ describe('nx-micronaut-maven e2e', () => { 'xml', ); - patchRootPackageJson(pluginName, nxmicronautMavenDistAbsolutePath); + patchRootPackageJson(pluginName, nxBootMavenDistAbsolutePath); patchRootPackageJson('@jnxplus/common', commonDistAbsolutePath); patchRootPackageJson('@jnxplus/xml', xmlDistAbsolutePath); patchPackageJson( @@ -70,16 +71,17 @@ describe('nx-micronaut-maven e2e', () => { commonDistAbsolutePath, ); patchPackageJson( - nxmicronautMavenDistAbsolutePath, + nxBootMavenDistAbsolutePath, '@jnxplus/common', commonDistAbsolutePath, ); patchPackageJson( - nxmicronautMavenDistAbsolutePath, + nxBootMavenDistAbsolutePath, '@jnxplus/xml', xmlDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxBootMavenDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-quarkus-gradle-e2e/tests/nx-quarkus-gradle.spec.ts b/testing-projects/e2e/nx-quarkus-gradle-e2e/tests/nx-quarkus-gradle.spec.ts index 012e21b64..f5b97099f 100644 --- a/testing-projects/e2e/nx-quarkus-gradle-e2e/tests/nx-quarkus-gradle.spec.ts +++ b/testing-projects/e2e/nx-quarkus-gradle-e2e/tests/nx-quarkus-gradle.spec.ts @@ -15,6 +15,7 @@ import * as path from 'path'; import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { addJVMMemory, + addPrettierToPackageJsonFile, addTmpToGitignore, checkFilesDoNotExist, getData, @@ -42,7 +43,7 @@ describe('nx-quarkus-gradle e2e', () => { runNxNewCommand('', true); const pluginName = '@jnxplus/nx-gradle'; - const nxQuarkusGradleDistAbsolutePath = path.join( + const nxGradleDistAbsolutePath = path.join( workspaceRoot, 'dist', 'packages', @@ -64,7 +65,7 @@ describe('nx-quarkus-gradle e2e', () => { 'gradle-executors', ); - patchRootPackageJson(pluginName, nxQuarkusGradleDistAbsolutePath); + patchRootPackageJson(pluginName, nxGradleDistAbsolutePath); patchRootPackageJson('@jnxplus/common', commonDistAbsolutePath); patchRootPackageJson( '@jnxplus/internal-gradle-executors', @@ -78,16 +79,17 @@ describe('nx-quarkus-gradle e2e', () => { ); patchPackageJson( - nxQuarkusGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/common', commonDistAbsolutePath, ); patchPackageJson( - nxQuarkusGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/internal-gradle-executors', gradleDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxGradleDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-quarkus-gradle-kt-e2e/tests/nx-quarkus-gradle-kt.spec.ts b/testing-projects/e2e/nx-quarkus-gradle-kt-e2e/tests/nx-quarkus-gradle-kt.spec.ts index 4b78e9327..a7f4cf8df 100644 --- a/testing-projects/e2e/nx-quarkus-gradle-kt-e2e/tests/nx-quarkus-gradle-kt.spec.ts +++ b/testing-projects/e2e/nx-quarkus-gradle-kt-e2e/tests/nx-quarkus-gradle-kt.spec.ts @@ -15,6 +15,7 @@ import * as path from 'path'; import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { addJVMMemory, + addPrettierToPackageJsonFile, addTmpToGitignore, checkFilesDoNotExist, getData, @@ -42,7 +43,7 @@ describe('nx-quarkus-gradle kt e2e', () => { runNxNewCommand('', true); const pluginName = '@jnxplus/nx-gradle'; - const nxQuarkusGradleDistAbsolutePath = path.join( + const nxGradleDistAbsolutePath = path.join( workspaceRoot, 'dist', 'packages', @@ -64,7 +65,7 @@ describe('nx-quarkus-gradle kt e2e', () => { 'gradle-executors', ); - patchRootPackageJson(pluginName, nxQuarkusGradleDistAbsolutePath); + patchRootPackageJson(pluginName, nxGradleDistAbsolutePath); patchRootPackageJson('@jnxplus/common', commonDistAbsolutePath); patchRootPackageJson( '@jnxplus/internal-gradle-executors', @@ -78,16 +79,17 @@ describe('nx-quarkus-gradle kt e2e', () => { ); patchPackageJson( - nxQuarkusGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/common', commonDistAbsolutePath, ); patchPackageJson( - nxQuarkusGradleDistAbsolutePath, + nxGradleDistAbsolutePath, '@jnxplus/internal-gradle-executors', gradleDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxGradleDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync( diff --git a/testing-projects/e2e/nx-quarkus-maven-e2e/tests/nx-quarkus-maven.spec.ts b/testing-projects/e2e/nx-quarkus-maven-e2e/tests/nx-quarkus-maven.spec.ts index ecf32e255..d10c25d68 100644 --- a/testing-projects/e2e/nx-quarkus-maven-e2e/tests/nx-quarkus-maven.spec.ts +++ b/testing-projects/e2e/nx-quarkus-maven-e2e/tests/nx-quarkus-maven.spec.ts @@ -1,5 +1,6 @@ import { checkstyleVersion, normalizeName } from '@jnxplus/common'; import { + addPrettierToPackageJsonFile, addTmpToGitignore, checkFilesDoNotExist, getData, @@ -40,7 +41,7 @@ describe('nx-quarkus-maven e2e', () => { runNxNewCommand('', true); const pluginName = '@jnxplus/nx-maven'; - const nxQuarkusMavenDistAbsolutePath = path.join( + const nxBootMavenDistAbsolutePath = path.join( workspaceRoot, 'dist', 'packages', @@ -61,7 +62,7 @@ describe('nx-quarkus-maven e2e', () => { 'xml', ); - patchRootPackageJson(pluginName, nxQuarkusMavenDistAbsolutePath); + patchRootPackageJson(pluginName, nxBootMavenDistAbsolutePath); patchRootPackageJson('@jnxplus/common', commonDistAbsolutePath); patchRootPackageJson('@jnxplus/xml', xmlDistAbsolutePath); patchPackageJson( @@ -70,16 +71,17 @@ describe('nx-quarkus-maven e2e', () => { commonDistAbsolutePath, ); patchPackageJson( - nxQuarkusMavenDistAbsolutePath, + nxBootMavenDistAbsolutePath, '@jnxplus/common', commonDistAbsolutePath, ); patchPackageJson( - nxQuarkusMavenDistAbsolutePath, + nxBootMavenDistAbsolutePath, '@jnxplus/xml', xmlDistAbsolutePath, ); + addPrettierToPackageJsonFile(nxBootMavenDistAbsolutePath); runPackageManagerInstallLinks(); await runNxCommandAsync(