fix: issues with emitting declarationMap

Closes #1464
ng-packagr · Jun 11, 2020 · 38ad52b · 38ad52b
1 parent c865997
commit 38ad52b
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 43 deletions.
diff --git a/integration/samples/typings/src/chalk.d.ts → integration/samples/typings/src/chalk.ts b/integration/samples/typings/src/chalk.d.ts → integration/samples/typings/src/chalk.ts
diff --git a/integration/samples/typings/src/nested/reference/index.ts b/integration/samples/typings/src/nested/reference/index.ts
@@ -1,3 +1,3 @@
-/// <reference path="./mocked.d.ts" />
+/// <reference path="./mocked.ts" />
 
 export const faz: Mocked = { foo: 'bar' };
diff --git a/.../typings/src/nested/reference/mocked.d.ts → ...es/typings/src/nested/reference/mocked.ts b/.../typings/src/nested/reference/mocked.d.ts → ...es/typings/src/nested/reference/mocked.ts
diff --git a/integration/samples/typings/src/validator.ts b/integration/samples/typings/src/validator.ts
@@ -1,4 +1,4 @@
-/// <reference path="./chalk.d.ts" />
+/// <reference path="./chalk.ts" />
 import * as chalk from 'chalk';
 
 export { chalk };
diff --git a/src/lib/ng-package/entry-point/compile-ngc.transform.ts b/src/lib/ng-package/entry-point/compile-ngc.transform.ts
@@ -8,7 +8,7 @@ import * as log from '../../utils/log';
 import { isEntryPointInProgress, EntryPointNode, isEntryPoint } from '../nodes';
 import { StylesheetProcessor } from '../../styles/stylesheet-processor';
 
-export const compileNgcTransform: Transform = transformFromPromise(async (graph) => {
+export const compileNgcTransform: Transform = transformFromPromise(async graph => {
   log.info(`Compiling TypeScript sources through ngc`);
   const entryPoint = graph.find(isEntryPointInProgress()) as EntryPointNode;
   const entryPoints = graph.filter(isEntryPoint) as EntryPointNode[];
@@ -30,10 +30,10 @@ export const compileNgcTransform: Transform = transformFromPromise(async (graph)
     stylesheetProcessor,
     {
       outDir: path.dirname(esm2015),
+      declarationDir: path.dirname(declarations),
       declaration: true,
       target: ts.ScriptTarget.ES2015,
     },
-    path.dirname(declarations),
     ngccProcessor,
   );
 

diff --git a/src/lib/ngc/compile-source-files.ts b/src/lib/ngc/compile-source-files.ts
@@ -1,7 +1,6 @@
 import * as ng from '@angular/compiler-cli';
 import * as ts from 'typescript';
 import * as log from '../utils/log';
-import { redirectWriteFileCompilerHost } from '../ts/redirect-write-file-compiler-host';
 import { cacheCompilerHost } from '../ts/cache-compiler-host';
 import { StylesheetProcessor } from '../styles/stylesheet-processor';
 import { BuildGraph } from '../graph/build-graph';
@@ -16,7 +15,6 @@ export async function compileSourceFiles(
   moduleResolutionCache: ts.ModuleResolutionCache,
   stylesheetProcessor: StylesheetProcessor,
   extraOptions?: Partial<ng.CompilerOptions>,
-  declarationDir?: string,
   ngccProcessor?: NgccProcessor,
 ) {
   log.debug(`ngc (v${ng.VERSION.full})`);
@@ -31,9 +29,6 @@ export async function compileSourceFiles(
     moduleResolutionCache,
     stylesheetProcessor,
   );
-  if (declarationDir) {
-    tsCompilerHost = redirectWriteFileCompilerHost(tsCompilerHost, tsConfigOptions.basePath, declarationDir);
-  }
 
   if (tsConfigOptions.enableIvy && ngccProcessor) {
     tsCompilerHost = ngccTransformCompilerHost(tsCompilerHost, tsConfigOptions, ngccProcessor, moduleResolutionCache);

diff --git a/src/lib/ts/redirect-write-file-compiler-host.ts b/src/lib/ts/redirect-write-file-compiler-host.ts
diff --git a/src/lib/ts/tsconfig.ts b/src/lib/ts/tsconfig.ts
@@ -87,7 +87,6 @@ export const initializeTsConfig = (defaultTsConfig: ng.ParsedConfiguration, entr
       flatModuleOutFile: `${entryPoint.flatModuleFile}.js`,
       basePath,
       rootDir: basePath,
-      declarationDir: basePath,
     };
 
     tsConfig.rootNames = [entryPoint.entryFilePath];