@tramvai/cli 4.25.0 → 4.26.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/bin/spawn.js +8 -1
  2. package/lib/library/webpack/loaders/pagesResolve.d.ts.map +1 -1
  3. package/lib/library/webpack/loaders/pagesResolve.js +8 -4
  4. package/lib/library/webpack/loaders/pagesResolve.js.map +1 -1
  5. package/package.json +2 -2
  6. package/src/library/webpack/loaders/pagesResolve.ts +9 -4
package/bin/spawn.js CHANGED
@@ -12,7 +12,7 @@ const paramsIndex = args.findIndex((x) => !x.startsWith('-'));
12
12
  const nodeArgs = paramsIndex > 0 ? args.slice(0, paramsIndex) : [];
13
13
 
14
14
  module.exports = function spawn(executePath) {
15
- const { status, signal } = spawnSync(
15
+ const { status, signal, error, stderr } = spawnSync(
16
16
  'node',
17
17
  defaultArgs
18
18
  .concat(nodeArgs)
@@ -24,6 +24,13 @@ module.exports = function spawn(executePath) {
24
24
  );
25
25
 
26
26
  if (signal) {
27
+ if (error) {
28
+ console.error('[spawn:error]', error);
29
+ }
30
+ if (stderr) {
31
+ console.error('[spawn:stderr]', typeof stderr === 'string' ? stderr : stderr.toString());
32
+ }
33
+
27
34
  throw new Error(`Process was exited with signal "${signal}"
28
35
  It's unexpected, please check available/used memory and cpu while running last command`);
29
36
  }
package/lib/library/webpack/loaders/pagesResolve.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pagesResolve.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/loaders/pagesResolve.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAM3D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;CAC5D;AA2BD,QAAA,MAAM,YAAY,EAAE,wBAAwB,CAAC,mBAAmB,CAgI/D,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"pagesResolve.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/loaders/pagesResolve.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAM3D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,eAAe,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;CAC5D;AAgCD,QAAA,MAAM,YAAY,EAAE,wBAAwB,CAAC,mBAAmB,CAgI/D,CAAC;AAEF,eAAe,YAAY,CAAC"}
package/lib/library/webpack/loaders/pagesResolve.js CHANGED
@@ -10,6 +10,10 @@ const removeExtension = (filename) => {
10
10
  const parsed = path_1.default.parse(filename);
11
11
  return path_1.default.join(parsed.dir, parsed.name);
12
12
  };
13
+ // fixing issue with absolute path imports on Windows
14
+ const normalizePath = (pathToNormalize) => {
15
+ return pathToNormalize.replace(/\\/g, '\\\\');
16
+ };
13
17
  const readdirAsync = (dir, prefix = '', filelist = [], filter = (file) => true) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
14
18
  const files = yield fs_1.default.promises.readdir(dir).catch(() => []);
15
19
  for (const file of files) {
@@ -47,7 +51,7 @@ const pagesResolve = function () {
47
51
  if (test.test(normalizedFile)) {
48
52
  const name = normalizedFile.replace(new RegExp(`\\${extname}$`), '');
49
53
  const pageComponentName = `@/${pagesRootDirectory}/${name}`;
50
- const pageComponentPath = path_1.default.resolve(pagesDir, name).replace(/\\/g, '\\\\');
54
+ const pageComponentPath = normalizePath(path_1.default.resolve(pagesDir, name));
51
55
  const chunkname = pageComponentName.replace(/\//g, '_');
52
56
  // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage" */ '/tramvai-app/src/pages/MainPage'))
53
57
  fsPages.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}" */ '${pageComponentPath}'))`);
@@ -60,18 +64,18 @@ const pagesResolve = function () {
60
64
  .map((item) => item.name);
61
65
  const wildcardPath = routeContent.find((item) => item.includes(WILDCARD_TOKEN));
62
66
  if (fs_1.default.existsSync(layoutPath)) {
63
- const filename = removeExtension(layoutPath);
67
+ const filename = normalizePath(removeExtension(layoutPath));
64
68
  // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__layout" */ '/tramvai-app/src/pages/MainPage_layout'))
65
69
  fsLayouts.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__layout" */ '${filename}'))`);
66
70
  }
67
71
  if (fs_1.default.existsSync(errorBoundaryPath)) {
68
- const filename = removeExtension(errorBoundaryPath);
72
+ const filename = normalizePath(removeExtension(errorBoundaryPath));
69
73
  // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__errorBoundary" */ '/tramvai-app/src/pages/MainPage_errorBoundary'))
70
74
  fsErrorBoundaries.push(`'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__errorBoundary" */ '${filename}'))`);
71
75
  }
72
76
  if (wildcardPath !== undefined) {
73
77
  const componentName = `${pageComponentName}__wildcard`;
74
- const filename = removeExtension(path_1.default.join(pageDirname, wildcardPath));
78
+ const filename = normalizePath(removeExtension(path_1.default.join(pageDirname, wildcardPath)));
75
79
  // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__wildcard" */ '/tramvai-app/src/pages/MainPage_wildcard'))
76
80
  fsWildcards.push(`'${componentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__wildcard" */ '${filename}'))`);
77
81
  }
package/lib/library/webpack/loaders/pagesResolve.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pagesResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/loaders/pagesResolve.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pagesResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/loaders/pagesResolve.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tramvai/cli",
3
- "version": "4.25.0",
3
+ "version": "4.26.0",
4
4
  "description": "Cli инструмент для сборки и запуска приложений",
5
5
  "files": [
6
6
  "src",
@@ -72,7 +72,7 @@
72
72
  "@tinkoff/utils": "^2.1.3",
73
73
  "@tinkoff/webpack-dedupe-plugin": "3.0.1",
74
74
  "@tramvai/build": "5.0.3",
75
- "@tramvai/react": "4.25.0",
75
+ "@tramvai/react": "4.26.0",
76
76
  "@tramvai/tools-check-versions": "0.6.4",
77
77
  "@tramvai/tools-migrate": "0.8.4",
78
78
  "ajv": "^8.12.0",
package/src/library/webpack/loaders/pagesResolve.ts CHANGED
@@ -20,6 +20,11 @@ const removeExtension = (filename: string): string => {
20
20
  return path.join(parsed.dir, parsed.name);
21
21
  };
22
22
 
23
+ // fixing issue with absolute path imports on Windows
24
+ const normalizePath = (pathToNormalize: string) => {
25
+ return pathToNormalize.replace(/\\/g, '\\\\');
26
+ };
27
+
23
28
  const readdirAsync = async (dir, prefix = '', filelist = [], filter = (file: string) => true) => {
24
29
  const files = await fs.promises.readdir(dir).catch(() => []);
25
30
 
@@ -78,7 +83,7 @@ const pagesResolve: LoaderDefinitionFunction<PagesResolveOptions> = async functi
78
83
  if (test.test(normalizedFile)) {
79
84
  const name = normalizedFile.replace(new RegExp(`\\${extname}$`), '');
80
85
  const pageComponentName = `@/${pagesRootDirectory}/${name}`;
81
- const pageComponentPath = path.resolve(pagesDir, name).replace(/\\/g, '\\\\');
86
+ const pageComponentPath = normalizePath(path.resolve(pagesDir, name));
82
87
  const chunkname = pageComponentName.replace(/\//g, '_');
83
88
 
84
89
  // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage" */ '/tramvai-app/src/pages/MainPage'))
@@ -98,7 +103,7 @@ const pagesResolve: LoaderDefinitionFunction<PagesResolveOptions> = async functi
98
103
  const wildcardPath = routeContent.find((item) => item.includes(WILDCARD_TOKEN));
99
104
 
100
105
  if (fs.existsSync(layoutPath)) {
101
- const filename = removeExtension(layoutPath);
106
+ const filename = normalizePath(removeExtension(layoutPath));
102
107
  // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__layout" */ '/tramvai-app/src/pages/MainPage_layout'))
103
108
  fsLayouts.push(
104
109
  `'${pageComponentName}': lazy(() => import(/* webpackChunkName: "${chunkname}__layout" */ '${filename}'))`
@@ -106,7 +111,7 @@ const pagesResolve: LoaderDefinitionFunction<PagesResolveOptions> = async functi
106
111
  }
107
112
 
108
113
  if (fs.existsSync(errorBoundaryPath)) {
109
- const filename = removeExtension(errorBoundaryPath);
114
+ const filename = normalizePath(removeExtension(errorBoundaryPath));
110
115
 
111
116
  // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__errorBoundary" */ '/tramvai-app/src/pages/MainPage_errorBoundary'))
112
117
  fsErrorBoundaries.push(
@@ -116,7 +121,7 @@ const pagesResolve: LoaderDefinitionFunction<PagesResolveOptions> = async functi
116
121
 
117
122
  if (wildcardPath !== undefined) {
118
123
  const componentName = `${pageComponentName}__wildcard`;
119
- const filename = removeExtension(path.join(pageDirname, wildcardPath));
124
+ const filename = normalizePath(removeExtension(path.join(pageDirname, wildcardPath)));
120
125
 
121
126
  // @example '@/pages/MainPage': lazy(() => import(/* webpackChunkName: "@_pages_MainPage__wildcard" */ '/tramvai-app/src/pages/MainPage_wildcard'))
122
127
  fsWildcards.push(