Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ This plugin supports Nx migrations and provides necessary version and code updat

| qwik-nx version | Nx version |
| --------------- | ------------------------- |
| ^3.2.0 | ^21.0.0 |
| ^3.1.0 | ^20.7.0 |
| ^3.0.0 | ^20.0.0 |
| ^2.0.0 | ^17.0.0, ^18.0.0, ^19.0.0 |
Expand Down
8 changes: 4 additions & 4 deletions e2e/qwik-nx-e2e/tests/chore.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ describe('misc checks', () => {
expect(packageJson.dependencies).toBeUndefined();
expect(packageJson.devDependencies).toBeUndefined();
expect(packageJson.peerDependencies).toEqual({
'@nx/devkit': '^20.7.0',
'@nx/js': '^20.7.0',
'@nx/eslint': '^20.7.0',
'@nx/vite': '^20.7.0',
'@nx/devkit': '^21.0.0',
'@nx/js': '^21.0.0',
'@nx/eslint': '^21.0.0',
'@nx/vite': '^21.0.0',
});
},
DEFAULT_E2E_TIMEOUT
Expand Down
3 changes: 1 addition & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,5 @@
"libsDir": "packages"
},
"nxCloudAccessToken": "MmI5MzJhMDctNGYwMi00OTI1LWJiZjUtNWIwNTQ4NmY2ZjhjfHJlYWQtd3JpdGU=",
"useInferencePlugins": false,
"useLegacyCache": true
"useInferencePlugins": false
}
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"@commitlint/config-angular": "^17.8.1",
"@commitlint/config-conventional": "^17.8.1",
"@jscutlery/semver": "^4.2.0",
"@nx/cypress": "20.7.1",
"@nx/devkit": "20.7.1",
"@nx/eslint": "20.7.1",
"@nx/eslint-plugin": "20.7.1",
"@nx/jest": "20.7.1",
"@nx/js": "20.7.1",
"@nx/playwright": "20.7.1",
"@nx/plugin": "20.7.1",
"@nx/storybook": "20.7.1",
"@nx/vite": "20.7.1",
"@nx/workspace": "20.7.1",
"@nx/cypress": "21.0.3",
"@nx/devkit": "21.0.3",
"@nx/eslint": "21.0.3",
"@nx/eslint-plugin": "21.0.3",
"@nx/jest": "21.0.3",
"@nx/js": "21.0.3",
"@nx/playwright": "21.0.3",
"@nx/plugin": "21.0.3",
"@nx/storybook": "21.0.3",
"@nx/vite": "21.0.3",
"@nx/workspace": "21.0.3",
"@swc-node/register": "1.9.2",
"@swc/cli": "0.3.12",
"@swc/core": "1.5.7",
Expand Down Expand Up @@ -66,7 +66,7 @@
"jsonc-eslint-parser": "^2.4.0",
"kill-port": "2.0.1",
"ngx-deploy-npm": "8.0.1",
"nx": "20.7.1",
"nx": "21.0.3",
"prettier": "^2.8.8",
"pretty-quick": "^3.3.1",
"semver": "7.6.0",
Expand All @@ -81,7 +81,7 @@
"yargs": "17.7.1"
},
"dependencies": {
"@storybook/addon-interactions": "8.4.7",
"@storybook/addon-interactions": "8.6.14",
"@swc/helpers": "0.5.13",
"storybook": "^8.2.8",
"tslib": "^2.6.2"
Expand Down
8 changes: 4 additions & 4 deletions packages/qwik-nx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"generators": "./generators.json",
"executors": "./executors.json",
"peerDependencies": {
"@nx/devkit": "^20.7.0",
"@nx/js": "^20.7.0",
"@nx/vite": "^20.7.0",
"@nx/eslint": "^20.7.0"
"@nx/devkit": "^21.0.0",
"@nx/js": "^21.0.0",
"@nx/vite": "^21.0.0",
"@nx/eslint": "^21.0.0"
},
"nx-migrations": {
"migrations": "./migrations.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ exports[`add-root-property-to-vite-config migration should add/update the "root"
"import { qwikVite } from \\"@builder.io/qwik/optimizer\\";
import { defineConfig } from \\"vite\\";
import tsconfigPaths from \\"vite-tsconfig-paths\\";
import { qwikNxVite } from \\"qwik-nx/plugins\\";
export default defineConfig({
root: apps / myapp,
plugins: [
qwikNxVite(),
qwikVite({
client: {
outDir: \\"../../dist/apps/myapp/client\\",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ const getViteConfigSample = (
) => `import { qwikVite } from '@builder.io/qwik/optimizer';
import { defineConfig } from 'vite';
import tsconfigPaths from 'vite-tsconfig-paths';
import { qwikNxVite } from 'qwik-nx/plugins';

export default defineConfig({
${includeRootProp ? '\nroot: "apps/myapp"' : ''}
plugins: [
qwikNxVite(),
qwikVite({
client: {
outDir: '../../dist/apps/myapp/client',
Expand Down
5 changes: 0 additions & 5 deletions packages/qwik-nx/src/plugins/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
export * from './qwik-nx-vite.plugin';
export type {
ProjectFilter,
ExcludeProjectFilter,
QwikNxVitePluginOptions,
} from './models/qwik-nx-vite';
45 changes: 0 additions & 45 deletions packages/qwik-nx/src/plugins/models/qwik-nx-vite.ts

This file was deleted.

Loading
Loading