From ad0b3423b59886362fac1e6cf0f6af4dec2895b1 Mon Sep 17 00:00:00 2001 From: Jean Helou Date: Tue, 26 May 2020 18:00:02 +0200 Subject: [PATCH] (OK) replaces manual webpack aliases with tsconfig-paths-webpack-plugin --- packages/web-app/next.config.js | 19 ++++--------------- packages/web-app/package.json | 1 + yarn.lock | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 36 insertions(+), 17 deletions(-) diff --git a/packages/web-app/next.config.js b/packages/web-app/next.config.js index dc73f76..d310ddf 100644 --- a/packages/web-app/next.config.js +++ b/packages/web-app/next.config.js @@ -2,25 +2,14 @@ // https://www.npmjs.com/package/next-transpile-modules const withTM = require("next-transpile-modules")(["bar"]); -const path = require("path"); +const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); const nextConfig = { webpack: function (config) { - /* - Optionnaly, adding the following to modules - will resolve modules using relative paths instead of - going through `/node_modules` - */ - /* - config.resolve.modules = [ - path.join(__dirname, ".."), - ...config.resolve.modules, + config.resolve.plugins = [ + ...config.resolve.plugins, + new TsconfigPathsPlugin(), ]; - */ - config.resolve.alias = { - ...config.resolve.alias, - baz: "baz/src", - }; return config; }, diff --git a/packages/web-app/package.json b/packages/web-app/package.json index ef3ea39..01d9187 100644 --- a/packages/web-app/package.json +++ b/packages/web-app/package.json @@ -17,6 +17,7 @@ "@types/node": "^12.12.21", "@types/react": "^16.9.16", "@types/react-dom": "^16.9.4", + "tsconfig-paths-webpack-plugin": "^3.2.0", "typescript": "3.7.3" }, "license": "ISC" diff --git a/yarn.lock b/yarn.lock index 15c40f9..0daad41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -958,6 +958,11 @@ resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/node@^12.12.21": version "12.12.41" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.41.tgz#cf48562b53ab6cf85d28dde95f1d06815af275c8" @@ -1680,7 +1685,7 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -2345,7 +2350,7 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^4.1.0: +enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66" integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA== @@ -5077,6 +5082,11 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + style-loader@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.2.1.tgz#c5cbbfbf1170d076cfdd86e0109c5bba114baa1a" @@ -5280,6 +5290,25 @@ ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== +tsconfig-paths-webpack-plugin@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz#6e70bd42915ad0efb64d3385163f0c1270f3e04d" + integrity sha512-S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g== + dependencies: + chalk "^2.3.0" + enhanced-resolve "^4.0.0" + tsconfig-paths "^3.4.0" + +tsconfig-paths@^3.4.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + tslib@^1.9.0: version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"