5htp 0.4.3-1 → 0.4.3-3

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 (2) hide show
  1. package/package.json +5 -5
  2. package/src/compiler/common/babel/routes/imports.ts +8 -10
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "5htp",
3
3
  "description": "Convenient TypeScript framework designed for Performance and Productivity.",
4
- "version": "0.4.3-1",
4
+ "version": "0.4.3-3",
5
5
  "author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
6
6
  "repository": "git://github.com/gaetanlegac/5htp.git",
7
7
  "license": "MIT",
@@ -40,9 +40,10 @@
40
40
  "@types/webpack-env": "^1.16.2",
41
41
  "@types/ws": "^7.4.7",
42
42
  "babel-loader": "^8.2.2",
43
- "babel-plugin-glob-import": "^0.0.8-1",
43
+ "babel-plugin-glob-import": "^0.0.9",
44
44
  "babel-plugin-transform-imports": "^2.0.0",
45
45
  "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
46
+ "babel-plugin-transform-remove-console": "^6.9.4",
46
47
  "brotli-webpack-plugin": "^1.1.0",
47
48
  "browser-sync": "^2.27.5",
48
49
  "compression-webpack-plugin": "^8.0.1",
@@ -73,6 +74,7 @@
73
74
  "ts-alias": "^0.0.7",
74
75
  "ts-node": "^10.9.1",
75
76
  "webfont": "^11.2.26",
77
+ "webpack": "^5.89.0",
76
78
  "webpack-assets-manifest": "^5.0.6",
77
79
  "webpack-bundle-analyzer": "^4.4.2",
78
80
  "webpack-dev-middleware": "^5.1.0",
@@ -87,8 +89,6 @@
87
89
  "@types/node": "^16.9.1",
88
90
  "@types/nodemailer": "^6.4.4",
89
91
  "@types/prompts": "^2.0.14",
90
- "@types/webpack-env": "^1.16.2",
91
- "babel-plugin-transform-remove-console": "^6.9.4",
92
- "webpack": "^5.89.0"
92
+ "@types/webpack-env": "^1.16.2"
93
93
  }
94
94
  }
package/src/compiler/common/babel/routes/imports.ts CHANGED
@@ -6,6 +6,7 @@
6
6
  import type { ImportTransformer } from 'babel-plugin-glob-import';
7
7
  import * as types from '@babel/types'
8
8
  import path from 'path';
9
+ import generate from '@babel/generator';
9
10
 
10
11
  // Core
11
12
  import cli from '@cli';
@@ -32,9 +33,9 @@ module.exports = (app: App, side: TAppSide, dev: boolean): ImportTransformer =>
32
33
  side === 'client'
33
34
  &&
34
35
  (
35
- request.source === '@/client/pages/**/*.tsx'
36
+ request.source === '@client/pages/**/([a-z0-9]*).tsx'
36
37
  ||
37
- request.source === '@client/pages/**/*.tsx'
38
+ request.source === '@/client/pages/**/([a-z0-9]*).tsx'
38
39
  )
39
40
  &&
40
41
  request.type === 'import'
@@ -59,14 +60,6 @@ module.exports = (app: App, side: TAppSide, dev: boolean): ImportTransformer =>
59
60
  //console.log("Exclude", file, 'from pages loaders (its a layout)');
60
61
  continue;
61
62
  }
62
-
63
- // Excliude components
64
- const filename = path.basename( file.filename );
65
- const startsWithUppercase = alphabet.includes(filename[0]) && filename[0] === filename[0].toUpperCase();
66
- if (startsWithUppercase) {
67
- //console.log("Exclude", file, 'from pages loaders (its a component)');
68
- continue;
69
- }
70
63
 
71
64
  // Page config
72
65
  const { chunkId } = cli.paths.getPageChunk(app, file.filename);
@@ -115,6 +108,11 @@ module.exports = (app: App, side: TAppSide, dev: boolean): ImportTransformer =>
115
108
  )
116
109
  }
117
110
  }
111
+
112
+ console.log( generate(t.variableDeclaration("const", [t.variableDeclarator(
113
+ t.identifier(request.imported.name),
114
+ t.objectExpression(pageLoaders)
115
+ )])).code );
118
116
 
119
117
  return [
120
118
  ...imports,