fix(schematics): handle complex asset options in ng-add

nrwl · Oct 18, 2018 · 9a60c69 · 9a60c69
1 parent 02a49e7
commit 9a60c69
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 38 deletions.
diff --git a/e2e/schematics/ng-add.test.ts b/e2e/schematics/ng-add.test.ts
@@ -301,6 +301,21 @@ describe('Nrwl Convert to Nx Workspace', () => {
     checkFilesExist('dist/apps/proj-server/main.js');
   });
 
+  it('should convert a project with common libraries in the ecosystem', () => {
+    // create a new AngularCLI app
+    runNgNew();
+
+    // Add some Angular libraries
+    runCLI('add @angular/elements');
+    runCLI('add @angular/material');
+    runCLI('add @angular/pwa');
+    runCLI('add @ngrx/store');
+    runCLI('add @ngrx/effects');
+    copyMissingPackages();
+    // Add Nx
+    runCLI('add @nrwl/schematics');
+  });
+
   it('should handle workspaces with no e2e project', () => {
     // create a new AngularCLI app
     runNgNew();

diff --git a/packages/schematics/src/collection/ng-add/index.ts b/packages/schematics/src/collection/ng-add/index.ts
@@ -130,6 +130,22 @@ function updateAngularCLIJson(options: Schema): Rule {
 
     const oldSourceRoot = app.sourceRoot;
 
+    function convertAsset(asset: string | any) {
+      if (typeof asset === 'string') {
+        return asset.startsWith(oldSourceRoot)
+          ? convertPath(options.name, asset)
+          : asset;
+      } else {
+        return {
+          ...asset,
+          input:
+            asset.input && asset.input.startsWith(oldSourceRoot)
+              ? convertPath(options.name, asset.input)
+              : asset.input
+        };
+      }
+    }
+
     app = {
       ...app,
       root: path.join('apps', options.name),
@@ -143,26 +159,19 @@ function updateAngularCLIJson(options: Schema): Rule {
       outputPath: path.join('dist/apps', options.name),
       index: convertPath(options.name, buildConfig.options.index),
       main: convertPath(options.name, buildConfig.options.main),
-      polyfills: convertPath(options.name, buildConfig.options.polyfills),
       tsConfig: path.join(app.root, getFilename(buildConfig.options.tsConfig)),
-      assets: buildConfig.options.assets.map(
-        asset =>
-          asset.startsWith(oldSourceRoot)
-            ? convertPath(options.name, asset)
-            : asset
-      ),
-      styles: buildConfig.options.styles.map(
-        style =>
-          style.startsWith(oldSourceRoot)
-            ? convertPath(options.name, style)
-            : style
-      ),
-      scripts: buildConfig.options.scripts.map(
-        script =>
-          script.startsWith(oldSourceRoot)
-            ? convertPath(options.name, script)
-            : script
-      )
+      polyfills:
+        buildConfig.options.polyfills &&
+        convertPath(options.name, buildConfig.options.polyfills),
+      assets:
+        buildConfig.options.assets &&
+        buildConfig.options.assets.map(convertAsset),
+      styles:
+        buildConfig.options.styles &&
+        buildConfig.options.styles.map(convertAsset),
+      scripts:
+        buildConfig.options.scripts &&
+        buildConfig.options.scripts.map(convertAsset)
     };
 
     Object.keys(buildConfig.configurations)
@@ -222,30 +231,23 @@ function updateAngularCLIJson(options: Schema): Rule {
     testConfig.options = {
       ...testConfig.options,
       main: convertPath(options.name, testConfig.options.main),
-      polyfills: convertPath(options.name, testConfig.options.polyfills),
       tsConfig: path.join(app.root, getFilename(testConfig.options.tsConfig)),
       karmaConfig: path.join(
         app.root,
         getFilename(testConfig.options.karmaConfig)
       ),
-      assets: testConfig.options.assets.map(
-        asset =>
-          asset.startsWith(oldSourceRoot)
-            ? convertPath(options.name, asset)
-            : asset
-      ),
-      styles: testConfig.options.styles.map(
-        style =>
-          style.startsWith(oldSourceRoot)
-            ? convertPath(options.name, style)
-            : style
-      ),
-      scripts: testConfig.options.scripts.map(
-        script =>
-          script.startsWith(oldSourceRoot)
-            ? convertPath(options.name, script)
-            : script
-      )
+      polyfills:
+        testConfig.options.polyfills &&
+        convertPath(options.name, testConfig.options.polyfills),
+      assets:
+        testConfig.options.assets &&
+        testConfig.options.assets.map(convertAsset),
+      styles:
+        testConfig.options.styles &&
+        testConfig.options.styles.map(convertAsset),
+      scripts:
+        testConfig.options.scripts &&
+        testConfig.options.scripts.map(convertAsset)
     };
 
     const lintConfig = app.architect.lint;