From 9d090cb3db3a972593530a1de749809029100290 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Fri, 15 Mar 2019 15:39:12 -0700 Subject: [PATCH] fix(bazel): correct regexp test for self-references in metadata (#29346) Add a test that catches the mistake, should have had this in the previous change PR Close #29346 --- packages/bazel/src/ng_package/packager.ts | 2 +- packages/bazel/test/ng_package/core_package.spec.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/bazel/src/ng_package/packager.ts b/packages/bazel/src/ng_package/packager.ts index e2ea020fc8..41cc9842a8 100644 --- a/packages/bazel/src/ng_package/packager.ts +++ b/packages/bazel/src/ng_package/packager.ts @@ -415,7 +415,7 @@ export * from '${srcDirRelative(inputPath, typingsFile.replace(/\.d\.tsx?$/, '') if (metadata.exports) { // Strip re-exports which are now self-references metadata.exports = - metadata.exports.filter((e: {from: string}) => !relativePathRegex.test(e.from)); + metadata.exports.filter((e: {from: string}) => !e.from.match(relativePathRegex)); } return JSON.stringify(metadata).replace(relativePathRegex, typingsRelativePath); } diff --git a/packages/bazel/test/ng_package/core_package.spec.ts b/packages/bazel/test/ng_package/core_package.spec.ts index a30e27eab5..57ce76a52c 100644 --- a/packages/bazel/test/ng_package/core_package.spec.ts +++ b/packages/bazel/test/ng_package/core_package.spec.ts @@ -89,6 +89,8 @@ describe('@angular/core ng_package', () => { .describe('angular metadata', () => { it('should have metadata.json files', () => { expect(shx.cat('core.metadata.json')).toContain(`"__symbolic":"module"`); }); + it('should not have self-references in metadata.json', + () => { expect(shx.cat('core.metadata.json')).not.toContain(`"from":"./core"`); }); }); describe('fesm2015', () => {