fix(react-native): fix tsc app (#18124)

xiongemi · web-flow · commit 48d49270686d · 2023-07-19T11:27:43.000-04:00
diff --git a/e2e/expo/src/expo.test.ts b/e2e/expo/src/expo.test.ts
@@ -2,13 +2,15 @@ import {
   checkFilesExist,
   cleanupProject,
   expectTestsPass,
+  getPackageManagerCommand,
   killPorts,
   newProject,
   promisifiedTreeKill,
   readJson,
   readResolvedConfiguration,
   runCLI,
   runCLIAsync,
+  runCommand,
   runCommandUntil,
   uniq,
   updateFile,
@@ -129,4 +131,19 @@ describe('expo', () => {
       checkFilesExist(`dist/libs/${libName}/src/index.d.ts`);
     }).not.toThrow();
   });
+
+  it('should tsc app', async () => {
+    expect(() => {
+      const pmc = getPackageManagerCommand();
+      runCommand(
+        `${pmc.runUninstalledPackage} tsc -p apps/${appName}/tsconfig.app.json`
+      );
+      checkFilesExist(
+        `dist/out-tsc/apps/${appName}/src/app/App.js`,
+        `dist/out-tsc/apps/${appName}/src/app/App.d.ts`,
+        `dist/out-tsc/libs/${libName}/src/index.js`,
+        `dist/out-tsc/libs/${libName}/src/index.d.ts`
+      );
+    }).not.toThrow();
+  });
 });
diff --git a/e2e/react-native/src/react-native.test.ts b/e2e/react-native/src/react-native.test.ts
@@ -194,4 +194,21 @@ describe('react native', () => {
       },
     });
   });
+
+  it('should tsc app', async () => {
+    expect(() => {
+      const pmc = getPackageManagerCommand();
+      runCommand(
+        `${pmc.runUninstalledPackage} tsc -p apps/${appName}/tsconfig.app.json`
+      );
+      checkFilesExist(
+        `dist/out-tsc/apps/${appName}/src/main.js`,
+        `dist/out-tsc/apps/${appName}/src/main.d.ts`,
+        `dist/out-tsc/apps/${appName}/src/app/App.js`,
+        `dist/out-tsc/apps/${appName}/src/app/App.d.ts`,
+        `dist/out-tsc/libs/${libName}/src/index.js`,
+        `dist/out-tsc/libs/${libName}/src/index.d.ts`
+      );
+    }).not.toThrow();
+  });
 });
diff --git a/packages/expo/src/generators/application/files/tsconfig.app.json.template b/packages/expo/src/generators/application/files/tsconfig.app.json.template
@@ -4,6 +4,7 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": ["node"]
   },
+  "files": ["<%= offsetFromRoot %>node_modules/@nx/expo/typings/svg.d.ts"],
   "exclude": ["jest.config.ts", "**/*.spec.ts", "**/*.spec.tsx", "test-setup.ts"],
   "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"]
 }
diff --git a/packages/expo/src/generators/application/files/tsconfig.json.template b/packages/expo/src/generators/application/files/tsconfig.json.template
@@ -8,19 +8,13 @@
     "skipLibCheck": true,
     "resolveJsonModule": true,
     "strict": true,
-    "composite": true,
     "declaration": true
   },
-  "files": [
-    "../../node_modules/@nx/expo/typings/svg.d.ts"
-  ],
+  "files": [],
   "include": [],
   "references": [
     {
       "path": "./tsconfig.app.json"
     }
-  ],
-  "exclude": [
-    "node_modules"
   ]
 }
