refactor: use buildOptimizerLoaderPath

angular · Jul 8, 2019 · af590db · af590db
1 parent 142b496
commit af590db
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts b/packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/common.ts
@@ -5,7 +5,10 @@
  * 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 { BuildOptimizerWebpackPlugin } from '@angular-devkit/build-optimizer';
+import {
+  BuildOptimizerWebpackPlugin,
+  buildOptimizerLoaderPath,
+} from '@angular-devkit/build-optimizer';
 import { tags } from '@angular-devkit/core';
 import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as path from 'path';
@@ -35,9 +38,6 @@ const TerserPlugin = require('terser-webpack-plugin');
 
 // tslint:disable-next-line:no-any
 const g: any = typeof global !== 'undefined' ? global : {};
-export const buildOptimizerLoader: string = g['_DevKitIsLocal']
-  ? require.resolve('@angular-devkit/build-optimizer/src/build-optimizer/webpack-loader')
-  : '@angular-devkit/build-optimizer/webpack-loader';
 
 // tslint:disable-next-line:no-big-function
 export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
@@ -256,7 +256,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     buildOptimizerUseRule = {
       use: [
         {
-          loader: buildOptimizerLoader,
+          loader: buildOptimizerLoaderPath,
           options: { sourceMap: scriptsSourceMap },
         },
       ],

diff --git a/...s/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts b/...s/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/typescript.ts
@@ -7,14 +7,14 @@
  */
 // tslint:disable
 // TODO: cleanup this file, it's copied as is from Angular CLI.
+import { buildOptimizerLoaderPath } from '@angular-devkit/build-optimizer';
 import * as path from 'path';
 import {
   AngularCompilerPlugin,
   AngularCompilerPluginOptions,
   NgToolsLoader,
   PLATFORM
 } from '@ngtools/webpack';
-import { buildOptimizerLoader } from './common';
 import { WebpackConfigOptions, BuildOptions } from '../build-options';
 
 function _pluginOptionsOverrides(
@@ -113,7 +113,7 @@ export function getAotConfig(wco: WebpackConfigOptions, i18nExtract = false) {
   const loaders: any[] = [NgToolsLoader];
   if (buildOptions.buildOptimizer) {
     loaders.unshift({
-      loader: buildOptimizerLoader,
+      loader: buildOptimizerLoaderPath,
       options: { sourceMap: buildOptions.sourceMap.scripts }
     });
   }

diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/webpack-loader.ts
@@ -17,6 +17,8 @@ interface BuildOptimizerLoaderOptions {
   sourceMap: boolean;
 }
 
+export const buildOptimizerLoaderPath = __filename;
+
 const alwaysProcess = (path: string) =>
   // Always process TS files.
   path.endsWith('.ts') || path.endsWith('.tsx')

diff --git a/packages/angular_devkit/build_optimizer/src/index.ts b/packages/angular_devkit/build_optimizer/src/index.ts
@@ -5,7 +5,10 @@
  * 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
  */
-export { default as buildOptimizerLoader } from './build-optimizer/webpack-loader';
+export {
+  default as buildOptimizerLoader,
+  buildOptimizerLoaderPath,
+} from './build-optimizer/webpack-loader';
 export { BuildOptimizerWebpackPlugin } from './build-optimizer/webpack-plugin';
 export { buildOptimizer } from './build-optimizer/build-optimizer';