Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/dist/**
pnpm-lock.yaml
8 changes: 4 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
"**/.DS_Store": true
},
"mdx.validate.validateFileLinks": "ignore",
"editor.defaultFormatter": "oxc.oxc-vscode",
"editor.defaultFormatter": "esbenp.prettier-vscode",
"js/ts.tsdk.path": "node_modules/typescript/lib",
"[typescript]": {
"editor.defaultFormatter": "oxc.oxc-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "oxc.oxc-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[mdx]": {
"editor.defaultFormatter": "oxc.oxc-vscode"
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
2 changes: 1 addition & 1 deletion AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

- Use repo Node.js/pnpm versions (`package.json`)
- `pnpm` workspace; shared deps in `pnpm-workspace.yaml` catalogs
- TypeScript, Rsbuild/Rslib/Rstest/Rslint, Oxfmt
- TypeScript, Rsbuild/Rslib/Rstest/Rslint, Prettier

## Commands

Expand Down
4 changes: 2 additions & 2 deletions examples/app-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"build": "rs build",
"dev": "rs dev",
"lint": "rs lint",
"test": "rs test",
"preview": "rs preview"
"preview": "rs preview",
"test": "rs test"
},
"dependencies": {
"react": "catalog:",
Expand Down
4 changes: 2 additions & 2 deletions examples/app-vanilla/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"build": "rs build",
"dev": "rs dev",
"lint": "rs lint",
"test": "rs test",
"preview": "rs preview"
"preview": "rs preview",
"test": "rs test"
},
"devDependencies": {
"@testing-library/dom": "catalog:",
Expand Down
8 changes: 4 additions & 4 deletions examples/lib-node/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "@examples/lib-node",
"private": true,
"files": [
"dist"
],
"type": "module",
"types": "./dist/index.d.ts",
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.js"
}
},
"types": "./dist/index.d.ts",
"files": [
"dist"
],
"scripts": {
"build": "rs lib",
"dev": "rs lib -w",
Expand Down
8 changes: 4 additions & 4 deletions examples/lib-react/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "@examples/lib-react",
"private": true,
"files": [
"dist"
],
"type": "module",
"types": "./dist/index.d.ts",
"exports": {
".": {
"types": "./dist/index.d.ts",
"import": "./dist/index.js"
}
},
"types": "./dist/index.d.ts",
"files": [
"dist"
],
"scripts": {
"build": "rs lib",
"dev": "rs lib -w",
Expand Down
6 changes: 0 additions & 6 deletions oxfmt.config.ts

This file was deleted.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"name": "rstack-monorepo",
"private": true,
"license": "MIT",
"repository": "https://github.com/rstackjs/rstack-cli",
"license": "MIT",
"type": "module",
"scripts": {
"build": "pnpm --filter './packages/**' build",
"check:format": "oxfmt . --check",
"check:format": "prettier . --check --experimental-cli",
"check:spell": "pnpm dlx cspell && heading-case",
"doc": "pnpm --dir website dev",
"doc:build": "node --run build && pnpm --dir website build",
"format": "oxfmt . && heading-case --write",
"format": "prettier . --write --experimental-cli && heading-case --write",
"lint": "rs lint --type-check",
"prepare": "node scripts/rs.js setup",
"test": "pnpm --filter './packages/**' test"
Expand All @@ -19,7 +19,8 @@
"@types/node": "catalog:",
"cspell-ban-words": "catalog:",
"heading-case": "catalog:",
"oxfmt": "catalog:",
"prettier": "catalog:",
"prettier-plugin-packagejson": "catalog:",
"rstack": "workspace:*",
"typescript": "catalog:"
},
Expand Down
30 changes: 15 additions & 15 deletions packages/rstack/package.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
{
"name": "rstack",
"version": "0.2.0",
"license": "MIT",
"repository": "https://github.com/rstackjs/rstack-cli",
"bin": {
"rs": "./bin/rs.js",
"rstack": "./bin/rs.js"
},
"files": [
"bin",
"dist",
"types",
"THIRD_PARTY_NOTICES.md"
],
"license": "MIT",
"type": "module",
"types": "./dist/index.d.ts",
"exports": {
".": {
"types": "./dist/index.d.ts",
Expand Down Expand Up @@ -47,10 +36,17 @@
},
"./package.json": "./package.json"
},
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org/"
"types": "./dist/index.d.ts",
"bin": {
"rs": "./bin/rs.js",
"rstack": "./bin/rs.js"
},
"files": [
"bin",
"dist",
"types",
"THIRD_PARTY_NOTICES.md"
],
"scripts": {
"build": "rslib",
"dev": "rslib -w",
Expand Down Expand Up @@ -84,5 +80,9 @@
},
"engines": {
"node": ">=22.12.0"
},
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org/"
}
}
5 changes: 1 addition & 4 deletions packages/rstack/src/staged.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ export type StagedFunctionTask = {
};

export type StagedTask =
| string
| StagedFunctionTask
| StagedTaskGenerator
| (string | StagedTaskGenerator)[];
string | StagedFunctionTask | StagedTaskGenerator | (string | StagedTaskGenerator)[];
Comment thread
chenjiahan marked this conversation as resolved.

export type StagedConfig = Record<string, StagedTask> | StagedTaskGenerator;

Expand Down
Loading