Skip to content

Commit 7634f94

Browse files
committed
feat: update TypeScript configuration to use CommonJS module system across packages
fix: update dependencies in mcp-server and core packages to latest versions refactor: modify exports in core exceptions and guards for better type management chore: add tsup configuration files for building packages feat: introduce unified version bumping script for lockstep versioning across packages chore: implement publish-all script for streamlined npm publishing process
1 parent c56bef4 commit 7634f94

File tree

29 files changed

+1616
-84
lines changed

29 files changed

+1616
-84
lines changed

package-lock.json

Lines changed: 690 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
"bench:requests": "npm run bench:requests --workspace=benchmarks",
2525
"bench:autocannon": "npm run bench:autocannon --workspace=benchmarks",
2626
"sync:version": "node scripts/sync-core-version.js",
27+
"bump": "node scripts/bump-version.js",
28+
"publish:all": "node scripts/publish-all.js",
29+
"publish:dry": "node scripts/publish-all.js --dry-run",
2730
"version:core": "npm version --workspace=@riktajs/core",
2831
"version:cli": "npm version --workspace=@riktajs/cli",
2932
"cli": "npm run --workspace=@riktajs/cli",
@@ -42,7 +45,9 @@
4245
"author": "",
4346
"license": "MIT",
4447
"devDependencies": {
48+
"@swc/core": "^1.15.11",
4549
"@types/node": "^22.10.2",
50+
"tsup": "^8.5.1",
4651
"typescript": "^5.7.2"
4752
},
4853
"engines": {

packages/cli/package.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
{
22
"name": "@riktajs/cli",
3-
"version": "0.3.3",
3+
"version": "0.10.4",
44
"description": "CLI tool for Rikta framework - scaffold, develop and build projects",
55
"type": "module",
6-
"main": "dist/index.js",
6+
"main": "dist/index.cjs",
7+
"module": "dist/index.js",
78
"types": "dist/index.d.ts",
89
"exports": {
910
".": {
10-
"import": "./dist/index.js",
11-
"types": "./dist/index.d.ts"
11+
"import": {
12+
"types": "./dist/index.d.ts",
13+
"default": "./dist/index.js"
14+
},
15+
"require": {
16+
"types": "./dist/index.d.cts",
17+
"default": "./dist/index.cjs"
18+
}
1219
}
1320
},
1421
"bin": {
@@ -21,7 +28,7 @@
2128
"scripts": {
2229
"clean": "rm -rf dist",
2330
"prebuild": "npm run clean",
24-
"build": "tsc",
31+
"build": "tsup",
2532
"test": "vitest run",
2633
"test:watch": "vitest",
2734
"test:coverage": "vitest run --coverage",

packages/cli/src/commands/new.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ export async function handleNew(
107107
logger.success('Target directory is available');
108108

109109
logger.step(3, 4, `Creating project from template '${template}'...`);
110-
const templateDir = path.resolve(__dirname, '../../templates', template);
110+
// When bundled with tsup, __dirname is 'dist/', so we go up one level to find 'templates/'
111+
const templateDir = path.resolve(__dirname, '../templates', template);
111112
logger.debug(`Template directory: ${templateDir}`);
112113

113114
if (!await fs.pathExists(templateDir)) {

packages/cli/templates/default/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "my-rikta-app",
33
"version": "0.1.0",
44
"description": "A Rikta application",
5-
"type": "module",
65
"main": "dist/index.js",
76
"scripts": {
87
"dev": "rikta dev",
@@ -18,10 +17,10 @@
1817
"author": "",
1918
"license": "MIT",
2019
"dependencies": {
21-
"@riktajs/core": "^0.10.1"
20+
"@riktajs/core": "^0.10.3"
2221
},
2322
"devDependencies": {
24-
"@riktajs/cli": "^0.3.3",
23+
"@riktajs/cli": "^0.10.4",
2524
"@types/node": "^22.10.2",
2625
"typescript": "^5.7.2"
2726
},

packages/cli/templates/default/src/controllers/app.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Autowired, Controller, Get, Query } from '@riktajs/core';
2-
import { GreetingService } from '../services/greeting.service.js';
2+
import { GreetingService } from '../services/greeting.service';
33

44
@Controller()
55
export class AppController {

packages/cli/templates/default/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"compilerOptions": {
33
"target": "ES2022",
44
"lib": ["ES2022"],
5-
"module": "NodeNext",
6-
"moduleResolution": "NodeNext",
5+
"module": "CommonJS",
6+
"moduleResolution": "Node",
77
"outDir": "dist",
88
"rootDir": "src",
99
"strict": true,

packages/cli/templates/mcp-server/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "my-rikta-mcp-server",
33
"version": "0.1.0",
44
"description": "A minimal MCP server built with Rikta",
5-
"type": "module",
65
"main": "dist/index.js",
76
"scripts": {
87
"dev": "rikta dev",
@@ -19,11 +18,11 @@
1918
"author": "",
2019
"license": "MIT",
2120
"dependencies": {
22-
"@riktajs/core": "^0.10.1",
23-
"@riktajs/mcp": "^0.4.1"
21+
"@riktajs/core": "^0.10.3",
22+
"@riktajs/mcp": "^0.10.3"
2423
},
2524
"devDependencies": {
26-
"@riktajs/cli": "^0.3.3",
25+
"@riktajs/cli": "^0.10.4",
2726
"@types/node": "^22.10.2",
2827
"typescript": "^5.7.2"
2928
},

packages/cli/templates/mcp-server/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"compilerOptions": {
33
"target": "ES2022",
44
"lib": ["ES2022"],
5-
"module": "NodeNext",
6-
"moduleResolution": "NodeNext",
5+
"module": "CommonJS",
6+
"moduleResolution": "Node",
77
"outDir": "dist",
88
"rootDir": "src",
99
"strict": true,

packages/cli/tsup.config.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { defineConfig } from 'tsup';
2+
3+
export default defineConfig({
4+
entry: ['src/index.ts'],
5+
format: ['esm', 'cjs'],
6+
dts: true,
7+
splitting: false,
8+
sourcemap: true,
9+
clean: true,
10+
outDir: 'dist',
11+
target: 'node20',
12+
shims: true,
13+
});

0 commit comments

Comments
 (0)