feat(qwik-nx): migrate to [email protected] (#96)

Author: dmitry-stepanenko

.gitignore

@@ -33,6 +33,7 @@ npm-debug.log
 yarn-error.log
 testem.log
 /typings
+migrations.json
 
 # System Files
 .DS_Store

README.md

@@ -69,12 +69,14 @@ nx generate qwik-nx:setup-tailwind
 
 ## qwik-nx & Nx Compatibility Chart
 
-| qwik-nx version | Nx version |
-| --------------- | ---------- |
-| ~0.6.0          | >=15.6.0   |
-| ~0.5.0          | ~15.5.0    |
-| ~0.4.0          | ~15.4.0    |
-| <=0.4.0         | ^15.0.0    |
+| qwik-nx version  | Nx version |
+| ---------------- | ---------- |
+| ~0.12.0          | ^15.8.0    |
+| ~0.10.0, ~0.11.0 | ~15.7.2    |
+| ~0.6.0           | ~15.6.0    |
+| ~0.5.0           | ~15.5.0    |
+| ~0.4.0           | ~15.4.0    |
+| <=0.4.0          | ^15.0.0    |
 
 ## ROADMAP:
 

e2e/qwik-nx-e2e/jest.config.ts

@@ -2,13 +2,14 @@
 export default {
   displayName: 'qwik-nx-e2e',
   preset: '../../jest.preset.js',
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-    },
-  },
+  globals: {},
   transform: {
-    '^.+\\.[tj]s$': 'ts-jest',
+    '^.+\\.[tj]s$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+      },
+    ],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/e2e/qwik-nx-e2e',

e2e/qwik-nx-e2e/tests/application-basic-behavior.suite.ts

@@ -39,6 +39,10 @@ export function testApplicationBasicBehavior(generator: 'app' | 'preset') {
       await runNxCommandAsync('reset');
     });
 
