fix: vue 2.7 typescript fork-ts issue (#264)

ZachJW34 · Jul 2, 2022 · 0162a96 · 0162a96
1 parent 4052e8c
commit 0162a96
Show file tree

Hide file tree

Showing 22 changed files with 37 additions and 86 deletions.
diff --git a/apps/docusaurus-e2e/tests/docusaurus.test.ts b/apps/docusaurus-e2e/tests/docusaurus.test.ts
@@ -1,5 +1,5 @@
 import { ensureNxProject, uniq } from '@nrwl/nx-plugin/testing';
-import { runNxCommandAsyncStripped } from '@nx-plus/test-utils';
+import { runNxCommandAsyncStripped } from '@nx-plus/shared/testing';
 
 describe('docusaurus e2e', () => {
   it('should create and build docusaurus', async () => {

diff --git a/apps/nuxt-e2e/tests/nuxt.test.ts b/apps/nuxt-e2e/tests/nuxt.test.ts
@@ -5,7 +5,7 @@ import {
   uniq,
   updateFile,
 } from '@nrwl/nx-plugin/testing';
-import { runNxCommandAsyncStripped } from '@nx-plus/test-utils';
+import { runNxCommandAsyncStripped } from '@nx-plus/shared/testing';
 
 describe('nuxt e2e', () => {
   beforeAll(() => {

diff --git a/apps/vite-e2e/tests/vite.spec.ts b/apps/vite-e2e/tests/vite.spec.ts
@@ -6,7 +6,7 @@ import {
   updateFile,
 } from '@nrwl/nx-plugin/testing';
 import { join } from 'path';
-import { runNxCommandAsyncStripped } from '@nx-plus/test-utils';
+import { runNxCommandAsyncStripped } from '@nx-plus/shared/testing';
 
 describe('vite e2e', () => {
   it('should create vite app', async () => {

diff --git a/apps/vue-e2e/tests/utils.ts b/apps/vue-e2e/tests/utils.ts
@@ -1,7 +1,7 @@
 import { tags } from '@angular-devkit/core';
 import { checkFilesExist, tmpProjPath } from '@nrwl/nx-plugin/testing';
 import * as cp from 'child_process';
-import { runNxCommandAsyncStripped } from '@nx-plus/test-utils';
+import { runNxCommandAsyncStripped } from '@nx-plus/shared/testing';
 
 export async function testGeneratedApp(
   appName: string,

diff --git a/apps/vue-e2e/tests/vue-2.test.ts b/apps/vue-e2e/tests/vue-2.test.ts
@@ -6,7 +6,7 @@ import {
   updateFile,
 } from '@nrwl/nx-plugin/testing';
 import { runNxProdCommandAsync, testGeneratedApp } from './utils';
-import { runNxCommandAsyncStripped } from '@nx-plus/test-utils';
+import { runNxCommandAsyncStripped } from '@nx-plus/shared/testing';
 
 describe('vue 2 e2e', () => {
   describe('app', () => {

diff --git a/apps/vue-e2e/tests/vue-3.test.ts b/apps/vue-e2e/tests/vue-3.test.ts
@@ -6,7 +6,7 @@ import {
   updateFile,
 } from '@nrwl/nx-plugin/testing';
 import { runNxProdCommandAsync, testGeneratedApp } from './utils';
-import { runNxCommandAsyncStripped } from '@nx-plus/test-utils';
+import { runNxCommandAsyncStripped } from '@nx-plus/shared/testing';
 
 describe('vue 3 e2e', () => {
   describe('app', () => {

diff --git a/libs/test-utils/.eslintrc.json → libs/shared/testing/.eslintrc.json b/libs/test-utils/.eslintrc.json → libs/shared/testing/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["../../.eslintrc.json"],
+  "extends": ["../../../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {

diff --git a/libs/shared/testing/README.md b/libs/shared/testing/README.md
@@ -0,0 +1,7 @@
+# shared-testing
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build shared-testing` to build the library.
diff --git a/libs/test-utils/package.json → libs/shared/testing/package.json b/libs/test-utils/package.json → libs/shared/testing/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@nx-plus/test-utils",
+  "name": "@nx-plus/shared/testing",
   "version": "0.0.1",
   "type": "commonjs"
 }
diff --git a/libs/shared/testing/project.json b/libs/shared/testing/project.json
@@ -0,0 +1,15 @@
+{
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/shared/testing/src",
+  "projectType": "library",
+  "targets": {
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/shared/testing/**/*.ts"]
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/libs/shared/testing/src/index.ts b/libs/shared/testing/src/index.ts
@@ -0,0 +1 @@
+export * from './lib/shared-testing';
diff --git a/libs/test-utils/src/lib/test-utils.ts → .../shared/testing/src/lib/shared-testing.ts b/libs/test-utils/src/lib/test-utils.ts → .../shared/testing/src/lib/shared-testing.ts
diff --git a/libs/test-utils/tsconfig.json → libs/shared/testing/tsconfig.json b/libs/test-utils/tsconfig.json → libs/shared/testing/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "module": "commonjs",
     "forceConsistentCasingInFileNames": true,
@@ -14,9 +14,6 @@
   "references": [
     {
       "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
     }
   ]
 }
diff --git a/libs/test-utils/tsconfig.lib.json → libs/shared/testing/tsconfig.lib.json b/libs/test-utils/tsconfig.lib.json → libs/shared/testing/tsconfig.lib.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../../../dist/out-tsc",
     "declaration": true,
     "types": []
   },

diff --git a/libs/test-utils/README.md b/libs/test-utils/README.md
diff --git a/libs/test-utils/jest.config.ts b/libs/test-utils/jest.config.ts
diff --git a/libs/test-utils/project.json b/libs/test-utils/project.json
diff --git a/libs/test-utils/src/index.ts b/libs/test-utils/src/index.ts
diff --git a/libs/test-utils/tsconfig.spec.json b/libs/test-utils/tsconfig.spec.json
diff --git a/libs/vue/src/webpack.ts b/libs/vue/src/webpack.ts
@@ -36,7 +36,7 @@ export function modifyTsConfigPaths(
 ): void {
   const tsConfigPath = path.join(context.root, options.tsConfig);
   const vue = loadModule('vue', context.root);
-  const isVue3 = semver.major(vue.version) === 3;
+  const isVue3orVue2_7 = semver.satisfies(vue.version, '>=2.7.0');
 
   config.module
     .rule('ts')
@@ -53,7 +53,7 @@ export function modifyTsConfigPaths(
       return loaderOptions;
     });
   config.plugin('fork-ts-checker').tap((args: ANY) => {
-    if (isVue3) {
+    if (isVue3orVue2_7) {
       args[0].typescript.configFile = tsConfigPath;
     } else {
       args[0].tsconfig = tsConfigPath;

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -34,7 +34,7 @@
     "paths": {
       "@nx-plus/docusaurus": ["libs/docusaurus/src/index.ts"],
       "@nx-plus/nuxt": ["libs/nuxt/src/index.ts"],
-      "@nx-plus/test-utils": ["libs/test-utils/src/index.ts"],
+      "@nx-plus/shared/testing": ["libs/shared/testing/src/index.ts"],
       "@nx-plus/vite": ["libs/vite/src/index.ts"],
       "@nx-plus/vue": ["libs/vue/src/index.ts"]
     }

diff --git a/workspace.json b/workspace.json
@@ -5,7 +5,7 @@
     "docusaurus-e2e": "apps/docusaurus-e2e",
     "nuxt": "libs/nuxt",
     "nuxt-e2e": "apps/nuxt-e2e",
-    "test-utils": "libs/test-utils",
+    "shared-testing": "libs/shared/testing",
     "vite": "libs/vite",
     "vite-e2e": "apps/vite-e2e",
     "vue": "libs/vue",