feat: resolve by target

shuvijs · Feb 21, 2020 · 4783a40 · 4783a40
1 parent efa2d9a
commit 4783a40
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 1 deletion.
diff --git a/packages/shuvi/src/webpack/webpackManager.ts b/packages/shuvi/src/webpack/webpackManager.ts
@@ -55,7 +55,7 @@ class WebpackManagerImpl {
     });
     clientConfig.entry = getClientEntry();
     // console.log("clientConfig");
-    // console.dir(clientConfig.module?.rules);
+    // console.dir(clientConfig.resolve?.extensions);
 
     const serverConfig = createWepbackConfig(this._app, {
       name: WEBPACK_CONFIG_SERVER,

diff --git a/packages/toolpack/src/webpack/config/base.ts b/packages/toolpack/src/webpack/config/base.ts
@@ -22,6 +22,7 @@ export interface BaseOptions {
   srcDirs: string[];
   mediaFilename: string;
   buildManifestFilename: string;
+  target?: string;
   publicPath?: string;
   env?: {
     [x: string]: string;

diff --git a/packages/toolpack/src/webpack/config/browser.ts b/packages/toolpack/src/webpack/config/browser.ts
@@ -4,6 +4,8 @@ import WebpackChain from "webpack-chain";
 // import BuildManifestPlugin from "../plugins/build-manifest-plugin";
 import { baseWebpackChain, BaseOptions } from "./base";
 import { withStyle } from "./parts/style";
+import { resolvePreferTarget } from "./parts/resolve";
+import { getProjectInfo } from "../../utils/typeScript";
 
 const BIG_LIBRARY_THRESHOLD = 160000; // byte
 
@@ -14,9 +16,23 @@ export function createBrowserWebpackChain({
 }: BrowserOptions): WebpackChain {
   const { dev } = baseOptions;
   const chain = baseWebpackChain(baseOptions);
+  const { useTypeScript } = getProjectInfo(baseOptions.projectRoot);
 
   chain.target("web");
   chain.devtool(dev ? "cheap-module-source-map" : false);
+  const extensions = [
+    ...(useTypeScript ? [".tsx", ".ts"] : []),
+    ".mjs",
+    ".js",
+    ".jsx",
+    ".json",
+    ".wasm"
+  ];
+  chain.resolve.extensions.merge(
+    baseOptions.target
+      ? resolvePreferTarget(baseOptions.target, extensions)
+      : extensions
+  );
   if (dev) {
     chain.plugin("private/hmr-plugin").use(webpack.HotModuleReplacementPlugin);
   } else {

diff --git a/packages/toolpack/src/webpack/config/node.ts b/packages/toolpack/src/webpack/config/node.ts
@@ -2,16 +2,32 @@ import WebpackChain from "webpack-chain";
 import { baseWebpackChain, BaseOptions } from "./base";
 import { nodeExternals } from "./parts/external";
 import { withStyle } from "./parts/style";
+import { resolvePreferTarget } from "./parts/resolve";
+import { getProjectInfo } from "../../utils/typeScript";
 
 export interface NodeOptions extends BaseOptions {}
 
 export function createNodeWebpackChain({
   ...baseOptions
 }: NodeOptions): WebpackChain {
   const chain = baseWebpackChain(baseOptions);
+  const { useTypeScript } = getProjectInfo(baseOptions.projectRoot);
 
   chain.target("node");
   chain.devtool(false);
+  const extensions = [
+    ...(useTypeScript ? [".tsx", ".ts"] : []),
+    ".js",
+    ".mjs",
+    ".jsx",
+    ".json",
+    ".wasm"
+  ];
+  chain.resolve.extensions.merge(
+    baseOptions.target
+      ? resolvePreferTarget(baseOptions.target, extensions)
+      : extensions
+  );
   chain.output.libraryTarget("commonjs2");
   chain.optimization.minimize(false);
   chain.externals(nodeExternals({ projectRoot: baseOptions.projectRoot }));

diff --git a/packages/toolpack/src/webpack/config/parts/resolve.ts b/packages/toolpack/src/webpack/config/parts/resolve.ts
@@ -0,0 +1,8 @@
+export function resolvePreferTarget(target: string, extensions: string[]) {
+  return extensions.reduce((res, ext) => {
+    res.push(`.${target}${ext}`);
+    res.push(ext);
+
+    return res;
+  }, [] as string[]);
+}