bug(generate): fix import path for directives & pipes when importing into a module (#2883)

Fixes #2762

Author: Brocco

packages/angular-cli/blueprints/directive/index.js

@@ -85,8 +85,10 @@ module.exports = {
     const returns = [];
     const className = stringUtils.classify(`${options.entity.name}Directive`);
     const fileName = stringUtils.dasherize(`${options.entity.name}.directive`);
-    const componentDir = path.relative(this.dynamicPath.appRoot, this.generatePath);
-    const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
+    const fullGeneratePath = path.join(this.project.root, this.generatePath);
+    const moduleDir = path.parse(this.pathToModule).dir;
+    const relativeDir = path.relative(moduleDir, fullGeneratePath);
+    const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
 
     if (!options['skip-import']) {
       returns.push(

packages/angular-cli/blueprints/pipe/index.js

@@ -73,8 +73,10 @@ module.exports = {
     const returns = [];
     const className = stringUtils.classify(`${options.entity.name}Pipe`);
     const fileName = stringUtils.dasherize(`${options.entity.name}.pipe`);
-    const componentDir = path.relative(this.dynamicPath.appRoot, this.generatePath);
-    const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
+    const fullGeneratePath = path.join(this.project.root, this.generatePath);
+    const moduleDir = path.parse(this.pathToModule).dir;
+    const relativeDir = path.relative(moduleDir, fullGeneratePath);
+    const importPath = relativeDir ? `./${relativeDir}/${fileName}` : `./${fileName}`;
 
     if (!options['skip-import']) {
       returns.push(