+    it('should contain tsconfig.base.json', () => {
+      expect(() => checkFilesExist(`tsconfig.base.json`)).not.toThrow();
+    });
+
     it('should create qwik-nx', async () => {
       const result = await runNxCommandAsync(`build ${project}`);
       expect(stripConsoleColors(result.stdout.replace(/\n|\s/g, ''))).toContain(

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

@@ -27,7 +27,7 @@ describe('appGenerator e2e', () => {
 
       expect(packageJson.dependencies).toBeUndefined();
       expect(packageJson.peerDependencies).toEqual({
-        '@nrwl/vite': '~15.7.2',
+        '@nrwl/vite': '^15.8.0',
         '@builder.io/qwik': '^0.17.0',
         '@playwright/test': '^1.30.0',
         undici: '^5.18.0',

jest.preset.js

@@ -1,3 +1,15 @@
 const nxPreset = require('@nrwl/jest/preset').default;
 
-module.exports = { ...nxPreset };
+module.exports = {
+  ...nxPreset,
+  /* TODO: Update to latest Jest snapshotFormat
+   * By default Nx has kept the older style of Jest Snapshot formats
+   * to prevent breaking of any existing tests with snapshots.
+   * It's recommend you update to the latest format.
+   * You can do this by removing snapshotFormat property
+   * and running tests with --update-snapshot flag.
+   * Example: "nx affected --targets=test --update-snapshot"
+   * More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
+   */
+  snapshotFormat: { escapeString: true, printBasicPrototype: true },
+};

package.json

@@ -18,22 +18,22 @@
     "@commitlint/config-angular": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
     "@jscutlery/semver": "^2.29.0",
-    "@nrwl/cli": "15.7.2",
-    "@nrwl/cypress": "15.7.2",
-    "@nrwl/devkit": "15.7.2",
-    "@nrwl/eslint-plugin-nx": "15.7.2",
-    "@nrwl/jest": "15.7.2",
-    "@nrwl/js": "15.7.2",
-    "@nrwl/linter": "15.7.2",
-    "@nrwl/nx-plugin": "15.7.2",
-    "@nrwl/vite": "15.7.2",
-    "@nrwl/workspace": "15.7.2",
-    "@nxkit/playwright": "^2.1.1",
+    "@nrwl/cli": "15.8.2",
+    "@nrwl/cypress": "15.8.2",
+    "@nrwl/devkit": "15.8.2",
+    "@nrwl/eslint-plugin-nx": "15.8.2",
+    "@nrwl/jest": "15.8.2",
+    "@nrwl/js": "15.8.2",
+    "@nrwl/linter": "15.8.2",
+    "@nrwl/nx-plugin": "15.8.2",
+    "@nrwl/vite": "15.8.2",
+    "@nrwl/workspace": "15.8.2",
+    "@nxkit/playwright": "^2.1.2",
     "@swc-node/register": "^1.4.2",
     "@swc/cli": "~0.1.55",
     "@swc/core": "^1.2.173",
     "@types/fs-extra": "11.0.1",
-    "@types/jest": "28.1.1",
+    "@types/jest": "29.4.0",
     "@types/node": "16.11.7",
     "@types/tcp-port-used": "1.0.1",
     "@typescript-eslint/eslint-plugin": "^5.36.1",
@@ -49,19 +49,19 @@
     "fs-extra": "11.1.0",
     "husky": "^8.0.1",
     "is-windows": "1.0.2",
-    "jest": "28.1.1",
-    "jest-environment-jsdom": "28.1.1",
+    "jest": "29.4.3",
+    "jest-environment-jsdom": "29.4.3",
     "jsonc-eslint-parser": "^2.1.0",
     "kill-port": "2.0.1",
     "ngx-deploy-npm": "^5.2.0",
-    "nx": "15.7.2",
+    "nx": "15.8.2",
     "prettier": "^2.8.0",
     "pretty-quick": "^3.1.3",
     "tcp-port-used": "1.0.2",
     "tree-kill": "1.2.2",
-    "ts-jest": "28.0.5",
+    "ts-jest": "29.0.5",
     "ts-node": "10.9.1",
-    "typescript": "~4.8.2",
+    "typescript": "4.9.5",
     "verdaccio": "5.21.1",
     "vite": "4.1.1"
   },

packages/add-nx-to-qwik/jest.config.ts

@@ -2,13 +2,14 @@
 export default {
   displayName: 'add-nx-to-qwik',
 
-  globals: {
-    'ts-jest': {
-      tsConfig: '<rootDir>/tsconfig.spec.json',
-    },
-  },
+  globals: {},
   transform: {
-    '^.+\\.[tj]sx?$': 'ts-jest',
+    '^.+\\.[tj]sx?$': [
+      'ts-jest',
+      {
+        tsConfig: '<rootDir>/tsconfig.spec.json',
+      },
+    ],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/projects/add-nx-to-qwik',

packages/qwik-nx/jest.config.ts

@@ -2,13 +2,14 @@
 export default {
   displayName: 'qwik-nx',
   preset: '../../jest.preset.js',
-  globals: {
-    'ts-jest': {
-      tsconfig: '<rootDir>/tsconfig.spec.json',
-    },
-  },
+  globals: {},
   transform: {
-    '^.+\\.[tj]s$': 'ts-jest',
+    '^.+\\.[tj]s$': [
+      'ts-jest',
+      {
+        tsconfig: '<rootDir>/tsconfig.spec.json',
+      },
+    ],
   },
   testEnvironment: 'node',
   moduleFileExtensions: ['ts', 'js', 'html'],

packages/qwik-nx/package.json

@@ -22,7 +22,7 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "@nrwl/vite": "~15.7.2",
+    "@nrwl/vite": "^15.8.0",
     "@builder.io/qwik": "^0.17.0",
     "vite": "^4.0.0",
     "vitest": "^0.25.0",