@ngtools/webpack 8.1.0-beta.3 → 8.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "8.1.0-beta.3",
+  "version": "8.1.2",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -25,14 +25,14 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/core": "8.1.0-beta.3",
+    "@angular-devkit/core": "8.1.2",
     "enhanced-resolve": "4.1.0",
     "rxjs": "6.4.0",
     "tree-kill": "1.2.1",
     "webpack-sources": "1.3.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": ">=8.0.0-beta.0 < 9.0.0",
+    "@angular/compiler-cli": "^8.0.0-beta.0 || ^8.1.0-beta.0 || ^8.2.0-beta.0 || ^8.3.0-beta.0 || ^8.4.0-beta.0 || >=9.0.0-beta < 9",
     "typescript": ">=3.4 < 3.5",
     "webpack": "^4.0.0"
   },
@@ -42,7 +42,6 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged",
       "pre-push": "node ./bin/devkit-admin hooks/pre-push"
     }
   }

package/src/benchmark.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // Use with CLI --no-progress flag for best results.
 // This should be false for commited code.
 const _benchmark = false;
+// tslint:disable:no-console
 function time(label) {
     if (_benchmark) {
         console.time(label);

package/src/compiler_host.js

@@ -22,9 +22,12 @@ class WebpackCompilerHost {
         this._readResourceFiles = new Set();
         this._sourceFileCache = new Map();
         this._virtualFileExtensions = [
-            '.js', '.js.map',
-            '.ngfactory.js', '.ngfactory.js.map',
-            '.ngstyle.js', '.ngstyle.js.map',
+            '.js',
+            '.js.map',
+            '.ngfactory.js',
+            '.ngfactory.js.map',
+            '.ngstyle.js',
+            '.ngstyle.js.map',
             '.ngsummary.json',
         ];
         this._syncHost = new core_1.virtualFs.SyncDelegateHost(host);
@@ -32,8 +35,7 @@ class WebpackCompilerHost {
         this._basePath = core_1.normalize(basePath);
     }
     get virtualFiles() {
-        return [...this._memoryHost.delegate
-                ._cache.keys()];
+        return [...this._memoryHost.delegate._cache.keys()];
     }
     denormalizePath(path) {
         return core_1.getSystemPath(core_1.normalize(path));
@@ -54,10 +56,10 @@ class WebpackCompilerHost {
         return [...this._changedFiles];
     }
     getNgFactoryPaths() {
-        return this.virtualFiles
+        return (this.virtualFiles
             .filter(fileName => fileName.endsWith('.ngfactory.js') || fileName.endsWith('.ngstyle.js'))
             // These paths are used by the virtual file system decorator so we must denormalize them.
-            .map(path => this.denormalizePath(path));
+            .map(path => this.denormalizePath(path)));
     }
     invalidate(fileName) {
         const fullPath = this.resolve(fileName);
@@ -66,13 +68,15 @@ class WebpackCompilerHost {
         try {
             exists = this._syncHost.isFile(fullPath);
             if (exists) {
-                this._changedFiles.add(fullPath);
+                this._changedFiles.add(utils_1.workaroundResolve(fullPath));
             }
         }
         catch (_a) { }
         // File doesn't exist anymore and is not a factory, so we should delete the related
         // virtual files.
-        if (!exists && fullPath.endsWith('.ts') && !(fullPath.endsWith('.ngfactory.ts') || fullPath.endsWith('.shim.ngstyle.ts'))) {
+        if (!exists &&
+            fullPath.endsWith('.ts') &&
+            !(fullPath.endsWith('.ngfactory.ts') || fullPath.endsWith('.shim.ngstyle.ts'))) {
             this._virtualFileExtensions.forEach(ext => {
                 const virtualFile = (fullPath.slice(0, -3) + ext);
                 if (this._memoryHost.exists(virtualFile)) {
@@ -82,8 +86,8 @@ class WebpackCompilerHost {
         }
         // In case resolveJsonModule and allowJs we also need to remove virtual emitted files
         // both if they exists or not.
-        if ((fullPath.endsWith('.js') || fullPath.endsWith('.json'))
-            && !/(\.(ngfactory|ngstyle)\.js|ngsummary\.json)$/.test(fullPath)) {
+        if ((fullPath.endsWith('.js') || fullPath.endsWith('.json')) &&
+            !/(\.(ngfactory|ngstyle)\.js|ngsummary\.json)$/.test(fullPath)) {
             if (this._memoryHost.exists(fullPath)) {
                 this._memoryHost.delete(fullPath);
             }
@@ -135,11 +139,11 @@ class WebpackCompilerHost {
         return {
             isFile: () => stats.isFile(),
             isDirectory: () => stats.isDirectory(),
-            isBlockDevice: () => stats.isBlockDevice && stats.isBlockDevice() || false,
-            isCharacterDevice: () => stats.isCharacterDevice && stats.isCharacterDevice() || false,
-            isFIFO: () => stats.isFIFO && stats.isFIFO() || false,
-            isSymbolicLink: () => stats.isSymbolicLink && stats.isSymbolicLink() || false,
-            isSocket: () => stats.isSocket && stats.isSocket() || false,
+            isBlockDevice: () => (stats.isBlockDevice && stats.isBlockDevice()) || false,
+            isCharacterDevice: () => (stats.isCharacterDevice && stats.isCharacterDevice()) || false,
+            isFIFO: () => (stats.isFIFO && stats.isFIFO()) || false,
+            isSymbolicLink: () => (stats.isSymbolicLink && stats.isSymbolicLink()) || false,
+            isSocket: () => (stats.isSocket && stats.isSocket()) || false,
             dev: stats.dev === undefined ? dev : stats.dev,
             ino: stats.ino === undefined ? Math.floor(Math.random() * 100000) : stats.ino,
             mode: stats.mode === undefined ? parseInt('777', 8) : stats.mode,
@@ -274,14 +278,13 @@ class WebpackCompilerHost {
         this._resourceLoader = resourceLoader;
     }
     readResource(fileName) {
-        this._readResourceFiles.add(fileName);
-        if (this.directTemplateLoading &&
-            (fileName.endsWith('.html') || fileName.endsWith('.svg'))) {
+        // These paths are meant to be used by the loader so we must denormalize them
+        const denormalizedFileName = utils_1.workaroundResolve(fileName);
+        this._readResourceFiles.add(denormalizedFileName);
+        if (this.directTemplateLoading && (fileName.endsWith('.html') || fileName.endsWith('.svg'))) {
             return this.readFile(fileName);
         }
         if (this._resourceLoader) {
-            // These paths are meant to be used by the loader so we must denormalize them.
-            const denormalizedFileName = this.denormalizePath(core_1.normalize(fileName));
             return this._resourceLoader.get(denormalizedFileName);
         }
         else {
@@ -291,19 +294,21 @@ class WebpackCompilerHost {
     getModifiedResourceFiles() {
         const modifiedFiles = new Set();
         for (const changedFile of this._changedFiles) {
-            if (this._readResourceFiles.has(changedFile)) {
-                modifiedFiles.add(changedFile);
+            const denormalizedFileName = utils_1.workaroundResolve(changedFile);
+            if (this._readResourceFiles.has(denormalizedFileName)) {
+                modifiedFiles.add(denormalizedFileName);
             }
             if (!this._resourceLoader) {
                 continue;
             }
-            for (const resourcePath of this._resourceLoader.getAffectedResources(changedFile)) {
+            for (const resourcePath of this._resourceLoader.getAffectedResources(denormalizedFileName)) {
                 modifiedFiles.add(resourcePath);
             }
         }
         return modifiedFiles;
     }
     trace(message) {
+        // tslint:disable-next-line: no-console
         console.log(message);
     }
     resolveModuleNames(moduleNames, containingFile) {

package/src/ngcc_processor.js

@@ -39,9 +39,7 @@ class NgccProcessor {
     }
     processModule(moduleName, resolvedModule) {
         const resolvedFileName = resolvedModule.resolvedFileName;
-        if (!resolvedFileName
-            || moduleName.startsWith('.')
-            || this._processedModules.has(moduleName)) {
+        if (!resolvedFileName || moduleName.startsWith('.') || this._processedModules.has(moduleName)) {
             // Skip when module is unknown, relative or NGCC compiler is not found or already processed.
             return;
         }
@@ -74,22 +72,19 @@ class NgccProcessor {
      */
     tryResolvePackage(moduleName, resolvedFileName) {
         try {
-            let packageJsonPath = path.resolve(resolvedFileName, '../package.json');
-            if (fs_1.existsSync(packageJsonPath)) {
-                return packageJsonPath;
-            }
             // This is based on the logic in the NGCC compiler
             // tslint:disable-next-line:max-line-length
             // See: https://github.com/angular/angular/blob/b93c1dffa17e4e6900b3ab1b9e554b6da92be0de/packages/compiler-cli/src/ngcc/src/packages/dependency_host.ts#L85-L121
-            packageJsonPath = require.resolve(`${moduleName}/package.json`, {
+            return require.resolve(`${moduleName}/package.json`, {
                 paths: [resolvedFileName],
             });
-            return packageJsonPath;
         }
         catch (_a) {
             // if it fails this might be a deep import which doesn't have a package.json
             // Ex: @angular/compiler/src/i18n/i18n_ast/package.json
-            return undefined;
+            // or local libraries which don't reside in node_modules
+            const packageJsonPath = path.resolve(resolvedFileName, '../package.json');
+            return fs_1.existsSync(packageJsonPath) ? packageJsonPath : undefined;
         }
     }
     findNodeModulesDirectory(startPoint) {

package/src/transformers/ctor-parameters.js

@@ -75,7 +75,7 @@ function extractMetadataFromSingleDecorator(decorator, diagnostics) {
  *       }]
  *     }];
  */
-function createCtorParametersClassProperty(diagnostics, entityNameToExpression, ctorParameters) {
+function createCtorParametersClassProperty(diagnostics, entityNameToExpression, ctorParameters, typeChecker) {
     const params = [];
     for (const ctorParam of ctorParameters) {
         if (!ctorParam.type && ctorParam.decorators.length === 0) {
@@ -83,7 +83,7 @@ function createCtorParametersClassProperty(diagnostics, entityNameToExpression,
             continue;
         }
         const paramType = ctorParam.type
-            ? typeReferenceToExpression(entityNameToExpression, ctorParam.type)
+            ? typeReferenceToExpression(entityNameToExpression, ctorParam.type, typeChecker)
             : undefined;
         const members = [
             ts.createPropertyAssignment('type', paramType || ts.createIdentifier('undefined')),
@@ -109,7 +109,7 @@ function createCtorParametersClassProperty(diagnostics, entityNameToExpression,
  * not being exposed). In practice this implementation is sufficient for Angular's use of type
  * metadata.
  */
-function typeReferenceToExpression(entityNameToExpression, node) {
+function typeReferenceToExpression(entityNameToExpression, node, typeChecker) {
     let kind = node.kind;
     if (ts.isLiteralTypeNode(node)) {
         // Treat literal types like their base type (boolean, string, number).
@@ -137,6 +137,17 @@ function typeReferenceToExpression(entityNameToExpression, node) {
             return ts.createIdentifier('Number');
         case ts.SyntaxKind.TypeReference:
             const typeRef = node;
+            let typeSymbol = typeChecker.getSymbolAtLocation(typeRef.typeName);
+            if (typeSymbol && typeSymbol.flags & ts.SymbolFlags.Alias) {
+                typeSymbol = typeChecker.getAliasedSymbol(typeSymbol);
+            }
+            if (!typeSymbol || !(typeSymbol.flags & ts.SymbolFlags.Value)) {
+                return undefined;
+            }
+            const type = typeChecker.getTypeOfSymbolAtLocation(typeSymbol, typeRef);
+            if (!type || typeChecker.getSignaturesOfType(type, ts.SignatureKind.Construct).length === 0) {
+                return undefined;
+            }
             // Ignore any generic types, just return the base type.
             return entityNameToExpression(typeRef.typeName);
         default:
@@ -197,7 +208,7 @@ function decoratorDownlevelTransformer(typeChecker, diagnostics) {
                 parametersInfo.push(paramInfo);
             }
             if (parametersInfo.length > 0) {
-                const ctorProperty = createCtorParametersClassProperty(diagnostics, entityNameToExpression, parametersInfo);
+                const ctorProperty = createCtorParametersClassProperty(diagnostics, entityNameToExpression, parametersInfo, typeChecker);
                 return [node, ctorProperty];
             }
             else {