fix package.json generated dependencies

Fixes #17

Author: ocombe

packages/ng-packagr/ng-packagr.compiler.ts

@@ -5,6 +5,7 @@ import { Component } from '@teambit/component';
 import PackageJsonFile from '@teambit/legacy/dist/consumer/component/package-json-file';
 import AbstractVinyl from '@teambit/legacy/dist/consumer/component/sources/abstract-vinyl';
 import DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';
+import { PACKAGE_JSON } from '@teambit/legacy/dist/constants';
 import removeFilesAndEmptyDirsRecursively from '@teambit/legacy/dist/utils/fs/remove-files-and-empty-dirs-recursively';
 import { Logger } from '@teambit/logger';
 import { Workspace } from '@teambit/workspace';
@@ -48,7 +49,6 @@ export class NgPackagrCompiler implements Compiler {
     private logger: Logger,
     private workspace: Workspace,
     private readDefaultTsConfig: (filename?: string) => any,
-    // TODO(ocombe): use this to support custom tsConfig
     private tsCompilerOptions: TsCompilerOptions = {},
     private bitCompilerOptions: Partial<CompilerOptions> = {}
   ) {
@@ -59,25 +59,42 @@ export class NgPackagrCompiler implements Compiler {
     this.artifactName = bitCompilerOptions.artifactName || 'dist';
   }
 
-  private async ngPackagrCompilation(pathToComponent: string, pathToOutputFolder: string, tsCompilerOptions: TsCompilerOptions): Promise<void> {
+  private async ngPackagrCompilation(pathToComponent: string, pathToOutputFolder: string, tsCompilerOptions: TsCompilerOptions, packageJson: PackageJsonFile): Promise<void> {
     // disable logger temporarily so that it doesn't mess up with ngPackagr logs
     this.logger.off();
 
     // update ngPackage entry in package.json for ngPackagr
-    const packageJson = await PackageJsonFile.load(pathToOutputFolder, '');
     packageJson.addOrUpdateProperty('ngPackage', {
       lib: {
         entryFile: join(pathToComponent, 'public-api.ts'),
       },
     });
+
+    // check for dependencies other than tslib and move them to peer dependencies
+    // see https://github.com/ng-packagr/ng-packagr/blob/master/docs/dependencies.md#general-recommendation-use-peerdependencies-whenever-possible
+    const dependencies = packageJson.packageJsonObject.dependencies;
+    const peerDependencies = packageJson.packageJsonObject.peerDependencies;
+    const dependenciesKeys = Object.keys(dependencies);
+    if(dependenciesKeys.length > 1) {
+      dependenciesKeys.forEach((dep: string) => {
+        if (dep !== 'tslib') {
+          peerDependencies[dep] = dependencies[dep];
+          delete dependencies[dep];
+        }
+      });
+      packageJson.addOrUpdateProperty('dependencies', dependencies);
+      packageJson.addOrUpdateProperty('peerDependencies', peerDependencies);
+    }
+
+    // update package.json
     await packageJson.write();
 
     const parsedTsConfig = this.readDefaultTsConfig();
     parsedTsConfig.options = {...parsedTsConfig.options, ...tsCompilerOptions};
 
     return this.ngPackagr
       .withTsConfig(parsedTsConfig)
-      .forProject(join(pathToOutputFolder, 'package.json'))
+      .forProject(join(pathToOutputFolder, PACKAGE_JSON))
       .build()
       .then(async () => {
         // copy over properties generated by ngPackagr
@@ -95,11 +112,11 @@ export class NgPackagrCompiler implements Compiler {
         });
         await packageJson.write();
         // delete the package.json file generated by ngPackagr
-        await removeFilesAndEmptyDirsRecursively([resolve(join(pathToOutputFolder, 'dist', 'package.json'))]);
+        await removeFilesAndEmptyDirsRecursively([resolve(join(pathToOutputFolder, 'dist', PACKAGE_JSON))]);
       }, (err: Error) => {
         if(err.message === ViewEngineTemplateError && !tsCompilerOptions.fullTemplateTypeCheck) {
           console.warn(`\nError "${err.message}" triggered by the Angular compiler, retrying compilation without "fullTemplateTypeCheck" (you should probably create a custom environment using "bit create ng-env my-custom-angular-env" to set this option by default and avoid this error message)\n`);
-          return this.ngPackagrCompilation(pathToComponent, pathToOutputFolder, {...tsCompilerOptions, fullTemplateTypeCheck: false})
+          return this.ngPackagrCompilation(pathToComponent, pathToOutputFolder, {...tsCompilerOptions, fullTemplateTypeCheck: false}, packageJson)
         }
         console.error(err);
       })
@@ -112,7 +129,10 @@ export class NgPackagrCompiler implements Compiler {
    * used by `bit compile`
    */
   async transpileComponent(params: TranspileComponentParams): Promise<void> {
-    return this.ngPackagrCompilation(params.componentDir, params.outputDir, this.tsCompilerOptions);
+    // recreate packageJson from component to make sure that its dependencies are updated with recent code changes
+    const packageJson = PackageJsonFile.createFromComponent('', params.component);
+    packageJson.workspaceDir = params.outputDir;
+    return this.ngPackagrCompilation(params.componentDir, params.outputDir, this.tsCompilerOptions, packageJson);
   }
 
   private getArtifactDefinition() {
@@ -142,7 +162,8 @@ export class NgPackagrCompiler implements Compiler {
           component,
         };
         try {
-          await this.ngPackagrCompilation(capsule.path, capsule.path, this.tsCompilerOptions);
+          const packageJson = await PackageJsonFile.loadFromCapsuleSync(capsule.path);
+          await this.ngPackagrCompilation(capsule.path, capsule.path, this.tsCompilerOptions, packageJson);
         } catch (e) {
           currentComponentResult.errors = [e];
         }