Skip to content

fix(@schematics/angular): migrate ng-packagr configurations in package.json #22135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,16 @@ import { allTargetOptions, getWorkspace } from '../../utility/workspace';

function* visit(directory: DirEntry): IterableIterator<string> {
for (const path of directory.subfiles) {
if (path === 'ng-package.json') {
yield join(directory.path, path);
if (path === 'package.json') {
const entry = directory.file(path);
if (entry?.content.toString().includes('ngPackage') !== true) {
continue;
}
} else if (path !== 'ng-package.json') {
continue;
}

yield join(directory.path, path);
}

for (const path of directory.subdirs) {
Expand All @@ -34,6 +41,9 @@ export default function (): Rule {
['lib', 'umdModuleIds'],
['lib', 'amdId'],
['lib', 'umdId'],
['ngPackage', 'lib', 'umdModuleIds'],
['ngPackage', 'lib', 'amdId'],
['ngPackage', 'lib', 'umdId'],
];

return async (tree, context) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,25 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
2,
),
);

tree.create(
'/package.json',
JSON.stringify(
{
dependencies: { tslib: '^2.0.0' },
ngPackage: {
lib: {
entryFile: 'src/public-api.ts',
amdId: 'foo',
umdId: 'foo',
umdModuleIds: ['foo'],
},
},
},
undefined,
2,
),
);
}

const schematicName = 'update-libraries-v13';
Expand Down Expand Up @@ -135,4 +154,19 @@ describe(`Migration to update library projects. ${schematicName}`, () => {
expect(lib.umdModuleIds).toBeUndefined();
});
});

describe('Ng-packagr properties in package.json', () => {
it(`should remove UMD related options from package.json`, async () => {
const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
const pkg = readJsonFile(newTree, 'package.json');
expect(pkg).toEqual({
dependencies: { tslib: '^2.0.0' },
ngPackage: {
lib: {
entryFile: 'src/public-api.ts',
},
},
});
});
});
});