Skip to content
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.

Sign up for GitHub

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

chore: remove 'ubergen exclude' from example package #19177

Merged
merged 3 commits into from
Mar 18, 2022
Merged

chore: remove 'ubergen exclude' from example package #19177

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ecef36
chore: remove 'ubergen exclude' from example package
rix0rrr Feb 26, 2022
0f2c545
Logic from pkglint -> ubergen
rix0rrr Feb 27, 2022
b91a30a
Merge branch 'master' into huijbers/no-exclude
mergify[bot] Mar 18, 2022
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
3 changes: 0 additions & 3 deletions packages/@aws-cdk/example-construct-library/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,5 @@
"env": {
"AWSLINT_BASE_CONSTRUCT": true
}
},
"ubergen": {
"exclude": true
}
}
12 changes: 0 additions & 12 deletions tools/@aws-cdk/pkglint/lib/rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1727,18 +1727,6 @@ export class UbergenPackageVisibility extends ValidationRule {
},
});
}
} else {
if (pkg.json.private && !pkg.json.ubergen?.exclude) {
pkg.report({
ruleName: this.name,
message: 'ubergen.exclude must be configured for private packages',
fix: () => {
pkg.json.ubergen = {
exclude: true,
};
},
});
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tools/@aws-cdk/ubergen/bin/ubergen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ async function findLibrariesToPackage(uberPackageJson: PackageJson): Promise<rea
for (const dir of await fs.readdir(librariesRoot)) {
const packageJson = await fs.readJson(path.resolve(librariesRoot, dir, 'package.json'));

if (packageJson.ubergen?.exclude) {
if (packageJson.private || packageJson.ubergen?.exclude) {
console.log(`\t⚠️ Skipping (ubergen excluded): ${packageJson.name}`);
continue;
} else if (packageJson.jsii == null ) {
Expand Down