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

fix(nextjs): vite workspace libs (#21553)

Browse Source
This commit is contained in:
Nicholas Cunningham 2024-02-02 12:12:14 -07:00 committed by GitHub
parent be1b36b227
commit b076d728e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 91 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
packages/next/src/generators/application/application.spec.ts
View File

@ -104,10 +104,10 @@ describe('app', () => {
const tsConfig = readJson(tree, 'tsconfig.json');
expect(tsConfig.include).toEqual([
'**/*.ts',
'**/*.tsx',
'**/*.js',
'**/*.jsx',
'src/**/*.ts',
'src/**/*.tsx',
'src/**/*.js',
'src/**/*.jsx',
'.next/types/**/*.ts',
`dist/${name}/.next/types/**/*.ts`,
'next-env.d.ts',
@ -675,6 +675,78 @@ describe('app', () => {
`
);
});
it('should scope tsconfig to the src/ project directory', async () => {
const name = uniq();
await applicationGenerator(tree, {
name,
style: 'css',
appDir: true,
rootProject: true,
projectNameAndRootFormat: 'as-provided',
src: true,
});
const tsconfigJSON = readJson(tree, `tsconfig.json`);
expect(tsconfigJSON.include).toEqual([
'src/**/*.ts',
'src/**/*.tsx',
'src/**/*.js',
'src/**/*.jsx',
'.next/types/**/*.ts',
`dist/${name}/.next/types/**/*.ts`,
'next-env.d.ts',
]);
});
it('should scope tsconfig to the app/ project directory', async () => {
const name = uniq();
await applicationGenerator(tree, {
name,
style: 'css',
appDir: true,
rootProject: true,
projectNameAndRootFormat: 'as-provided',
src: false,
});
const tsconfigJSON = readJson(tree, `tsconfig.json`);
expect(tsconfigJSON.include).toEqual([
'app/**/*.ts',
'app/**/*.tsx',
'app/**/*.js',
'app/**/*.jsx',
'.next/types/**/*.ts',
`dist/${name}/.next/types/**/*.ts`,
'next-env.d.ts',
]);
});
it('should scope tsconfig to the pages/ project directory', async () => {
const name = uniq();
await applicationGenerator(tree, {
name,
style: 'css',
appDir: false,
rootProject: true,
projectNameAndRootFormat: 'as-provided',
src: false,
});
const tsconfigJSON = readJson(tree, `tsconfig.json`);
expect(tsconfigJSON.include).toEqual([
'pages/**/*.ts',
'pages/**/*.tsx',
'pages/**/*.js',
'pages/**/*.jsx',
'next-env.d.ts',
]);
});
});
});

10
packages/next/src/generators/application/files/common/tsconfig.json__tmpl__
View File

@ -15,15 +15,15 @@
"plugins": [{ "name": "next" }]
},
"include": [
"**/*.ts",
"**/*.tsx",
"**/*.js",
"**/*.jsx",
"<%= rootPath %>**/*.ts",
"<%= rootPath %>**/*.tsx",
"<%= rootPath %>**/*.js",
"<%= rootPath %>**/*.jsx",
<% if (appDir) { %>
"<%= layoutTypeSrcPath %>",
"<%= layoutTypeDistPath %>",
<% } %>
"next-env.d.ts"
],
"exclude": ["node_modules", "jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
"exclude": ["node_modules", "jest.config.ts", "<%= rootPath %>**/*.spec.ts", "<%= rootPath %>**/*.test.ts"]
}

10
packages/next/src/generators/application/lib/create-application-files.ts
View File

@ -29,6 +29,15 @@ export function createApplicationFiles(host: Tree, options: NormalizedSchema) {
options.outputPath,
'.next/types/**/*.ts'
);
// scope tsconfig to the project directory so that it doesn't include other projects/libs
const rootPath = options.rootProject
? options.src
? 'src/'
: options.appDir
? 'app/'
: 'pages/'
: '';
const templateVariables = {
...names(options.name),
...options,
@ -36,6 +45,7 @@ export function createApplicationFiles(host: Tree, options: NormalizedSchema) {
tmpl: '',
offsetFromRoot,
layoutTypeSrcPath,
rootPath,
layoutTypeDistPath,
rootTsConfigPath: getRelativePathToRootTsConfig(
host,