@tramvai/cli 6.79.13 → 6.79.16

package/schema.json

@@ -1378,23 +1378,23 @@
                               "dotAll": {
                                 "type": "boolean"
                               },
-                              "__@match@9315": {
+                              "__@match@9031": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@replace@9317": {
+                              "__@replace@9033": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@search@9320": {
+                              "__@search@9036": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@split@9322": {
+                              "__@split@9038": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@matchAll@9324": {
+                              "__@matchAll@9040": {
                                 "type": "object",
                                 "additionalProperties": false
                               }
@@ -2254,23 +2254,23 @@
                                 "dotAll": {
                                   "type": "boolean"
                                 },
-                                "__@match@9315": {
+                                "__@match@9031": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@replace@9317": {
+                                "__@replace@9033": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@search@9320": {
+                                "__@search@9036": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@split@9322": {
+                                "__@split@9038": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@matchAll@9324": {
+                                "__@matchAll@9040": {
                                   "type": "object",
                                   "additionalProperties": false
                                 }
@@ -3130,23 +3130,23 @@
                                   "dotAll": {
                                     "type": "boolean"
                                   },
-                                  "__@match@9315": {
+                                  "__@match@9031": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@replace@9317": {
+                                  "__@replace@9033": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@search@9320": {
+                                  "__@search@9036": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@split@9322": {
+                                  "__@split@9038": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@matchAll@9324": {
+                                  "__@matchAll@9040": {
                                     "type": "object",
                                     "additionalProperties": false
                                   }

package/src/api/analyze/index.ts

@@ -3,7 +3,7 @@ import { createCommand } from '../../commands/createCommand';
 
 export interface Params {
   target: string;
-  plugin?: 'bundle' | 'whybundled' | 'statoscope';
+  plugin?: 'bundle' | 'whybundled' | 'statoscope' | 'stats' | 'rsdoctor';
   showConfig?: boolean;
   fileCache?: boolean;
   verboseWebpack?: boolean;

package/src/api/build/__integration__/build.test.ts

@@ -27,13 +27,13 @@ describe('@tramvai/cli build command', () => {
 
       expect(normalizeFiles(clientFiles)).toMatchInlineSnapshot(`
         [
+          "app_bundles_first_ts.js",
+          "app_bundles_main_ts.js",
+          "app_bundles_second_ts.js",
+          "app_bundles_third_ts.js",
           "platform.css",
           "platform.js",
           "react.js",
-          "src_api_build___integration_____fixtures___app_bundles_first_ts.js",
-          "src_api_build___integration_____fixtures___app_bundles_main_ts.js",
-          "src_api_build___integration_____fixtures___app_bundles_second_ts.js",
-          "src_api_build___integration_____fixtures___app_bundles_third_ts.js",
           "stats.json",
         ]
       `);
@@ -69,13 +69,13 @@ describe('@tramvai/cli build command', () => {
 
       expect(normalizeFiles(clientFiles)).toMatchInlineSnapshot(`
         [
+          "app_bundles_first_ts.js",
+          "app_bundles_main_ts.js",
+          "app_bundles_second_ts.js",
+          "app_bundles_third_ts.js",
           "platform.css",
           "platform.js",
           "react.js",
-          "src_api_build___integration_____fixtures___app_bundles_first_ts.js",
-          "src_api_build___integration_____fixtures___app_bundles_main_ts.js",
-          "src_api_build___integration_____fixtures___app_bundles_second_ts.js",
-          "src_api_build___integration_____fixtures___app_bundles_third_ts.js",
           "stats.json",
         ]
       `);

package/src/api/start/index.ts

@@ -24,7 +24,7 @@ export type Params = WithConfig<{
   noClientRebuild?: boolean;
   resolveSymlinks?: boolean;
   showConfig?: boolean;
-  analyze?: false | 'bundle' | 'whybundled' | 'statoscope' | 'rsdoctor';
+  analyze?: false | 'bundle' | 'whybundled' | 'statoscope' | 'rsdoctor' | 'stats';
   benchmark?: boolean;
   withBuildStats?: boolean;
   // @todo: not working?

package/src/builder/webpack/analyzePlugins/bundle.ts

@@ -2,7 +2,7 @@ import type ChainConfig from 'webpack-chain';
 import { AnalyzePlugin } from '../types';
 
 export class BundleAnalyzePlugin extends AnalyzePlugin {
-  options = [
+  options = () => [
     {
       analyzerMode: 'server',
     },

package/src/builder/webpack/analyzePlugins/rsdoctor.ts

@@ -5,8 +5,6 @@ type options = ConstructorParameters<typeof RsdoctorWebpackPlugin<[]>>;
 export class RsdoctorAnalyzePlugin extends AnalyzePlugin {
   requireDeps = [];
 
-  options: options = [];
-
   // rsdoctor поднимает dev server
   afterBuild = () => new Promise(() => null);
 

package/src/builder/webpack/analyzePlugins/statoscope.ts

@@ -1,50 +1,18 @@
-import chalk from 'chalk';
+import type StatoscopeWebpackPlugin from '@statoscope/webpack-plugin';
+
 import { AnalyzePlugin } from '../types';
-import type { FileStatsOptions } from '../../../library/webpack/plugins/FileStats';
-import { FileStatsPlugin } from '../../../library/webpack/plugins/FileStats';
 
 export class StatoscopeAnalyzePlugin extends AnalyzePlugin {
-  statsFileName = 'stats-all.json';
-
   requireDeps = [];
 
-  statsFilePath: string;
-
-  options: [FileStatsOptions] = [
+  options = (): ConstructorParameters<typeof StatoscopeWebpackPlugin> => [
     {
-      filename: this.statsFileName,
-      stats: {
-        hash: true, // add compilation hash
-        entrypoints: true, // add entrypoints stats
-        chunks: true, // add chunks stats
-        chunkModules: true, // add modules stats
-        reasons: true, // add modules reasons stats
-
-        assets: true, // add assets stats
-        chunkOrigins: true, // add chunks origins stats (to find out which modules require a chunk)
-        version: true, // add webpack version
-        builtAt: true, // add build at time
-        timings: true, // add build at time
-        performance: true, // add info about oversized assets
-        source: true, // add module sources (uses to find modules duplicates)
-      },
+      statsOptions: { all: true },
     },
   ];
 
-  plugin = FileStatsPlugin;
-
-  afterBuild = () => {
-    console.log(
-      chalk.yellow(
-        `Приложение собралось и корне проекта доступен файл со всей информацией по приложению в файле ${this.statsFileName}`
-      )
-    );
-    console.log(
-      chalk.green(
-        `Далее необходимо зайти на страницу https://statoscope.tech/ и  drag-on-drop перенести файл из клиентских ассетов ${this.statsFileName}`
-      )
-    );
-
-    return Promise.resolve();
-  };
+  get plugin() {
+    // eslint-disable-next-line import/no-unresolved
+    return require('@statoscope/webpack-plugin').default;
+  }
 }

package/src/builder/webpack/analyzePlugins/stats.ts

@@ -0,0 +1,45 @@
+import chalk from 'chalk';
+import { AnalyzePlugin } from '../types';
+import type { FileStatsOptions } from '../../../library/webpack/plugins/FileStats';
+import { FileStatsPlugin } from '../../../library/webpack/plugins/FileStats';
+
+export class StatsAnalyzePlugin extends AnalyzePlugin {
+  statsFileName = 'stats-all.json';
+
+  requireDeps = [];
+
+  statsFilePath: string;
+
+  options = (): [FileStatsOptions] => [
+    {
+      filename: this.statsFileName,
+      stats: {
+        hash: true, // add compilation hash
+        entrypoints: true, // add entrypoints stats
+        chunks: true, // add chunks stats
+        chunkModules: true, // add modules stats
+        reasons: true, // add modules reasons stats
+
+        assets: true, // add assets stats
+        chunkOrigins: true, // add chunks origins stats (to find out which modules require a chunk)
+        version: true, // add webpack version
+        builtAt: true, // add build at time
+        timings: true, // add build at time
+        performance: true, // add info about oversized assets
+        source: true, // add module sources (uses to find modules duplicates)
+      },
+    },
+  ];
+
+  plugin = FileStatsPlugin;
+
+  afterBuild = () => {
+    console.log(
+      chalk.yellow(
+        `Сборка завершилась успешна, сгенерирвао файл с информацией о сборке ${this.statsFileName}`
+      )
+    );
+
+    return Promise.resolve();
+  };
+}

package/src/builder/webpack/analyzePlugins/whyBundled.ts

@@ -12,7 +12,7 @@ export class WhyBundledAnalyzePlugin extends AnalyzePlugin {
   statsFilePath: string;
 
   plugin = FileStatsPlugin;
-  options: [FileStatsOptions] = [
+  options = (): [FileStatsOptions] => [
     {
       filename: this.statsFileName,
       stats: {

package/src/builder/webpack/providers/build/server.ts

@@ -9,6 +9,7 @@ import {
   PROCESS_HANDLER_TOKEN,
   SERVER_CONFIG_MANAGER_TOKEN,
   WEBPACK_ANALYZE_PLUGIN_TOKEN,
+  WEBPACK_CLIENT_CONFIG_TOKEN,
   WEBPACK_SERVER_COMPILER_TOKEN,
   WEBPACK_SERVER_CONFIG_TOKEN,
 } from '../../tokens';
@@ -19,15 +20,19 @@ import { createCompiler } from '../../utils/compiler';
 export const buildServerProviders: Provider[] = [
   provide({
     provide: WEBPACK_SERVER_COMPILER_TOKEN,
-    useFactory: ({ webpackConfig, di, analyzePlugin }) => {
+    useFactory: ({ webpackConfig, di, analyzePlugin, clientConfig }) => {
+      // analyze server only if no client build found
+      const shouldAnalyze = !clientConfig && analyzePlugin;
+
       return createCompiler(
-        toWebpackConfig(analyzePlugin ? analyzePlugin.patchConfig(webpackConfig) : webpackConfig),
+        toWebpackConfig(shouldAnalyze ? analyzePlugin.patchConfig(webpackConfig) : webpackConfig),
         di
       );
     },
     deps: {
       webpackConfig: WEBPACK_SERVER_CONFIG_TOKEN,
       di: DI_TOKEN,
+      clientConfig: { token: WEBPACK_CLIENT_CONFIG_TOKEN, optional: true },
       analyzePlugin: { token: WEBPACK_ANALYZE_PLUGIN_TOKEN, optional: true },
     },
   }),

package/src/builder/webpack/providers/shared.ts

@@ -19,6 +19,7 @@ import { BundleAnalyzePlugin } from '../analyzePlugins/bundle';
 import { StatoscopeAnalyzePlugin } from '../analyzePlugins/statoscope';
 import { WhyBundledAnalyzePlugin } from '../analyzePlugins/whyBundled';
 import { RsdoctorAnalyzePlugin } from '../analyzePlugins/rsdoctor';
+import { StatsAnalyzePlugin } from '../analyzePlugins/stats';
 import type { AnalyzePlugin } from '../types';
 
 interface Type<T> extends Function {
@@ -29,6 +30,7 @@ const pluginMap: Record<string, Type<AnalyzePlugin>> = {
   bundle: BundleAnalyzePlugin,
   whybundled: WhyBundledAnalyzePlugin,
   statoscope: StatoscopeAnalyzePlugin,
+  stats: StatsAnalyzePlugin,
   rsdoctor: RsdoctorAnalyzePlugin,
 };
 

package/src/builder/webpack/providers/start/shared.ts

@@ -18,10 +18,16 @@ export const startSharedProviders: Provider[] = [
   provide({
     provide: WEBPACK_COMPILER_TOKEN,
     useFactory: ({ clientConfig, serverConfig, analyzePlugin }) => {
-      const configs = [clientConfig, serverConfig]
-        .filter(Boolean)
-        .map((config) => (analyzePlugin ? analyzePlugin.patchConfig(config) : config))
-        .map(toWebpackConfig);
+      if (analyzePlugin) {
+        // analyze server only if no client build found
+        if (clientConfig) {
+          analyzePlugin.patchConfig(clientConfig);
+        } else {
+          analyzePlugin.patchConfig(serverConfig);
+        }
+      }
+
+      const configs = [clientConfig, serverConfig].filter(Boolean).map(toWebpackConfig);
       const multiCompiler = webpack(configs);
       const { inputFileSystem } = multiCompiler.compilers[0];
 

package/src/builder/webpack/types.ts

@@ -1,4 +1,6 @@
 import type Config from 'webpack-chain';
+import { Configuration } from 'webpack';
+
 import type { ConfigManager } from '../../config/configManager';
 
 export type ConfigGenerator = (arg: {
@@ -9,7 +11,7 @@ export type ConfigGenerator = (arg: {
 export abstract class AnalyzePlugin {
   requireDeps?: string[];
 
-  protected options?;
+  protected options?: (webpackConfig: Configuration) => any[] = () => [];
 
   protected abstract plugin;
 
@@ -24,7 +26,8 @@ export abstract class AnalyzePlugin {
   };
 
   protected patchConfigInternal(config: Config): Config {
-    config.plugin('analyze').use(this.plugin, this.options);
+    const pureWebpackConfig = config.toConfig();
+    config.plugin('analyze').use(this.plugin, this.options(pureWebpackConfig));
 
     return config;
   }

package/src/commands/analyze/command.ts

@@ -17,7 +17,7 @@ class AnalyzeCommand extends CLICommand<Params> {
     {
       name: '-p, --plugin',
       value: '[plugin]',
-      description: 'Analysis plugin type <bundle|whybundled|statoscope|rsdoctor>',
+      description: 'Analysis plugin type <bundle|whybundled|statoscope|rsdoctor|stats>',
       defaultValue: 'bundle',
     },
     {

package/src/commands/build/command.ts

@@ -32,6 +32,11 @@ class BuildCommand extends CLICommand<Params> {
       value: '[disableProdOptimization]',
       description: 'Disable optimization of bundle sizes for production (minification, etc.)',
     },
+    {
+      name: '--readableOutput',
+      value: '[readableOutput]',
+      description: 'Disable hashed names and concatenated modules for better debug/analyze purpose',
+    },
     {
       name: '--showConfig',
       value: '[showConfig]',
@@ -51,7 +56,7 @@ class BuildCommand extends CLICommand<Params> {
       name: '--analyze',
       value: '[analyze]',
       description:
-        'Run build with analyze, supported plugins: <bundle|whybundled|statoscope|rsdoctor>',
+        'Run build with analyze, supported plugins: <bundle|whybundled|statoscope|rsdoctor|stats>',
     },
     {
       name: '--fileCache',

package/src/commands/start/command.ts

@@ -92,7 +92,7 @@ export class StartCommand extends CLICommand<Params> {
       name: '--analyze',
       value: '[analyze]',
       description:
-        'Run build with analyze, supported plugins: <bundle|whybundled|statoscope|rsdoctor>',
+        'Run build with analyze, supported plugins: <bundle|whybundled|statoscope|rsdoctor|stats>',
     },
     {
       name: '--onlyBundles',

package/src/config/configManager.ts

@@ -41,8 +41,9 @@ export interface Settings<E extends Env> {
   resolveSymlinks?: boolean;
   showConfig?: boolean;
   onlyBundles?: string[];
-  analyze?: false | 'bundle' | 'whybundled' | 'statoscope' | 'rsdoctor';
+  analyze?: false | 'bundle' | 'whybundled' | 'statoscope' | 'rsdoctor' | 'stats';
   disableProdOptimization?: boolean;
+  readableOutput?: boolean;
   fileCache?: boolean;
 }
 
@@ -136,6 +137,7 @@ export const createConfigManager = <C extends ConfigEntry = ConfigEntry, E exten
     benchmark: false,
     resolveSymlinks: true,
     disableProdOptimization: false,
+    readableOutput: false,
     analyze: false,
     onlyBundles: [],
     // according to measures fileCache in webpack doesn't affect

package/src/library/swc/__integration__/__snapshots__/swc.build.test.ts.snap

@@ -8,7 +8,7 @@ exports[`client: create-token-pure.ts 1`] = `
                       /* binding */ return TEST_TOKEN;
                   }
                   /* harmony export */              });
-              const TEST_TOKEN = /*#__PURE__*/ /*#__PURE__*/ (0, __webpack_require__("./src/library/swc/__integration__/mocks/tramvai-core.ts").E)("TEST_TOKEN");
+              const TEST_TOKEN = /*#__PURE__*/ /*#__PURE__*/ (0, __webpack_require__("./mocks/tramvai-core.ts").E)("TEST_TOKEN");
               "
 `;
 
@@ -73,7 +73,7 @@ exports[`client: lazy-component.tsx 1`] = `
                   }
                   /* harmony export */              });
               /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime");
-              /* harmony import */              const LazyComponent = (0, __webpack_require__("./src/library/swc/__integration__/mocks/tramvai-react.ts").R)({
+              /* harmony import */              const LazyComponent = (0, __webpack_require__("./mocks/tramvai-react.ts").R)({
                   chunkName: () => "components-lazy-inner",
                   requireSync(props) {
                       return __webpack_require__(this.resolve(props));
@@ -82,11 +82,11 @@ exports[`client: lazy-component.tsx 1`] = `
                       const key = this.resolve(props);
                       return !!__webpack_require__.m[key];
                   },
-                  importAsync: () => __webpack_require__.e(/* import() | components-lazy-inner */ "components-lazy-inner").then(__webpack_require__.bind(__webpack_require__, "./src/library/swc/__integration__/components/lazy-inner.tsx")),
+                  importAsync: () => __webpack_require__.e(/* import() | components-lazy-inner */ "components-lazy-inner").then(__webpack_require__.bind(__webpack_require__, "./components/lazy-inner.tsx")),
                   requireAsync(props) {
                       return this.importAsync(props).then(resolved => resolved);
                   },
-                  resolve: () => /*require.resolve*/ "./src/library/swc/__integration__/components/lazy-inner.tsx"
+                  resolve: () => /*require.resolve*/ "./components/lazy-inner.tsx"
               }), Component = () => /*#__PURE__*/ /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.Fragment, {
                   children: [ 
                   /*#__PURE__*/
@@ -121,7 +121,7 @@ exports[`client: provider-stack.ts 1`] = `
                       /* binding */ return providers;
                   }
                   /* harmony export */              });
-              /* harmony import */ var _tramvai_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/library/swc/__integration__/mocks/tramvai-core.ts"), _create_token_pure__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/library/swc/__integration__/create-token-pure.ts");
+              /* harmony import */ var _tramvai_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./mocks/tramvai-core.ts"), _create_token_pure__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./create-token-pure.ts");
               /* harmony import */              const providers = [ (0, _tramvai_core__WEBPACK_IMPORTED_MODULE_0__ /* .provide */ .G)({
                   provide: _create_token_pure__WEBPACK_IMPORTED_MODULE_1__.TEST_TOKEN,
                   useValue: "test"
@@ -137,7 +137,7 @@ exports[`client: react-svg.tsx 1`] = `
                       /* binding */ return Component;
                   }
                   /* harmony export */              });
-              /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime"), _images_logo_svg_react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/library/swc/__integration__/images/logo.svg?react");
+              /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime"), _images_logo_svg_react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./images/logo.svg?react");
               /* harmony import */              const Component = () => /*#__PURE__*/ /*#__PURE__*/ (0, 
               react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("div", {
                   children: /*#__PURE__*/ /*#__PURE__*/ (0 /* ["default"] */ , react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_images_logo_svg_react__WEBPACK_IMPORTED_MODULE_1__.A, {})
@@ -153,7 +153,7 @@ exports[`client: server.inline.ts 1`] = `
                       /* binding */ return ForBrowser;
                   }
                   /* harmony export */              });
-              /* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_define_property.js");
+              /* harmony import */ var _swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("../../../../../../node_modules/@swc/helpers/esm/_define_property.js");
               class ForBrowser {
                   test() {
                       console.log("Ok");
@@ -189,7 +189,7 @@ exports[`server: create-token-pure.ts 1`] = `
                       /* binding */ return TEST_TOKEN;
                   }
                   /* harmony export */              });
-              const TEST_TOKEN = /*#__PURE__*/ /*#__PURE__*/ (0, __webpack_require__("./src/library/swc/__integration__/mocks/tramvai-core.ts").E)("TEST_TOKEN");
+              const TEST_TOKEN = /*#__PURE__*/ /*#__PURE__*/ (0, __webpack_require__("./mocks/tramvai-core.ts").E)("TEST_TOKEN");
               "
 `;
 
@@ -251,8 +251,8 @@ exports[`server: lazy-component.tsx 1`] = `
                       /* binding */ return Component;
                   }
                   /* harmony export */              });
-              /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime"), _swc_helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../node_modules/@swc/helpers/esm/_interop_require_wildcard.js");
-              /* harmony import */              const LazyComponent = (0, __webpack_require__("./src/library/swc/__integration__/mocks/tramvai-react.ts").R)({
+              /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime"), _swc_helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("../../../../../../node_modules/@swc/helpers/esm/_interop_require_wildcard.js");
+              /* harmony import */              const LazyComponent = (0, __webpack_require__("./mocks/tramvai-react.ts").R)({
                   chunkName() {
                       return "components-lazy-inner";
                   },
@@ -263,13 +263,13 @@ exports[`server: lazy-component.tsx 1`] = `
                       const key = this.resolve(props);
                       return !!__webpack_require__.m[key];
                   },
-                  importAsync: () => Promise.resolve().then(() => (0, _swc_helpers__WEBPACK_IMPORTED_MODULE_1__._)(__webpack_require__(/* webpackChunkName: "components-lazy-inner" */ "./src/library/swc/__integration__/components/lazy-inner.tsx"))),
+                  importAsync: () => Promise.resolve().then(() => (0, _swc_helpers__WEBPACK_IMPORTED_MODULE_1__._)(__webpack_require__(/* webpackChunkName: "components-lazy-inner" */ "./components/lazy-inner.tsx"))),
                   requireAsync(props) {
                       return this.importAsync(props).then(resolved => resolved);
                   },
                   resolve() {
                       /*require.resolve*/
-                      return "./src/library/swc/__integration__/components/lazy-inner.tsx";
+                      return "./components/lazy-inner.tsx";
                   }
               }), Component = () => /*#__PURE__*/ /*#__PURE__*/ (0, react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.Fragment, {
                   children: [ 
@@ -303,7 +303,7 @@ exports[`server: provider-stack.ts 1`] = `
                       /* binding */ return providers;
                   }
                   /* harmony export */              });
-              /* harmony import */ var _tramvai_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./src/library/swc/__integration__/mocks/tramvai-core.ts"), _create_token_pure__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/library/swc/__integration__/create-token-pure.ts");
+              /* harmony import */ var _tramvai_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./mocks/tramvai-core.ts"), _create_token_pure__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./create-token-pure.ts");
               /* harmony import */              const providers = [ (0, _tramvai_core__WEBPACK_IMPORTED_MODULE_0__ /* .provide */ .G)({
                   provide: _create_token_pure__WEBPACK_IMPORTED_MODULE_1__.TEST_TOKEN,
                   useValue: "test"
@@ -318,7 +318,7 @@ exports[`server: react-svg.tsx 1`] = `
                       /* binding */ return Component;
                   }
                   /* harmony export */              });
-              /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime"), _images_logo_svg_react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./src/library/swc/__integration__/images/logo.svg?react");
+              /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("webpack/sharing/consume/default/react/jsx-runtime/react/jsx-runtime"), _images_logo_svg_react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./images/logo.svg?react");
               /* harmony import */              const Component = () => /*#__PURE__*/ /*#__PURE__*/ (0, 
               react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("div", {
                   children: /*#__PURE__*/ /*#__PURE__*/ (0 /* ["default"] */ , react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_images_logo_svg_react__WEBPACK_IMPORTED_MODULE_1__.A, {})