@ngtools/webpack 13.1.0-next.2 → 13.1.0-next.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "13.1.0-next.2",
+  "version": "13.1.0-next.3",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",

package/src/loaders/direct-resource.d.ts

@@ -5,5 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+import { LoaderContext } from 'webpack';
 export declare const DirectAngularResourceLoaderPath: string;
-export default function (content: string): string;
+export default function (this: LoaderContext<{
+    esModule?: 'true' | 'false';
+}>, content: string): string;

package/src/loaders/direct-resource.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DirectAngularResourceLoaderPath = void 0;
 exports.DirectAngularResourceLoaderPath = __filename;
 function default_1(content) {
-    return `export default ${JSON.stringify(content)};`;
+    const { esModule } = this.getOptions();
+    return `${esModule === 'false' ? 'module.exports =' : 'export default'} ${JSON.stringify(content)};`;
 }
 exports.default = default_1;

package/src/transformers/replace_resources.js

@@ -88,7 +88,7 @@ function visitDecorator(nodeFactory, node, typeChecker, directTemplateLoading, r
     }
     return nodeFactory.updateDecorator(node, nodeFactory.updateCallExpression(decoratorFactory, decoratorFactory.expression, decoratorFactory.typeArguments, [nodeFactory.updateObjectLiteralExpression(objectExpression, properties)]));
 }
-function visitComponentMetadata(nodeFactory, node, styleReplacements, directTemplateLoading, resourceImportDeclarations, moduleKind, inlineStyleFileExtension) {
+function visitComponentMetadata(nodeFactory, node, styleReplacements, directTemplateLoading, resourceImportDeclarations, moduleKind = ts.ModuleKind.ES2015, inlineStyleFileExtension) {
     if (!ts.isPropertyAssignment(node) || ts.isComputedPropertyName(node.name)) {
         return node;
     }
@@ -97,7 +97,8 @@ function visitComponentMetadata(nodeFactory, node, styleReplacements, directTemp
         case 'moduleId':
             return undefined;
         case 'templateUrl':
-            const url = getResourceUrl(node.initializer, directTemplateLoading ? `!${direct_resource_1.DirectAngularResourceLoaderPath}!` : '');
+            const loaderOptions = moduleKind < ts.ModuleKind.ES2015 ? '?esModule=false' : '';
+            const url = getResourceUrl(node.initializer, directTemplateLoading ? `!${direct_resource_1.DirectAngularResourceLoaderPath}${loaderOptions}!` : '');
             if (!url) {
                 return node;
             }
@@ -165,10 +166,10 @@ function isComponentDecorator(node, typeChecker) {
     }
     return false;
 }
-function createResourceImport(nodeFactory, url, resourceImportDeclarations, moduleKind = ts.ModuleKind.ES2015) {
+function createResourceImport(nodeFactory, url, resourceImportDeclarations, moduleKind) {
     const urlLiteral = nodeFactory.createStringLiteral(url);
     if (moduleKind < ts.ModuleKind.ES2015) {
-        return nodeFactory.createPropertyAccessExpression(nodeFactory.createCallExpression(nodeFactory.createIdentifier('require'), [], [urlLiteral]), 'default');
+        return nodeFactory.createCallExpression(nodeFactory.createIdentifier('require'), [], [urlLiteral]);
     }
     else {
         const importName = nodeFactory.createIdentifier(`__NG_CLI_RESOURCE__${resourceImportDeclarations.length}`);