chore(misc): fix issues after rebase

nrwl · Nov 13, 2024 · ca32248 · ca32248
1 parent 63731f4
commit ca32248
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 13 deletions.
diff --git a/packages/expo/src/generators/library/library.spec.ts b/packages/expo/src/generators/library/library.spec.ts
@@ -233,6 +233,8 @@ describe('lib', () => {
           "compilerOptions": {
             "outDir": "../dist/out-tsc",
             "module": "commonjs",
+            "moduleResolution": "node10",
+            "jsx": "react-jsx",
             "types": ["jest", "node"]
           },
           "files": ["src/test-setup.ts"],

diff --git a/packages/react-native/src/generators/library/library.spec.ts b/packages/react-native/src/generators/library/library.spec.ts
@@ -227,6 +227,8 @@ describe('lib', () => {
           "compilerOptions": {
             "outDir": "../dist/out-tsc",
             "module": "commonjs",
+            "moduleResolution": "node10",
+            "jsx": "react-jsx",
             "types": ["jest", "node"]
           },
           "files": ["src/test-setup.ts"],

diff --git a/packages/react-native/src/generators/web-configuration/web-configuration.ts b/packages/react-native/src/generators/web-configuration/web-configuration.ts
@@ -81,15 +81,17 @@ export async function webConfigurationGenerator(
     );
   }
 
-  tasks.push(
-    addDependenciesToPackageJson(
-      tree,
-      {},
-      {
-        '@types/react-dom': typesReactVersion,
-      }
-    )
-  );
+  if (!options.skipPackageJson) {
+    tasks.push(
+      addDependenciesToPackageJson(
+        tree,
+        {},
+        {
+          '@types/react-dom': typesReactVersion,
+        }
+      )
+    );
+  }
 
   if (!options.skipFormat) {
     await formatFiles(tree);

diff --git a/packages/react/src/generators/application/application.spec.ts b/packages/react/src/generators/application/application.spec.ts
@@ -1433,7 +1433,7 @@ describe('app', () => {
             "jsx": "react-jsx",
             "module": "esnext",
             "moduleResolution": "bundler",
-            "outDir": "../dist/out-tsc",
+            "outDir": "./out-tsc/vitest",
             "types": [
               "vitest/globals",
               "vitest/importMeta",

diff --git a/packages/react/src/generators/library/library.spec.ts b/packages/react/src/generators/library/library.spec.ts
@@ -943,6 +943,7 @@ module.exports = withNx(
             ],
           },
           "exclude": [
+            "dist",
             "**/*.spec.ts",
             "**/*.test.ts",
             "**/*.spec.tsx",
@@ -963,6 +964,9 @@ module.exports = withNx(
             "src/**/*.spec.js",
             "src/**/*.test.jsx",
             "src/**/*.spec.jsx",
+            "eslint.config.js",
+            "eslint.config.cjs",
+            "eslint.config.mjs",
           ],
           "extends": "../tsconfig.base.json",
           "include": [
@@ -979,7 +983,7 @@ module.exports = withNx(
             "jsx": "react-jsx",
             "module": "esnext",
             "moduleResolution": "bundler",
-            "outDir": "../dist/out-tsc",
+            "outDir": "./out-tsc/vitest",
             "types": [
               "vitest/globals",
               "vitest/importMeta",

diff --git a/packages/remix/src/generators/application/application.impl.spec.ts b/packages/remix/src/generators/application/application.impl.spec.ts
@@ -391,6 +391,7 @@ describe('Remix Application', () => {
             ],
           },
           "exclude": [
+            "dist",
             "tests/**/*.spec.ts",
             "tests/**/*.test.ts",
             "tests/**/*.spec.tsx",
@@ -399,6 +400,9 @@ describe('Remix Application', () => {
             "tests/**/*.test.js",
             "tests/**/*.spec.jsx",
             "tests/**/*.test.jsx",
+            "eslint.config.js",
+            "eslint.config.cjs",
+            "eslint.config.mjs",
           ],
           "extends": "../tsconfig.base.json",
           "include": [
@@ -419,7 +423,7 @@ describe('Remix Application', () => {
             "jsx": "react-jsx",
             "module": "esnext",
             "moduleResolution": "bundler",
-            "outDir": "../dist/out-tsc",
+            "outDir": "./out-tsc/jest",
             "types": [
               "jest",
               "node",

diff --git a/packages/vite/src/generators/vitest/vitest-generator.ts b/packages/vite/src/generators/vitest/vitest-generator.ts
@@ -283,7 +283,9 @@ function createFiles(
     extendedConfig: isTsSolutionSetup
       ? `${rootOffset}tsconfig.base.json`
       : './tsconfig.json',
-    outDir: isTsSolutionSetup ? `./out-tsc/jest` : `${rootOffset}dist/out-tsc`,
+    outDir: isTsSolutionSetup
+      ? `./out-tsc/vitest`
+      : `${rootOffset}dist/out-tsc`,
   });
 }