miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(remix): tsconfigs were being incorrectly generated causing errors #21002 (#21387)

Browse Source
This commit is contained in:
Colum Ferry 2024-01-29 17:15:23 +00:00 committed by GitHub
parent 911f8d600a
commit 1ea09adaa3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 69 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/remix/src/generators/application/application.impl.spec.ts
View File

@ -323,6 +323,6 @@ function expectTargetsToBeCorrect(tree: Tree, projectRoot: string) {
expect(targets.start.command).toEqual('remix-serve build/index.js');
expect(targets.start.options.cwd).toEqual(projectRoot);
expect(targets.typecheck).toBeTruthy();
expect(targets.typecheck.command).toEqual('tsc');
expect(targets.typecheck.command).toEqual('tsc --project tsconfig.app.json');
expect(targets.typecheck.options.cwd).toEqual(projectRoot);
}

2
packages/remix/src/generators/application/application.impl.ts
View File

@ -78,7 +78,7 @@ export default async function (tree: Tree, _options: NxRemixGeneratorSchema) {
},
},
typecheck: {
command: `tsc`,
command: `tsc --project tsconfig.app.json`,
options: {
cwd: options.projectRoot,
},

20
packages/remix/src/generators/application/files/common/tsconfig.app.json__tmpl__ Normal file
View File

@ -0,0 +1,20 @@
{
"extends": "./tsconfig.json",
"include": [
"remix.env.d.ts",
"app/**/*.ts",
"app/**/*.tsx",
"app/**/*.js",
"app/**/*.jsx"
],
"exclude": [
"tests/**/*.spec.ts",
"tests/**/*.test.ts",
"tests/**/*.spec.tsx",
"tests/**/*.test.tsx",
"tests/**/*.spec.js",
"tests/**/*.test.js",
"tests/**/*.spec.jsx",
"tests/**/*.test.jsx"
]
}

34
packages/remix/src/generators/application/files/common/tsconfig.json__tmpl__
View File

@ -1,18 +1,24 @@
{
"extends": "<%= offsetFromRoot %>tsconfig.base.json",
"include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"],
"compilerOptions": {
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
"moduleResolution": "node",
"resolveJsonModule": true,
"target": "ES2019",
"strict": true,
"allowJs": true,
"forceConsistentCasingInFileNames": true,
// Remix takes care of building everything in `remix build`.
"noEmit": true
}
"lib": ["DOM", "DOM.Iterable", "ES2019"],
"isolatedModules": true,
"esModuleInterop": true,
"jsx": "react-jsx",
"moduleResolution": "node",
"resolveJsonModule": true,
"target": "ES2019",
"strict": true,
"allowJs": true,
"forceConsistentCasingInFileNames": true,
// Remix takes care of building everything in `remix build`.
"noEmit": true
},
"include": [],
"files": [],
"references": [
{
"path": "./tsconfig.app.json"
}
]
}

27
packages/remix/src/generators/application/lib/update-unit-test-config.ts
View File

@ -3,6 +3,7 @@ import {
joinPathFragments,
stripIndents,
type Tree,
updateJson,
workspaceRoot,
} from '@nx/devkit';
import {
@ -56,6 +57,32 @@ export function updateUnitTestConfig(
);
}
const pathToTsConfigSpec = joinPathFragments(
pathToRoot,
`tsconfig.spec.json`
);
updateJson(tree, pathToTsConfigSpec, (json) => {
json.includes = [
'vite.config.ts',
'vitest.config.ts',
'app/**/*.ts',
'app/**/*.tsx',
'app/**/*.js',
'app/**/*.jsx',
'tests/**/*.spec.ts',
'tests/**/*.test.ts',
'tests/**/*.spec.tsx',
'tests/**/*.test.tsx',
'tests/**/*.spec.js',
'tests/**/*.test.js',
'tests/**/*.spec.jsx',
'tests/**/*.test.jsx',
];
return json;
});
return addDependenciesToPackageJson(
tree,
{},