diff --git a/e2e/qwik-nx-e2e/tests/chore.spec.ts b/e2e/qwik-nx-e2e/tests/chore.spec.ts index ce19f6ca..aec93b5f 100644 --- a/e2e/qwik-nx-e2e/tests/chore.spec.ts +++ b/e2e/qwik-nx-e2e/tests/chore.spec.ts @@ -28,14 +28,15 @@ describe('appGenerator e2e', () => { async () => { const packageJson = readJson('node_modules/qwik-nx/package.json'); - expect(packageJson.dependencies).toBeUndefined(); - expect(packageJson.peerDependencies).toEqual({ - '@nrwl/devkit': '^15.8.0', - '@nrwl/js': '^15.8.0', - '@nrwl/linter': '^15.8.0', - '@nrwl/vite': '^15.8.0', - tslib: '^2.3.0', - }); - }, DEFAULT_E2E_TIMEOUT); + expect(packageJson.peerDependencies).toBeUndefined(); + expect(packageJson.dependencies).toEqual({ + '@nrwl/devkit': '^15.8.0', + '@nrwl/js': '^15.8.0', + '@nrwl/linter': '^15.8.0', + '@nrwl/vite': '^15.8.0', + }); + }, + DEFAULT_E2E_TIMEOUT + ); }); }); diff --git a/package.json b/package.json index 260bca9b..ce2eefa0 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "build": "nx build", "commit": "git-cz", "format:fix": "pretty-quick --staged", - "local-registry": "./scripts/local-registry.sh", + "local-registry": "sh ./scripts/local-registry.sh", "prepare": "husky install", "start": "nx serve", "test": "nx test" diff --git a/packages/qwik-nx/package.json b/packages/qwik-nx/package.json index dc7d7647..c660d2ed 100644 --- a/packages/qwik-nx/package.json +++ b/packages/qwik-nx/package.json @@ -21,12 +21,11 @@ }, "generators": "./generators.json", "executors": "./executors.json", - "peerDependencies": { + "dependencies": { "@nrwl/devkit": "^15.8.0", "@nrwl/js": "^15.8.0", "@nrwl/linter": "^15.8.0", - "@nrwl/vite": "^15.8.0", - "tslib": "^2.3.0" + "@nrwl/vite": "^15.8.0" }, "nx-migrations": { "migrations": "./migrations.json" diff --git a/packages/qwik-nx/project.json b/packages/qwik-nx/project.json index f92ace2f..87ce563e 100644 --- a/packages/qwik-nx/project.json +++ b/packages/qwik-nx/project.json @@ -10,6 +10,7 @@ "options": { "outputPath": "dist/packages/qwik-nx", "main": "packages/qwik-nx/src/index.ts", + "updateBuildableProjectDepsInPackageJson": false, "tsConfig": "packages/qwik-nx/tsconfig.lib.json", "assets": [ "README.md", diff --git a/packages/qwik-nx/src/generators/preset/generator.spec.ts b/packages/qwik-nx/src/generators/preset/generator.spec.ts index 532d9792..95fd74c3 100644 --- a/packages/qwik-nx/src/generators/preset/generator.spec.ts +++ b/packages/qwik-nx/src/generators/preset/generator.spec.ts @@ -5,14 +5,7 @@ import generator from './generator'; import { QwikWorkspacePresetGeneratorSchema } from './schema'; import { Linter } from '@nrwl/linter'; -// eslint-disable-next-line @typescript-eslint/no-var-requires -const getInstalledNxVersionModule = require('../../utils/get-installed-nx-version'); - describe('preset generator', () => { - jest - .spyOn(getInstalledNxVersionModule, 'ensurePeerDependenciesInstalled') - .mockImplementation(); - let appTree: Tree; const options: QwikWorkspacePresetGeneratorSchema = { name: 'test', diff --git a/packages/qwik-nx/src/generators/preset/generator.ts b/packages/qwik-nx/src/generators/preset/generator.ts index 308893a9..77c69f75 100644 --- a/packages/qwik-nx/src/generators/preset/generator.ts +++ b/packages/qwik-nx/src/generators/preset/generator.ts @@ -1,13 +1,10 @@ import { Tree } from '@nrwl/devkit'; import { QwikWorkspacePresetGeneratorSchema } from './schema'; -import { ensurePeerDependenciesInstalled } from '../../utils/get-installed-nx-version'; export default async function ( tree: Tree, options: QwikWorkspacePresetGeneratorSchema ) { - ensurePeerDependenciesInstalled(tree); - options.directory = ''; options.name = options.qwikAppName ?? options.name; options.style = options.qwikAppStyle ?? options.style; diff --git a/packages/qwik-nx/src/utils/get-installed-nx-version.ts b/packages/qwik-nx/src/utils/get-installed-nx-version.ts index 41c6e1e9..1c57c2ea 100644 --- a/packages/qwik-nx/src/utils/get-installed-nx-version.ts +++ b/packages/qwik-nx/src/utils/get-installed-nx-version.ts @@ -1,4 +1,4 @@ -import { ensurePackage, readJson, Tree } from '@nrwl/devkit'; +import { readJson, Tree } from '@nrwl/devkit'; import { PackageJson } from 'nx/src/utils/package-json'; function readNxVersion(packageJson: PackageJson) { @@ -19,20 +19,3 @@ export function getInstalledNxVersion(tree: Tree): string { } throw new Error('Could not resolve nx version from the package.json'); } - -export function ensurePeerDependenciesInstalled(tree: Tree): void { - const packageJsonPath = `node_modules/qwik-nx/package.json`; - const pkgJson: PackageJson = readJson(tree, packageJsonPath); - - const nxVersion = getInstalledNxVersion(tree); - - for (const [dependency, version] of Object.entries( - pkgJson.peerDependencies! - )) { - if (dependency.startsWith('@nrwl/')) { - ensurePackage(dependency, nxVersion); - } else { - ensurePackage(dependency, version); - } - } -}