fix(core): stop inlining tsconfig-paths-webpack-plugin and use version with fix (#8357)

Author: Phillip9587

package.json

@@ -235,7 +235,7 @@
  "ts-loader": "^9.2.6",
  "ts-node": "9.1.1",
  "tsconfig-paths": "^3.9.0",
- "tsconfig-paths-webpack-plugin": "3.4.1",
+ "tsconfig-paths-webpack-plugin": "3.5.2",
  "tslib": "^2.3.0",
  "tslint": "6.1.3",
  "tslint-to-eslint-config": "^2.4.0",

packages/cypress/package.json

@@ -41,7 +41,7 @@
  "enhanced-resolve": "^5.8.3",
  "ts-loader": "^9.2.6",
  "tsconfig-paths": "^3.9.0",
- "tsconfig-paths-webpack-plugin": "3.4.1",
+ "tsconfig-paths-webpack-plugin": "3.5.2",
  "webpack-node-externals": "^3.0.0",
  "fork-ts-checker-webpack-plugin": "6.2.10",
  "rxjs": "^6.5.4",

packages/next/src/utils/config.spec.ts

@@ -2,16 +2,11 @@ import { createWebpackConfig, prepareConfig } from './config';
 import { NextBuildBuilderOptions } from '@nrwl/next';
 import { dirname } from 'path';
 import { importConstants } from './require-shim';
-// Inlining tsconfig-paths-webpack-plugin with a patch
-// See: https://github.com/dividab/tsconfig-paths-webpack-plugin/pull/85
-// TODO(jack): Remove once the patch lands in original package
-import { TsconfigPathsPlugin } from '@nrwl/web/src/utils/webpack/plugins/tsconfig-paths/tsconfig-paths.plugin';
+import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
 
 const { PHASE_PRODUCTION_BUILD } = importConstants();
 
-jest.mock(
- '@nrwl/web/src/utils/webpack/plugins/tsconfig-paths/tsconfig-paths.plugin'
-);
+jest.mock('tsconfig-paths-webpack-plugin');
 jest.mock('next/dist/server/config', () => ({
  __esModule: true,
  default: () => ({

packages/next/src/utils/config.ts

@@ -10,7 +10,7 @@ import type {
  PHASE_PRODUCTION_SERVER,
 } from 'next/dist/shared/lib/constants';
 import { join, resolve } from 'path';
-import { TsconfigPathsPlugin } from '@nrwl/web/src/utils/webpack/plugins/tsconfig-paths/tsconfig-paths.plugin';
+import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
 import { Configuration } from 'webpack';
 import {
  FileReplacement,
@@ -71,7 +71,7 @@ export function createWebpackConfig(
  configFile: tsConfigPath,
  extensions,
  mainFields,
- }),
+ }) as never, // TODO: Remove never type when 'tsconfig-paths-webpack-plugin' types fixed
  ];
 
  fileReplacements

packages/node/package.json

@@ -46,7 +46,7 @@
  "tree-kill": "1.2.2",
  "ts-loader": "^9.2.6",
  "tsconfig-paths": "^3.9.0",
- "tsconfig-paths-webpack-plugin": "3.4.1",
+ "tsconfig-paths-webpack-plugin": "3.5.2",
  "tslib": "^2.3.0",
  "webpack": "^5.58.1",
  "webpack-merge": "^5.8.0",

packages/node/src/executors/build/build.impl.spec.ts

@@ -5,7 +5,7 @@ import type { ProjectGraph } from '@nrwl/workspace/src/core/project-graph';
 import buildExecutor from './build.impl';
 import { BuildNodeBuilderOptions } from '../../utils/types';
 
-jest.mock('../../utils/webpack/plugins/tsconfig-paths/tsconfig-paths.plugin');
+jest.mock('tsconfig-paths-webpack-plugin');
 jest.mock('../../utils/run-webpack', () => ({
  runWebpack: jest.fn(),
 }));

packages/node/src/utils/config.ts

@@ -8,11 +8,7 @@ import { BuildBuilderOptions } from './types';
 import { loadTsPlugins } from './load-ts-plugins';
 import CopyWebpackPlugin = require('copy-webpack-plugin');
 import ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
-
-// Inlining tsconfig-paths-webpack-plugin with a patch
-// See: https://github.com/dividab/tsconfig-paths-webpack-plugin/pull/85
-// TODO(jack): Remove once the patch lands in original package
-import TsConfigPathsPlugin from './webpack/plugins/tsconfig-paths/tsconfig-paths.plugin';
+import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
 
 export const OUT_FILENAME_TEMPLATE = '[name].js';
 
@@ -85,11 +81,11 @@ export function getBaseWebpackPartial(
  extensions,
  alias: getAliases(options),
  plugins: [
- new TsConfigPathsPlugin({
+ new TsconfigPathsPlugin({
  configFile: options.tsConfig,
  extensions,
  mainFields,
- }),
+ }) as never, // TODO: Remove never type when 'tsconfig-paths-webpack-plugin' types fixed
  ],
  mainFields,
  },

packages/node/src/utils/node.config.spec.ts

@@ -1,9 +1,9 @@
 import { join } from 'path';
 import { getNodeWebpackConfig } from './node.config';
-import TsConfigPathsPlugin from './webpack/plugins/tsconfig-paths/tsconfig-paths.plugin';
+import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
 import { BuildNodeBuilderOptions } from './types';
 
-jest.mock('./webpack/plugins/tsconfig-paths/tsconfig-paths.plugin');
+jest.mock('tsconfig-paths-webpack-plugin');
 jest.mock('@nrwl/tao/src/utils/app-root', () => ({
  get appRootPath() {
  return join(__dirname, '../../../..');
@@ -21,7 +21,7 @@ describe('getNodePartial', () => {
  fileReplacements: [],
  statsJson: false,
  };
- (<any>TsConfigPathsPlugin).mockImplementation(
+ (<any>TsconfigPathsPlugin).mockImplementation(
  function MockPathsPlugin() {}
  );
  });