feat(*): ability to remove an adhoc dependency

Author: ohoareau

packages/genjs/src/AbstractPackage.ts

@@ -73,6 +73,10 @@ export abstract class AbstractPackage<C extends BasePackageConfig = BasePackageC
         disabled_features.forEach(f => this.features[f] = false);
         Object.assign(this.extraOptions, bbExtraOptions, xExtraOptions);
     }
+    protected cleanObject(o: undefined|Record<string, unknown>) {
+        if (!o) return o;
+        return Object.entries(o).filter(([_, b]) => null !== b && undefined !== b).reduce((acc, [a, b]) => Object.assign(acc, {[a]: b}), {} as Record<string, string>);
+    }
     public getCustomPluginsByType<T extends object = any>(type: string, defaultValue: T = {} as T): T {
         const customPaths = [
             `${this.absoluteTargetDir}/.genjs/${type}`,
@@ -273,4 +277,4 @@ export abstract class AbstractPackage<C extends BasePackageConfig = BasePackageC
 }
 
 // noinspection JSUnusedGlobalSymbols
-export default AbstractPackage
+export default AbstractPackage

packages/plugin-js-lambda-microlib/src/Package.ts

@@ -181,9 +181,9 @@ export default class Package extends AbstractPackage<PackageConfig> {
             ['package.json']: () => JSON.stringify({
                 name: vars.name,
                 license: vars.license,
-                dependencies: vars.dependencies,
+                dependencies: this.cleanObject(vars.dependencies),
                 scripts: vars.scripts,
-                devDependencies: vars.devDependencies,
+                devDependencies: this.cleanObject(vars.devDependencies),
                 ...(vars.resolutions ? {resolutions: vars.resolutions} : {}),
                 version: vars.version,
                 description: vars.description,
@@ -329,4 +329,4 @@ export default class Package extends AbstractPackage<PackageConfig> {
         await this.prepareGenerate(vars);
         return super.generate(vars);
     }
-}
+}

packages/plugin-js-lambda/src/Package.ts

@@ -64,9 +64,9 @@ export default class Package extends AwsLambdaPackage {
         return () => JSON.stringify({
             name: vars.name,
             license: vars.license,
-            dependencies: vars.dependencies,
+            dependencies: this.cleanObject(vars.dependencies),
             scripts: vars.scripts,
-            devDependencies: vars.devDependencies,
+            devDependencies: this.cleanObject(vars.devDependencies),
             ...(vars.resolutions ? {resolutions: vars.resolutions} : {}),
             version: vars.version,
             description: vars.description,
@@ -119,4 +119,4 @@ export default class Package extends AwsLambdaPackage {
             'prettier',
         ];
     }
-}
+}

packages/plugin-js-razzle/src/Package.ts

@@ -70,9 +70,9 @@ export default class Package extends AwsLambdaPackage {
         return () => JSON.stringify({
             name: vars.name,
             license: vars.license,
-            dependencies: vars.dependencies,
+            dependencies: this.cleanObject(vars.dependencies),
             scripts: vars.scripts,
-            devDependencies: vars.devDependencies,
+            devDependencies: this.cleanObject(vars.devDependencies),
             version: vars.version,
             description: vars.description,
             author: (vars.author && ('object' === typeof vars.author)) ? vars.author : {name: vars.author_name, email: vars.author_email},
@@ -134,4 +134,4 @@ export default class Package extends AwsLambdaPackage {
             'react_razzle',
         ];
     }
-}
+}

packages/plugin-js-react-router/src/Package.ts

@@ -76,9 +76,9 @@ export default class Package extends AwsLambdaPackage {
         return () => JSON.stringify({
             name: vars.name,
             license: vars.license,
-            dependencies: vars.dependencies,
+            dependencies: this.cleanObject(vars.dependencies),
             scripts: vars.scripts,
-            devDependencies: vars.devDependencies,
+            devDependencies: this.cleanObject(vars.devDependencies),
             ...(vars.resolutions ? {resolutions: vars.resolutions} : {}),
             version: vars.version,
             description: vars.description,

packages/plugin-php-lambda/src/Package.ts

@@ -46,9 +46,9 @@ export default class Package extends AwsLambdaPackage {
         return () => JSON.stringify({
             name: vars.name,
             license: vars.license,
-            dependencies: vars.dependencies,
+            dependencies: this.cleanObject(vars.dependencies),
             scripts: vars.scripts,
-            devDependencies: vars.devDependencies,
+            devDependencies: this.cleanObject(vars.devDependencies),
             version: vars.version,
             description: vars.description,
             author: (vars.author && ('object' === typeof vars.author)) ? vars.author : {name: vars.author_name, email: vars.author_email},
@@ -124,4 +124,4 @@ export default class Package extends AwsLambdaPackage {
             'composer',
         ];
     }
-}
+}

packages/plugin-ts-lambda/src/Package.ts

@@ -56,9 +56,9 @@ export default class Package extends AwsLambdaPackage {
         return () => JSON.stringify({
             name: vars.name,
             license: vars.license,
-            dependencies: vars.dependencies,
+            dependencies: this.cleanObject(vars.dependencies),
             scripts: vars.scripts,
-            devDependencies: vars.devDependencies,
+            devDependencies: this.cleanObject(vars.devDependencies),
             version: vars.version,
             description: vars.description,
             author: (vars.author && ('object' === typeof vars.author)) ? vars.author : {name: vars.author_name, email: vars.author_email},
@@ -109,4 +109,4 @@ export default class Package extends AwsLambdaPackage {
             'prettier',
         ];
     }
-}
+}

packages/plugin-ts-razzle/src/Package.ts

@@ -77,9 +77,9 @@ export default class Package extends AwsLambdaPackage {
         return () => JSON.stringify({
             name: vars.name,
             license: vars.license,
-            dependencies: vars.dependencies,
+            dependencies: this.cleanObject(vars.dependencies),
             scripts: vars.scripts,
-            devDependencies: vars.devDependencies,
+            devDependencies: this.cleanObject(vars.devDependencies),
             version: vars.version,
             description: vars.description,
             author: (vars.author && ('object' === typeof vars.author)) ? vars.author : {name: vars.author_name, email: vars.author_email},
@@ -142,4 +142,4 @@ export default class Package extends AwsLambdaPackage {
             'react_razzle',
         ];
     }
-}
+}