5htp 0.6.1 → 0.6.2-5

package/app/index.ts

@@ -51,6 +51,8 @@ export class App {
 
     public packageJson: {[key: string]: any};
 
+    public buildId: number = Date.now();
+
     public paths = {
 
         root: cli.paths.appRoot,
@@ -67,7 +69,10 @@ export class App {
             generated: path.join( cli.paths.appRoot, 'server', '.generated'),
             configs: path.join( cli.paths.appRoot, 'server', 'app')
         },
-
+        common: {
+            generated: path.join( cli.paths.appRoot, 'common', '.generated')
+        },
+        
         withAlias: (filename: string, side: TAppSide) => 
             this.aliases[side].apply(filename),
 

package/compiler/client/index.ts

@@ -27,7 +27,7 @@ import identityAssets from './identite';
 import cli from '../..';
 
 // Type
-import type App from '../../app';
+import type { App } from '../../app';
 
 const debug = false;
 

package/compiler/common/index.ts

@@ -41,10 +41,13 @@ export type TCompileMode = 'dev' | 'prod'
 - BASE CONFIG
 ----------------------------------*/
 
-export default function createCommonConfig( app: App, side: TAppSide, mode: TCompileMode ): webpack.Configuration {
+export default function createCommonConfig( 
+    app: App, 
+    side: TAppSide, 
+    mode: TCompileMode,
+): webpack.Configuration {
 
     const dev = mode === 'dev';
-    const buildId = Date.now();
     const config: webpack.Configuration = {
 
         // Project root
@@ -79,14 +82,14 @@ export default function createCommonConfig( app: App, side: TAppSide, mode: TCom
 
                 // Application
                 BUILD_DATE: JSON.stringify(dayjs().format('YY.MM.DD-HH.mm')),
-                BUILD_ID: JSON.stringify(buildId),
+                BUILD_ID: JSON.stringify(app.buildId),
                 APP_PATH: JSON.stringify(app.paths.root),
                 APP_NAME: JSON.stringify(app.identity.web.title),
 
             }),
 
             new PluginIndexage(side === 'client' ? {
-                'icones-svg': new IconesSvg(app, buildId),
+                'icones-svg': new IconesSvg(app),
             } : {
                 //'injection-dependances': new InjectDeps,
             }),

package/compiler/common/plugins/indexage/icones-svg/index.ts

@@ -34,7 +34,7 @@ export default class IconesSVG extends Indexeur {
     private cacheTypes: string;
     private cacheIndex: string;
 
-    public constructor( app: App, private buildId: number, private debug?: boolean ) {
+    public constructor( private app: App, private debug?: boolean ) {
         super();
 
         this.formats = ['woff2'];
@@ -182,7 +182,7 @@ export default class IconesSVG extends Indexeur {
         // Enregistrement fichiers
         for (const format of this.formats)
             fs.outputFileSync(this.dossierSortie + 'icons.' + format, result[ format ]);
-        fs.outputFileSync(this.dossierSortie + 'icons.css', result.template?.replace('icons.woff2', 'icons.woff2?' + this.buildId));
+        fs.outputFileSync(this.dossierSortie + 'icons.css', result.template?.replace('icons.woff2', 'icons.woff2?' + this.app.buildId));
 
         fs.outputFileSync(this.cacheTypes, 'export type TIcones = ' + typeIcones.join('|') );
 

package/compiler/index.ts

@@ -267,7 +267,7 @@ export default class Compiler {
         const appClassIdentifier = app.identity.identifier;
         const containerServices = app.containerServices.map( s => "'" + s + "'").join('|');
 
-        // Output the services index
+        // @/client/.generated/services.d.ts
         fs.outputFileSync(
             path.join( app.paths.client.generated, 'services.d.ts'),
 `declare module "@app" {
@@ -303,6 +303,7 @@ declare namespace preact.JSX {
 `
         );
 
+        // @/client/.generated/context.ts
         fs.outputFileSync(
             path.join( app.paths.client.generated, 'context.ts'),
 `// TODO: move it into core (but how to make sure usecontext returns ${appClassIdentifier}'s context ?)
@@ -333,6 +334,15 @@ export type ClientContext = (
 export const ReactClientContext = React.createContext<ClientContext>({} as ClientContext);
 export default (): ClientContext => React.useContext<ClientContext>(ReactClientContext);`);
 
+        // @/common/.generated/services.d.ts
+        fs.outputFileSync(
+            path.join( app.paths.common.generated, 'services.d.ts'),
+`declare module '@models/types' {
+    export * from '@/var/prisma/index';
+}`
+        );
+
+        // @/server/.generated/app.ts
         fs.outputFileSync(
             path.join( app.paths.server.generated, 'app.ts'),
 `import { Application } from '@server/app/index';
@@ -359,6 +369,7 @@ export default class ${appClassIdentifier} extends Application {
 
 `);
 
+        // @/server/.generated/services.d.ts
         fs.outputFileSync(
             path.join( app.paths.server.generated, 'services.d.ts'),
 `type InstalledServices = import('./services').Services;

package/compiler/server/index.ts

@@ -15,7 +15,7 @@ import cli from '@cli';
 import createCommonConfig, { TCompileMode, regex } from '../common';
 
 // Type
-import type App from '../../app';
+import type { App } from '../../app';
 
 /*const getCorePluginsList = (app: App,) => {
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.1",
+	"version": "0.6.2-5",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",
@@ -54,7 +54,10 @@
 		"dayjs": "^1.11.5",
 		"favicons": "^7.2.0",
 		"filesize": "^8.0.3",
+		"image-minimizer-webpack-plugin": "^4.1.4",
+		"imagemin": "^9.0.1",
 		"imagemin-svgo": "^10.0.0",
+		"imagemin-webp": "^6.0.0",
 		"json5": "^2.2.0",
 		"less-loader": "^10.0.1",
 		"less-vars-to-js": "^1.3.0",
@@ -67,7 +70,9 @@
 		"prompts": "^2.4.2",
 		"react-dev-utils": "^11.0.4",
 		"replace-once": "^1.0.0",
+		"responsive-loader": "^3.1.2",
 		"serialize-javascript": "^6.0.2",
+		"sharp": "^0.34.3",
 		"speed-measure-webpack-plugin": "^1.5.0",
 		"terser-webpack-plugin": "^5.2.4",
 		"ts-alias": "^0.0.7",
@@ -88,11 +93,6 @@
 		"@types/node": "^16.9.1",
 		"@types/nodemailer": "^6.4.4",
 		"@types/prompts": "^2.0.14",
-		"@types/webpack-env": "^1.16.2",
-		"image-minimizer-webpack-plugin": "^4.1.4",
-		"imagemin": "^9.0.1",
-		"imagemin-webp": "^6.0.0",
-		"responsive-loader": "^3.1.2",
-		"sharp": "^0.34.3"
+		"@types/webpack-env": "^1.16.2"
 	}
 }