Merge pull request #7271 from Achal1607/updated-prepare-bundles
Restructured node_modules license and package.json Validation Logic
diff --git a/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java b/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java
index 5349a20..d24c6f5 100644
--- a/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java
+++ b/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java
@@ -107,18 +107,16 @@
if ("@types".equals(module.getFileName().toString())) continue;
if ("@esbuild".equals(module.getFileName().toString())) continue;
if ("@microsoft".equals(module.getFileName().toString())) continue;
- if ("@vscode".equals(module.getFileName().toString())) {
- try (DirectoryStream<Path> sds = Files.newDirectoryStream(module)) {
- for (Path sModule : sds) {
- checkModule(sModule, sb, tokens2Projects, project2License, bundlesDir, targetDir, externalDir, binariesList);
- }
+ Path packageJson = module.resolve("package.json");
+ if (Files.isReadable(packageJson)) {
+ checkModule(module, sb, tokens2Projects, project2License, bundlesDir, targetDir, externalDir, binariesList);
+ continue;
+ }
+ try (DirectoryStream<Path> sds = Files.newDirectoryStream(module)) {
+ for (Path sModule : sds) {
+ checkModule(sModule, sb, tokens2Projects, project2License, bundlesDir, targetDir, externalDir, binariesList);
}
- continue;
}
- if ("@ungap".equals(module.getFileName().toString())) {
- module = module.resolve("promise-all-settled");
- }
- checkModule(module, sb, tokens2Projects, project2License, bundlesDir, targetDir, externalDir, binariesList);
}
}
if (sb.length() > 0) {