diff --git a/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template b/packages/react-native/src/generators/application/files/app/src/app/App.tsx.template
@@ -356,7 +356,7 @@ export const App = () => {
                 <View style={[styles.listItem, styles.marginBottomMd]}>
                   <Svg width={48} height={48} viewBox="0 0 120 120" stroke="currentColor" fill="transparent">
                     <Path strokeWidth="2" d="M23 3.75V6.5c-3.036 0-5.5 2.464-5.5 5.5s-2.464 5.5-5.5 5.5-5.5 2.464-5.5 5.5H3.75C2.232 23 1 21.768 1 20.25V3.75C1 2.232 2.232 1 3.75 1h16.5C21.768 1 23 2.232 23 3.75Z" />
-                    <Path strokewidth="2" d="M23 6v14.1667C23 21.7307 21.7307 23 20.1667 23H6c0-3.128 2.53867-5.6667 5.6667-5.6667 3.128 0 5.6666-2.5386 5.6666-5.6666C17.3333 8.53867 19.872 6 23 6Z" />
+                    <Path strokeWidth="2" d="M23 6v14.1667C23 21.7307 21.7307 23 20.1667 23H6c0-3.128 2.53867-5.6667 5.6667-5.6667 3.128 0 5.6666-2.5386 5.6666-5.6666C17.3333 8.53867 19.872 6 23 6Z" />
                   </Svg>
                   <View style={styles.listItemTextContainer}>
                     <Text
diff --git a/packages/react-native/src/generators/application/files/app/tsconfig.app.json.template b/packages/react-native/src/generators/application/files/app/tsconfig.app.json.template
@@ -4,6 +4,7 @@
     "outDir": "<%= offsetFromRoot %>dist/out-tsc",
     "types": ["node"]
   },
+  "files": ["<%= offsetFromRoot %>node_modules/@nx/react-native/typings/svg.d.ts"],
   "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.spec.tsx", "test-setup.ts"],
   "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.js", "src/**/*.jsx"]
 }
diff --git a/packages/react-native/src/generators/application/files/app/tsconfig.json.template b/packages/react-native/src/generators/application/files/app/tsconfig.json.template
@@ -7,19 +7,13 @@
     "moduleResolution": "node",
     "skipLibCheck": true,
     "resolveJsonModule": true,
-    "composite": true,
     "declaration": true
   },
-  "files": [
-    "../../node_modules/@nx/react-native/typings/svg.d.ts"
-  ],
+  "files": [],
   "include": [],
   "references": [
     {
       "path": "./tsconfig.app.json"
     }
-  ],
-  "exclude": [
-    "node_modules"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"outDir": "<%= offsetFromRoot %>dist/out-tsc",`
`5`	`5`	`"types": ["node"]`
`6`	`6`	`},`
	`7`	`+ "files": ["<%= offsetFromRoot %>node_modules/@nx/expo/typings/svg.d.ts"],`
`7`	`8`	`"exclude": ["jest.config.ts", "*/.spec.ts", "*/.spec.tsx", "test-setup.ts"],`
`8`	`9`	`"include": ["*/.ts", "*/.tsx", "*/.js", "*/.jsx"]`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,19 +8,13 @@`
`8`	`8`	`"skipLibCheck": true,`
`9`	`9`	`"resolveJsonModule": true,`
`10`	`10`	`"strict": true,`
`11`		`- "composite": true,`
`12`	`11`	`"declaration": true`
`13`	`12`	`},`
`14`		`- "files": [`
`15`		`- "../../node_modules/@nx/expo/typings/svg.d.ts"`
`16`		`- ],`
	`13`	`+ "files": [],`
`17`	`14`	`"include": [],`
`18`	`15`	`"references": [`
`19`	`16`	`{`
`20`	`17`	`"path": "./tsconfig.app.json"`
`21`	`18`	`}`
`22`		`- ],`
`23`		`- "exclude": [`
`24`		`- "node_modules"`
`25`	`19`	`]`
`26`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,19 +7,13 @@`
`7`	`7`	`"moduleResolution": "node",`
`8`	`8`	`"skipLibCheck": true,`
`9`	`9`	`"resolveJsonModule": true,`
`10`		`- "composite": true,`
`11`	`10`	`"declaration": true`
`12`	`11`	`},`
`13`		`- "files": [`
`14`		`- "../../node_modules/@nx/react-native/typings/svg.d.ts"`
`15`		`- ],`
	`12`	`+ "files": [],`
`16`	`13`	`"include": [],`
`17`	`14`	`"references": [`
`18`	`15`	`{`
`19`	`16`	`"path": "./tsconfig.app.json"`
`20`	`17`	`}`
`21`		`- ],`
`22`		`- "exclude": [`
`23`		`- "node_modules"`
`24`	`18`	`]`
`25`	`19`	`}`