Skip to content

Commit d81ecdc

Browse files
feat(qwik-nx): bump up versions of the dependencies (#74)
* feat(qwik-nx): bump up versions of the dependencies * fix(qwik-nx): move nrwl/vite to peer dependencies
1 parent 2e1f4f6 commit d81ecdc

File tree

5 files changed

+27
-51
lines changed

5 files changed

+27
-51
lines changed

e2e/qwik-nx-e2e/tests/chore.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ describe('appGenerator e2e', () => {
3535
it("qwik-nx's package.json should contain only expected dependencies", async () => {
3636
const packageJson = readJson('node_modules/qwik-nx/package.json');
3737

38-
expect(packageJson.dependencies).toEqual({
39-
'@nrwl/vite': '15.6.1',
40-
});
38+
expect(packageJson.dependencies).toBeUndefined();
4139
expect(packageJson.peerDependencies).toEqual({
40+
'@nrwl/vite': '^15.6.0',
4241
'@builder.io/qwik': '^0.16.0',
4342
'@playwright/test': '^1.30.0',
4443
undici: '^5.18.0',

e2e/utils/index.ts

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,7 @@
22

33
import { runNxCommandAsync, uniq, tmpProjPath } from '@nrwl/nx-plugin/testing';
44
import { ChildProcess, exec, execSync } from 'child_process';
5-
import {
6-
createFileSync,
7-
ensureDirSync,
8-
readdirSync,
9-
readFileSync,
10-
removeSync,
11-
renameSync,
12-
statSync,
13-
writeFileSync,
14-
} from 'fs-extra';
15-
import * as path from 'path';
16-
import { join } from 'path';
5+
import { readdirSync, readFileSync, removeSync, statSync } from 'fs-extra';
176
import { check as portCheck } from 'tcp-port-used';
187
import { promisify } from 'util';
198
import * as chalk from 'chalk';
@@ -22,8 +11,6 @@ import {
2211
detectPackageManager,
2312
getPackageManagerCommand,
2413
} from 'nx/src/utils/package-manager';
25-
import { readJsonFile } from 'nx/src/utils/fileutils';
26-
import { workspaceRoot } from 'nx/src/utils/workspace-root';
2714

2815
const kill = require('kill-port');
2916
export const isWindows = require('is-windows');
@@ -33,21 +20,10 @@ export const promisifiedTreeKill: (
3320
signal: string
3421
) => Promise<void> = promisify(treeKill);
3522

36-
export function getNxVersion(): string {
37-
const { dependencies } = readJsonFile(
38-
join(workspaceRoot, `./dist/packages/qwik-nx/package.json`)
39-
);
40-
const version = dependencies['@nrwl/vite'];
41-
if (!version) {
42-
throw new Error('Could not retrieve Nx version');
43-
}
44-
return version;
45-
}
46-
4723
function getAdditionalPackageManagerCommands() {
4824
const pm = detectPackageManager();
4925
const [npmMajorVersion] = execSync(`npm -v`).toString().split('.');
50-
const publishedVersion = getNxVersion();
26+
const publishedVersion = execSync('npm view nx version');
5127
if (pm === 'npm') {
5228
return {
5329
createWorkspace: `npx ${

packages/qwik-nx/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@
2121
},
2222
"generators": "./generators.json",
2323
"executors": "./executors.json",
24-
"dependencies": {
25-
"@nrwl/vite": "^15.6.0"
26-
},
2724
"peerDependencies": {
25+
"@nrwl/vite": "^15.6.0",
2826
"@builder.io/qwik": "^0.16.0",
2927
"vite": "^4.0.0",
3028
"vitest": "^0.25.0",

packages/qwik-nx/src/utils/add-common-qwik-dependencies.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
nodeFetchVersion,
88
qwikCityVersion,
99
qwikVersion,
10+
undiciVersion,
1011
viteTsconfigPathsVersion,
1112
viteVersion,
1213
} from './versions';
@@ -21,6 +22,7 @@ export function addCommonQwikDependencies(host: Tree): GeneratorCallback {
2122
vite: viteVersion,
2223
'vite-tsconfig-paths': viteTsconfigPathsVersion,
2324
'node-fetch': nodeFetchVersion,
25+
undici: undiciVersion,
2426
// TODO: dependencies below should be setup correctly by Nx's generator, so not needed to provide them here?
2527
// "@types/eslint": typesEslint,
2628
// '@types/node': 'latest',
Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
// qwik packages
2-
export const qwikVersion = '0.16.2';
3-
export const qwikCityVersion = '0.0.128';
4-
export const qwikEslintPluginVersion = '0.16.2';
2+
export const qwikVersion = '~0.17.5';
3+
export const qwikCityVersion = '~0.1.0';
4+
export const qwikEslintPluginVersion = '~0.17.5';
55

66
// css preprocessors
7-
export const sassVersion = '1.56.1';
8-
export const lessVersion = '4.1.3';
9-
export const stylusVersion = '0.59.0';
7+
export const sassVersion = '~1.56.1';
8+
export const lessVersion = '~4.1.3';
9+
export const stylusVersion = '~0.59.0';
1010

11-
export const viteVersion = '4.0.4';
12-
export const viteTsconfigPathsVersion = '4.0.3';
13-
export const vitestVersion = '0.25.8';
11+
export const undiciVersion = '^5.18.0';
12+
export const viteVersion = '~4.1.1';
13+
export const viteTsconfigPathsVersion = '~4.0.3';
14+
export const vitestVersion = '^0.25.8';
1415

15-
export const autoprefixerVersion = '10.4.11';
16-
export const postcssVersion = '8.4.16';
17-
export const tailwindcssVersion = '3.1.8';
16+
export const autoprefixerVersion = '~10.4.11';
17+
export const postcssVersion = '~8.4.16';
18+
export const tailwindcssVersion = '~3.1.8';
1819

1920
// nxkit packages
2021
export const nxKitVersion = '^2.1.1';
2122

2223
// cloudflare-pages integration
23-
export const wranglerVersion = 'latest';
24+
export const wranglerVersion = '^2.8.0';
2425
export const nxCloudflareWrangler = '^2.0.0';
2526

2627
// other
27-
export const eslintVersion = '8.28.0';
28-
export const tsEslintVersion = '5.43.0';
29-
export const prettierVersion = '2.7.1';
30-
export const typescriptVersion = '4.9.3';
31-
export const nodeFetchVersion = '3.3.0';
32-
export const typesEslint = '8.4.10';
28+
export const eslintVersion = '~8.28.0';
29+
export const tsEslintVersion = '~5.43.0';
30+
export const prettierVersion = '~2.7.1';
31+
export const typescriptVersion = '~4.9.3';
32+
export const nodeFetchVersion = '~3.3.0';
33+
export const typesEslint = '~8.4.10';

0 commit comments

Comments
 (0)