Skip to content

Commit b36d1ea

Browse files
arcanisiansu
authored andcommitted
Adds the configuration for PnP/Typescript (#6856)
* Adds the configuration for PnP/Typescript * Adds the header * Bumps ts-pnp * Bumps fork-ts-checker-webpack-plugin
1 parent 6710f52 commit b36d1ea

File tree

4 files changed

+51
-1
lines changed

4 files changed

+51
-1
lines changed

Diff for: packages/react-dev-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"escape-string-regexp": "1.0.5",
6060
"filesize": "3.6.1",
6161
"find-up": "3.0.0",
62-
"fork-ts-checker-webpack-plugin": "1.0.1",
62+
"fork-ts-checker-webpack-plugin": "1.1.1",
6363
"global-modules": "2.0.0",
6464
"globby": "8.0.2",
6565
"gzip-size": "5.0.0",

Diff for: packages/react-scripts/config/pnpTs.js

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// @remove-on-eject-begin
2+
/**
3+
* Copyright (c) 2015-present, Facebook, Inc.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
// @remove-on-eject-end
9+
'use strict';
10+
11+
const { resolveModuleName } = require('ts-pnp');
12+
13+
exports.resolveModuleName = (
14+
typescript,
15+
moduleName,
16+
containingFile,
17+
compilerOptions,
18+
resolutionHost
19+
) => {
20+
return resolveModuleName(
21+
moduleName,
22+
containingFile,
23+
compilerOptions,
24+
resolutionHost,
25+
typescript.resolveModuleName
26+
);
27+
};
28+
29+
exports.resolveTypeReferenceDirective = (
30+
typescript,
31+
moduleName,
32+
containingFile,
33+
compilerOptions,
34+
resolutionHost
35+
) => {
36+
return resolveModuleName(
37+
moduleName,
38+
containingFile,
39+
compilerOptions,
40+
resolutionHost,
41+
typescript.resolveTypeReferenceDirective
42+
);
43+
};

Diff for: packages/react-scripts/config/webpack.config.js

+6
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,12 @@ module.exports = function(webpackEnv) {
637637
async: isEnvDevelopment,
638638
useTypescriptIncrementalApi: true,
639639
checkSyntacticErrors: true,
640+
resolveModuleNameModule: process.versions.pnp
641+
? `${__dirname}/pnpTs.js`
642+
: undefined,
643+
resolveTypeReferenceDirectiveModule: process.versions.pnp
644+
? `${__dirname}/pnpTs.js`
645+
: undefined,
640646
tsconfig: paths.appTsConfig,
641647
reportFiles: [
642648
'**',

Diff for: packages/react-scripts/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
"semver": "6.0.0",
7575
"style-loader": "0.23.1",
7676
"terser-webpack-plugin": "1.2.3",
77+
"ts-pnp": "1.1.2",
7778
"url-loader": "1.1.2",
7879
"webpack": "4.29.6",
7980
"webpack-dev-server": "3.2.1",

0 commit comments

Comments
 (0)