fix(@ngtools/webpack): enforce typescript dep without peerDep

Author: filipesilva

packages/@angular/cli/utilities/read-tsconfig.ts

@@ -1,11 +1,10 @@
 import * as path from 'path';
-import * as ts from 'typescript';
 import { requireProjectModule } from '../utilities/require-project-module';
 
 export function readTsconfig(tsconfigPath: string) {
   const projectTs = requireProjectModule(path.dirname(tsconfigPath), 'typescript');
-  const configResult = projectTs.readConfigFile(tsconfigPath, ts.sys.readFile);
-  const tsConfig = projectTs.parseJsonConfigFileContent(configResult.config, ts.sys,
+  const configResult = projectTs.readConfigFile(tsconfigPath, projectTs.sys.readFile);
+  const tsConfig = projectTs.parseJsonConfigFileContent(configResult.config, projectTs.sys,
     path.dirname(tsconfigPath), undefined, tsconfigPath);
   return tsConfig;
 }

packages/@ngtools/webpack/package.json

@@ -34,7 +34,6 @@
     "source-map": "^0.5.6"
   },
   "peerDependencies": {
-    "typescript": "^2.0.2",
     "webpack": "^2.2.0 || ^3.0.0"
   }
 }

packages/@ngtools/webpack/src/angular_compiler_plugin.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as fs from 'fs';
 import { fork, ForkOptions, ChildProcess } from 'child_process';
 import * as path from 'path';

packages/@ngtools/webpack/src/compiler_host.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 import {basename, dirname, join, sep} from 'path';
 import * as fs from 'fs';

packages/@ngtools/webpack/src/entry_resolver.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as fs from 'fs';
 import {join} from 'path';
 import * as ts from 'typescript';

packages/@ngtools/webpack/src/gather_diagnostics.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 
 import { time, timeEnd } from './benchmark';

packages/@ngtools/webpack/src/index.ts

@@ -1,5 +1,22 @@
+// @ignoreDep typescript
+import { satisfies } from 'semver';
+
+// Test if typescript is available. This is a hack. We should be using peerDependencies instead
+// but can't until we split global and local packages.
+// See https://github.com/angular/angular-cli/issues/8107#issuecomment-338185872
+try {
+  const version = require('typescript').version;
+  if (!satisfies(version, '^2.0.2')) {
+    throw new Error();
+  }
+} catch (e) {
+  throw new Error('Could not find local "typescript" package.'
+    + 'The "@ngtools/webpack" package requires a local "typescript@^2.0.2" package to be installed.'
+    + e);
+}
+
 export * from './plugin';
 export * from './angular_compiler_plugin';
 export * from './extract_i18n_plugin';
-export {ngcLoader as default} from './loader';
-export {PathsPlugin} from './paths-plugin';
+export { ngcLoader as default } from './loader';
+export { PathsPlugin } from './paths-plugin';

packages/@ngtools/webpack/src/ngtools_api.ts

@@ -1,4 +1,5 @@
 // @ignoreDep @angular/compiler-cli
+// @ignoreDep typescript
 /**
  * This is a copy of types in @compiler-cli/src/ngtools_api.d.ts file,
  * together with safe imports for private apis for cases where @angular/compiler-cli isn't

packages/@ngtools/webpack/src/paths-plugin.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as path from 'path';
 import * as ts from 'typescript';
 import {

packages/@ngtools/webpack/src/plugin.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';

packages/@ngtools/webpack/src/refactor.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 // TODO: move this in its own package.
 import * as path from 'path';
 import * as ts from 'typescript';

packages/@ngtools/webpack/src/transformers/ast_helpers.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 import { WebpackCompilerHost } from '../compiler_host';
 import { makeTransform, TransformOperation } from './make_transform';

packages/@ngtools/webpack/src/transformers/export_lazy_module_map.spec.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 import { oneLine, stripIndent } from 'common-tags';
 import { transformTypescript } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/export_lazy_module_map.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as path from 'path';
 import * as ts from 'typescript';
 

packages/@ngtools/webpack/src/transformers/export_ngfactory.spec.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 import { oneLine, stripIndent } from 'common-tags';
 import { transformTypescript } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/export_ngfactory.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 
 import { findAstNodes, getFirstNode } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/insert_import.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 
 import { findAstNodes, getFirstNode } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/register_locale_data.spec.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 import { oneLine, stripIndent } from 'common-tags';
 import { transformTypescript } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/register_locale_data.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 
 import { findAstNodes, getFirstNode } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/remove_import.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 
 import { findAstNodes } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/replace_bootstrap.spec.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 import { oneLine, stripIndent } from 'common-tags';
 import { transformTypescript } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/replace_bootstrap.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 
 import { findAstNodes } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/replace_resources.spec.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 import { oneLine, stripIndent } from 'common-tags';
 import { transformTypescript } from './ast_helpers';

packages/@ngtools/webpack/src/transformers/replace_resources.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as ts from 'typescript';
 
 import { findAstNodes, getFirstNode } from './ast_helpers';

packages/@ngtools/webpack/src/type_checker.ts

@@ -1,3 +1,4 @@
+// @ignoreDep typescript
 import * as process from 'process';
 import * as ts from 'typescript';
 import chalk from 'chalk';

tests/e2e/tests/misc/version.ts

@@ -6,5 +6,8 @@ export default function() {
   return ng('version')
     .then(() => deleteFile('.angular-cli.json'))
     // doesn't fail on a project with missing .angular-cli.json
+    .then(() => ng('version'))
+    // Doesn't fail outside a project.
+    .then(() => process.chdir('/'))
     .then(() => ng('version'));
 }