@ereactthohir/cli 1.2.1 ā 1.2.2
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.
package/dist/commands/create.js
CHANGED
|
@@ -238,8 +238,8 @@ DB_DRIVER=${answers.database.includes('sawit') ? 'sawit' : answers.database.toLo
|
|
|
238
238
|
}
|
|
239
239
|
// Write package.json
|
|
240
240
|
const dependencies = {
|
|
241
|
-
"@ereactthohir/core": "^1.2.
|
|
242
|
-
"@ereactthohir/rice-ui": "^1.2.
|
|
241
|
+
"@ereactthohir/core": "^1.2.2",
|
|
242
|
+
"@ereactthohir/rice-ui": "^1.2.2",
|
|
243
243
|
"react": "18.2.0",
|
|
244
244
|
"react-dom": "18.2.0"
|
|
245
245
|
};
|
|
@@ -251,7 +251,7 @@ DB_DRIVER=${answers.database.includes('sawit') ? 'sawit' : answers.database.toLo
|
|
|
251
251
|
Object.assign(dependencies, templateDependencies);
|
|
252
252
|
// Add Semouth dependencies if installed
|
|
253
253
|
if (answers.installSemouth) {
|
|
254
|
-
dependencies["@ereactthohir/semouth"] = "^1.2.
|
|
254
|
+
dependencies["@ereactthohir/semouth"] = "^1.2.2";
|
|
255
255
|
}
|
|
256
256
|
// Add UI configuration file if not using default Rice UI
|
|
257
257
|
if (answers.uiSystem !== 'Rice UI (default, official)') {
|
|
@@ -268,7 +268,7 @@ DB_DRIVER=${answers.database.includes('sawit') ? 'sawit' : answers.database.toLo
|
|
|
268
268
|
},
|
|
269
269
|
dependencies,
|
|
270
270
|
devDependencies: {
|
|
271
|
-
"@ereactthohir/cli": "^1.2.
|
|
271
|
+
"@ereactthohir/cli": "^1.2.2",
|
|
272
272
|
"typescript": "^5.0.0",
|
|
273
273
|
"@types/react": "^18.0.0",
|
|
274
274
|
"@types/react-dom": "^18.0.0",
|
|
@@ -363,9 +363,9 @@ export class RegisterController extends Controller {
|
|
|
363
363
|
}
|
|
364
364
|
`);
|
|
365
365
|
// Add auth routes
|
|
366
|
-
const authRoutesContent = `
|
|
367
|
-
import { LoginController } from '../Controllers/Auth/LoginController';
|
|
368
|
-
import { RegisterController } from '../Controllers/Auth/RegisterController';
|
|
366
|
+
const authRoutesContent = `
|
|
367
|
+
import { LoginController } from '../app/Controllers/Auth/LoginController';
|
|
368
|
+
import { RegisterController } from '../app/Controllers/Auth/RegisterController';
|
|
369
369
|
|
|
370
370
|
Route.group({ prefix: '/auth' }, () => {
|
|
371
371
|
Route.get('/login', [LoginController, 'showLoginForm']).name('login');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"AAsBA,wBAAsB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"AAsBA,wBAAsB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAqH3C"}
|
package/dist/commands/serve.js
CHANGED
|
@@ -31,6 +31,23 @@ async function serve() {
|
|
|
31
31
|
console.error(chalk_1.default.red('Error: You are not in an EreactThohir project root.'));
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
|
+
// Try to use the project's own core if available to avoid singleton conflicts
|
|
35
|
+
let ProjectRoute = core_1.Route;
|
|
36
|
+
let ProjectKernel = core_1.Kernel;
|
|
37
|
+
const projectCorePath = path_1.default.join(projectRoot, 'node_modules', '@ereactthohir', 'core');
|
|
38
|
+
if (fs_extra_1.default.existsSync(projectCorePath)) {
|
|
39
|
+
try {
|
|
40
|
+
const projectCore = require(projectCorePath);
|
|
41
|
+
if (projectCore.Route)
|
|
42
|
+
ProjectRoute = projectCore.Route;
|
|
43
|
+
if (projectCore.Kernel)
|
|
44
|
+
ProjectKernel = projectCore.Kernel;
|
|
45
|
+
console.log(chalk_1.default.gray(' Using project-local @ereactthohir/core'));
|
|
46
|
+
}
|
|
47
|
+
catch (e) {
|
|
48
|
+
// Fallback to CLI's core
|
|
49
|
+
}
|
|
50
|
+
}
|
|
34
51
|
console.log(chalk_1.default.cyan.bold('\nš EreactThohir Framework - Mode Jalan'));
|
|
35
52
|
console.log(chalk_1.default.gray('āāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāāā'));
|
|
36
53
|
console.log(chalk_1.default.blue('š± Menginisialisasi kernel...'));
|
|
@@ -48,7 +65,7 @@ async function serve() {
|
|
|
48
65
|
try {
|
|
49
66
|
console.log(chalk_1.default.blue('š Loading web routes...'));
|
|
50
67
|
console.log(chalk_1.default.gray(` File: ${webRoutesPath}`));
|
|
51
|
-
console.log(chalk_1.default.gray(` Routes before load: ${
|
|
68
|
+
console.log(chalk_1.default.gray(` Routes before load: ${ProjectRoute.getRoutes().length}`));
|
|
52
69
|
// Clear cache if exists
|
|
53
70
|
try {
|
|
54
71
|
delete require.cache[require.resolve(webRoutesPath)];
|
|
@@ -57,7 +74,7 @@ async function serve() {
|
|
|
57
74
|
// Ignore if not in cache
|
|
58
75
|
}
|
|
59
76
|
require(webRoutesPath);
|
|
60
|
-
console.log(chalk_1.default.gray(` Routes after load: ${
|
|
77
|
+
console.log(chalk_1.default.gray(` Routes after load: ${ProjectRoute.getRoutes().length}`));
|
|
61
78
|
console.log(chalk_1.default.green('ā Web routes loaded'));
|
|
62
79
|
}
|
|
63
80
|
catch (e) {
|
|
@@ -81,10 +98,10 @@ async function serve() {
|
|
|
81
98
|
console.error(chalk_1.default.red(`Failed to load api routes:`), e);
|
|
82
99
|
}
|
|
83
100
|
}
|
|
84
|
-
console.log(chalk_1.default.cyan(`š Total routes before Kernel: ${
|
|
85
|
-
const kernel = new
|
|
101
|
+
console.log(chalk_1.default.cyan(`š Total routes before Kernel: ${ProjectRoute.getRoutes().length}`));
|
|
102
|
+
const kernel = new ProjectKernel();
|
|
86
103
|
await kernel.handle();
|
|
87
|
-
console.log(chalk_1.default.cyan(`š Registered ${
|
|
104
|
+
console.log(chalk_1.default.cyan(`š Registered ${ProjectRoute.getRoutes().length} route(s)`));
|
|
88
105
|
const port = process.env.PORT ? parseInt(process.env.PORT) : 32026;
|
|
89
106
|
const server = kernel.listen(port, () => {
|
|
90
107
|
console.log(chalk_1.default.green(`\nā
Server Berhasil Dijalankan!`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":";;;;;AAsBA,
|
|
1
|
+
{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../src/commands/serve.ts"],"names":[],"mappings":"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"}
|