Revert "feat: allow to import TS files with js extension (#3536)" (#3559

)
web-infra-dev · Sep 25, 2024 · e3e6cb5 · e3e6cb5
1 parent 6ac2c5f
commit e3e6cb5
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 115 deletions.
diff --git a/e2e/cases/typescript/extension-alias/index.test.ts b/e2e/cases/typescript/extension-alias/index.test.ts
diff --git a/e2e/cases/typescript/extension-alias/src/bar.tsx b/e2e/cases/typescript/extension-alias/src/bar.tsx
diff --git a/e2e/cases/typescript/extension-alias/src/foo.ts b/e2e/cases/typescript/extension-alias/src/foo.ts
diff --git a/e2e/cases/typescript/extension-alias/src/index.ts b/e2e/cases/typescript/extension-alias/src/index.ts
diff --git a/e2e/cases/typescript/extension-alias/tsconfig.json b/e2e/cases/typescript/extension-alias/tsconfig.json
diff --git a/...cases/typescript/const-enum/index.test.ts → e2e/cases/typescript/index.test.ts b/...cases/typescript/const-enum/index.test.ts → e2e/cases/typescript/index.test.ts
diff --git a/e2e/cases/typescript/const-enum/src/foo.ts → e2e/cases/typescript/src/foo.ts b/e2e/cases/typescript/const-enum/src/foo.ts → e2e/cases/typescript/src/foo.ts
diff --git a/e2e/cases/typescript/const-enum/src/index.ts → e2e/cases/typescript/src/index.ts b/e2e/cases/typescript/const-enum/src/index.ts → e2e/cases/typescript/src/index.ts
diff --git a/...cases/typescript/const-enum/tsconfig.json → e2e/cases/typescript/tsconfig.json b/...cases/typescript/const-enum/tsconfig.json → e2e/cases/typescript/tsconfig.json
diff --git a/packages/compat/webpack/tests/__snapshots__/default.test.ts.snap b/packages/compat/webpack/tests/__snapshots__/default.test.ts.snap
@@ -325,13 +325,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
     },
   ],
   "resolve": {
-    "extensionAlias": {
-      ".js": [
-        ".ts",
-        ".tsx",
-        ".js",
-      ],
-    },
     "extensions": [
       ".ts",
       ".tsx",
@@ -690,13 +683,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when produ
     },
   ],
   "resolve": {
-    "extensionAlias": {
-      ".js": [
-        ".ts",
-        ".tsx",
-        ".js",
-      ],
-    },
     "extensions": [
       ".ts",
       ".tsx",
@@ -1004,13 +990,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
     },
   ],
   "resolve": {
-    "extensionAlias": {
-      ".js": [
-        ".ts",
-        ".tsx",
-        ".js",
-      ],
-    },
     "extensions": [
       ".ts",
       ".tsx",
@@ -1301,13 +1280,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
     },
   ],
   "resolve": {
-    "extensionAlias": {
-      ".js": [
-        ".ts",
-        ".tsx",
-        ".js",
-      ],
-    },
     "extensions": [
       ".ts",
       ".tsx",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -90,7 +90,7 @@
     "reduce-configs": "^1.0.0",
     "rsbuild-dev-middleware": "0.1.1",
     "rslog": "^1.2.3",
-    "rspack-chain": "^1.0.3",
+    "rspack-chain": "^1.0.1",
     "rspack-manifest-plugin": "5.0.1",
     "sirv": "^2.0.4",
     "style-loader": "3.3.4",

diff --git a/packages/core/src/plugins/resolve.ts b/packages/core/src/plugins/resolve.ts
@@ -24,13 +24,7 @@ function applyFullySpecified({
     .resolve.set('fullySpecified', false);
 }
 
-function applyExtensions({
-  chain,
-  tsconfigPath,
-}: {
-  chain: RspackChain;
-  tsconfigPath: string | undefined;
-}) {
+function applyExtensions({ chain }: { chain: RspackChain }) {
   const extensions = [
     // most projects are using TypeScript, resolve .ts(x) files first to reduce resolve time.
     '.ts',
@@ -42,13 +36,6 @@ function applyExtensions({
   ];
 
   chain.resolve.extensions.merge(extensions);
-
-  if (tsconfigPath) {
-    // TypeScript allows importing TS files with `.js` extension
-    chain.resolve.extensionAlias.merge({
-      '.js': ['.ts', '.tsx', '.js'],
-    });
-  }
 }
 
 function applyAlias({
@@ -103,7 +90,7 @@ export const pluginResolve = (): RsbuildPlugin => ({
       handler: (chain, { environment, CHAIN_ID }) => {
         const { config, tsconfigPath } = environment;
 
-        applyExtensions({ chain, tsconfigPath });
+        applyExtensions({ chain });
 
         applyAlias({
           chain,

diff --git a/packages/core/tests/__snapshots__/default.test.ts.snap b/packages/core/tests/__snapshots__/default.test.ts.snap
@@ -373,13 +373,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly 1`] = `
     "alias": {
       "@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
     },
-    "extensionAlias": {
-      ".js": [
-        ".ts",
-        ".tsx",
-        ".js",
-      ],
-    },
     "extensions": [
       ".ts",
       ".tsx",
@@ -809,13 +802,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when prod
     "alias": {
       "@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
     },
-    "extensionAlias": {
-      ".js": [
-        ".ts",
-        ".tsx",
-        ".js",
-      ],
-    },
     "extensions": [
       ".ts",
       ".tsx",
@@ -1143,13 +1129,6 @@ exports[`applyDefaultPlugins > should apply default plugins correctly when targe
     "alias": {
       "@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
     },
-    "extensionAlias": {
-      ".js": [
-        ".ts",
-        ".tsx",
-        ".js",
-      ],
-    },
     "extensions": [
       ".ts",
       ".tsx",
@@ -1550,13 +1529,6 @@ exports[`tools.rspack > should match snapshot 1`] = `
     "alias": {
       "@swc/helpers": "<ROOT>/node_modules/<PNPM_INNER>/@swc/helpers",
     },
-    "extensionAlias": {
-      ".js": [
-        ".ts",
-        ".tsx",
-        ".js",
-      ],
-    },
     "extensions": [
       ".ts",
       ".tsx",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml