draft5.1

draft5

Author: radist2s

e2e/projects/tree-shaking-bundlers/package.json

@@ -13,12 +13,13 @@
     "e2e:post-build": "node ./scripts/assert-dist.mjs"
   },
   "dependencies": {
+    "@esbuild-plugins/tsconfig-paths": "^0.1.2",
     "@openapi-qraft/cli": "latest",
     "@openapi-qraft/react": "latest",
     "@openapi-qraft/tree-shaking-plugin": "latest",
-    "@esbuild-plugins/tsconfig-paths": "^0.1.2",
     "@rollup/plugin-alias": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^16.0.3"
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "tsconfig-paths-webpack-plugin": "^4.2.0"
   },
   "devDependencies": {
     "@rspack/cli": "latest",

e2e/projects/tree-shaking-bundlers/scripts/build-esbuild.mjs

@@ -6,7 +6,6 @@ import {
   factories,
   getBundlerOutputDir,
   getScenario,
-  getScenarioEntryPath,
   isExternalModuleRequest,
 } from './shared.mjs';
 
@@ -17,7 +16,7 @@ await build({
     'process.env.NODE_ENV': '"production"',
   },
   entryPoints: {
-    [scenario.name]: getScenarioEntryPath(scenario),
+    [scenario.name]: resolve(process.cwd(), scenario.entry),
   },
   outdir: getBundlerOutputDir('esbuild', scenario),
   format: 'esm',

e2e/projects/tree-shaking-bundlers/scripts/build.mjs

@@ -2,7 +2,6 @@ import { rmSync } from 'node:fs';
 import { spawnSync } from 'node:child_process';
 import {
   bundlers,
-  createBundlerEnv,
   getBundlerOutputDir,
   scenarios,
 } from './scenarios.mjs';
@@ -44,7 +43,8 @@ for (const bundler of bundlers) {
       stdio: 'inherit',
       env: {
         ...process.env,
-        ...createBundlerEnv(bundler, scenario),
+        QRAFT_TREE_SHAKE_BUNDLER: bundler,
+        QRAFT_TREE_SHAKE_SCENARIO: scenario.name,
       },
     });
 

e2e/projects/tree-shaking-bundlers/scripts/scenarios.mjs

@@ -1,13 +1,9 @@
 export {
   bundlers,
-  createBundlerEnv,
   factories,
-  getBundler,
   getBundlerOutputDir,
   getBundlePath,
-  getProjectSrcPath,
   getScenario,
-  getScenarioEntryPath,
   isExternalModuleRequest,
   scenarios,
 } from './shared.mjs';

e2e/projects/tree-shaking-bundlers/scripts/shared.mjs

@@ -140,14 +140,6 @@ export const factories = [
   },
 ];
 
-export function getBundler(name) {
-  if (!bundlers.includes(name)) {
-    throw new Error(`Unknown tree-shaking bundler: ${name}`);
-  }
-
-  return name;
-}
-
 export function getScenario(name) {
   const scenario = scenarios.find((candidate) => candidate.name === name);
 
@@ -158,10 +150,6 @@ export function getScenario(name) {
   return scenario;
 }
 
-export function getScenarioEntryPath(scenario) {
-  return resolve(process.cwd(), scenario.entry);
-}
-
 export function getBundlerOutputDir(bundler, scenario) {
   return resolve(process.cwd(), 'dist', bundler, scenario.name);
 }
@@ -170,16 +158,6 @@ export function getBundlePath(bundler, scenario) {
   return resolve(getBundlerOutputDir(bundler, scenario), `${scenario.name}.js`);
 }
 
-export function getProjectSrcPath(...segments) {
-  return resolve(process.cwd(), 'src', ...segments);
-}
-
-export function createAlias() {
-  return {
-    '@': resolve(process.cwd(), 'src'),
-  };
-}
-
 export function isExternalModuleRequest(request) {
   if (!request) {
     return false;
@@ -201,10 +179,3 @@ export function isExternalModuleRequest(request) {
 
   return !isAbsolute(request);
 }
-
-export function createBundlerEnv(bundler, scenario) {
-  return {
-    QRAFT_TREE_SHAKE_BUNDLER: bundler,
-    QRAFT_TREE_SHAKE_SCENARIO: scenario.name,
-  };
-}

e2e/projects/tree-shaking-bundlers/vite.config.ts

@@ -1,9 +1,8 @@
 import { resolve } from 'node:path';
-import { defineConfig } from 'vite';
 import { qraftTreeShakeVite } from '@openapi-qraft/tree-shaking-plugin/vite';
+import { defineConfig } from 'vite';
 import { getScenario } from './scripts/scenarios.mjs';
 import {
-  createAlias,
   factories,
   getBundlerOutputDir,
   isExternalModuleRequest,
@@ -14,7 +13,9 @@ export default defineConfig(({ mode }) => {
 
   return {
     plugins: [qraftTreeShakeVite({ factories })],
-    resolve: { alias: createAlias() },
+    resolve: {
+      tsconfigPaths: true,
+    },
     build: {
       emptyOutDir: true,
       minify: false,

e2e/projects/tree-shaking-bundlers/webpack.config.mjs

@@ -1,8 +1,8 @@
 import { resolve } from 'node:path';
 import { qraftTreeShakeWebpack } from '@openapi-qraft/tree-shaking-plugin/webpack';
 import TerserPlugin from 'terser-webpack-plugin';
+import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
 import {
-  createAlias,
   factories,
   getBundlerOutputDir,
   getScenario,
@@ -25,7 +25,14 @@ export default {
     clean: true,
   },
   resolve: {
-    alias: createAlias(),
+    alias: {
+      '@': resolve(process.cwd(), 'src'),
+    },
+    plugins: [
+      new TsconfigPathsPlugin({
+        configFile: resolve(process.cwd(), 'tsconfig.json'),
+      }),
+    ],
     extensions: ['.ts', '.tsx', '.mts', '.cts', '.mjs', '.js'],
     extensionAlias: {
       '.js': ['.js', '.ts'],