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

feat(js): new workspace uses scoped named in root package.json (#28271)

Browse Source 
This PR changes the root `package.json` to use a scoped name when using
`create-nx-workspace`. This was already done in most presets, but we
missed the old "package-based" setup.

e.g. These

```
create-nx-workspace acme --preset=ts
create-nx-workspace acme --preset=npm
```

Should all result in `@acme/source` being used in root `package.json`,
not `acme`. The scope will be used when generating projects if the user
doesn't pass `--importPath`.
This commit is contained in:
Jack Hsu 2024-10-03 12:41:11 -04:00 committed by GitHub
parent 5be5ad8a74
commit f22c63de2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
e2e/workspace-create/src/create-nx-workspace-npm.test.ts
View File

@ -68,7 +68,7 @@ describe('create-nx-workspace --preset=npm', () => {
checkFilesExist('tsconfig.base.json'); checkFilesExist('tsconfig.base.json');
const tsconfig = readJson(`tsconfig.base.json`); const tsconfig = readJson(`tsconfig.base.json`);
expect(tsconfig.compilerOptions.paths).toEqual({ expect(tsconfig.compilerOptions.paths).toEqual({
[libName]: [`packages/${libName}/src/index.ts`], [`@${wsName}/${libName}`]: [`packages/${libName}/src/index.ts`],
}); });
}, 1_000_000); }, 1_000_000);
@ -83,7 +83,7 @@ describe('create-nx-workspace --preset=npm', () => {
checkFilesExist('tsconfig.base.json'); checkFilesExist('tsconfig.base.json');
const tsconfig = readJson(`tsconfig.base.json`); const tsconfig = readJson(`tsconfig.base.json`);
expect(tsconfig.compilerOptions.paths).toEqual({ expect(tsconfig.compilerOptions.paths).toEqual({
[libName]: [`packages/${libName}/src/index.ts`], [`@${wsName}/${libName}`]: [`packages/${libName}/src/index.ts`],
}); });
}); });
@ -120,7 +120,7 @@ describe('create-nx-workspace --preset=npm', () => {
checkFilesExist('tsconfig.base.json'); checkFilesExist('tsconfig.base.json');
const tsconfig = readJson(`tsconfig.base.json`); const tsconfig = readJson(`tsconfig.base.json`);
expect(tsconfig.compilerOptions.paths).toEqual({ expect(tsconfig.compilerOptions.paths).toEqual({
[libName]: [`packages/${libName}/src/index.ts`], [`@${wsName}/${libName}`]: [`packages/${libName}/src/index.ts`],
}); });
}); });
@ -146,8 +146,8 @@ describe('create-nx-workspace --preset=npm', () => {
checkFilesExist('tsconfig.base.json'); checkFilesExist('tsconfig.base.json');
const tsconfig = readJson(`tsconfig.base.json`); const tsconfig = readJson(`tsconfig.base.json`);
expect(tsconfig.compilerOptions.paths).toEqual({ expect(tsconfig.compilerOptions.paths).toEqual({
[libName]: [`packages/${libName}/src/index.ts`], [`@${wsName}/${libName}`]: [`packages/${libName}/src/index.ts`],
[`${libName}/server`]: [`packages/${libName}/src/server.ts`], [`@${wsName}/${libName}/server`]: [`packages/${libName}/src/server.ts`],
}); });
}); });
@ -177,7 +177,7 @@ describe('create-nx-workspace --preset=npm', () => {
checkFilesExist('tsconfig.base.json'); checkFilesExist('tsconfig.base.json');
const tsconfig = readJson(`tsconfig.base.json`); const tsconfig = readJson(`tsconfig.base.json`);
expect(tsconfig.compilerOptions.paths).toEqual({ expect(tsconfig.compilerOptions.paths).toEqual({
[libName]: [`packages/${libName}/src/index.ts`], [`@${wsName}/${libName}`]: [`packages/${libName}/src/index.ts`],
}); });
}); });
@ -203,7 +203,7 @@ describe('create-nx-workspace --preset=npm', () => {
checkFilesExist('tsconfig.base.json'); checkFilesExist('tsconfig.base.json');
const tsconfig = readJson(`tsconfig.base.json`); const tsconfig = readJson(`tsconfig.base.json`);
expect(tsconfig.compilerOptions.paths).toEqual({ expect(tsconfig.compilerOptions.paths).toEqual({
[libName]: [`packages/${libName}/src/index.ts`], [`@${wsName}/${libName}`]: [`packages/${libName}/src/index.ts`],
}); });
}); });
@ -229,7 +229,7 @@ describe('create-nx-workspace --preset=npm', () => {
checkFilesExist('tsconfig.base.json'); checkFilesExist('tsconfig.base.json');
const tsconfig = readJson(`tsconfig.base.json`); const tsconfig = readJson(`tsconfig.base.json`);
expect(tsconfig.compilerOptions.paths).toEqual({ expect(tsconfig.compilerOptions.paths).toEqual({
[libName]: [`packages/${libName}/src/index.ts`], [`@${wsName}/${libName}`]: [`packages/${libName}/src/index.ts`],
}); });
}); });

2
packages/workspace/src/generators/new/files-package-based-repo/package.json__tmpl__
View File

@ -1,5 +1,5 @@
{ {
"name": "<%= formattedNames.fileName %>", "name": "@<%= formattedNames.fileName %>/source",
"version": "0.0.0", "version": "0.0.0",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {

4
packages/workspace/src/generators/new/generate-workspace-files.spec.ts
View File

@ -227,7 +227,7 @@ describe('@nx/workspace:generateWorkspaceFiles', () => {
"nx": "0.0.1", "nx": "0.0.1",
}, },
"license": "MIT", "license": "MIT",
"name": "proj", "name": "@proj/source",
"private": true, "private": true,
"scripts": {}, "scripts": {},
"version": "0.0.0", "version": "0.0.0",
@ -256,7 +256,7 @@ describe('@nx/workspace:generateWorkspaceFiles', () => {
"nx": "0.0.1", "nx": "0.0.1",
}, },
"license": "MIT", "license": "MIT",
"name": "proj", "name": "@proj/source",
"private": true, "private": true,
"scripts": {}, "scripts": {},
"version": "0.0.0", "version": "0.0.0",