Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: For making TS notebook in Windows #444

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fixed: For making TS notebook in Windows #444

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12aad4e
For building in the windows and linux
aakash-a-dev Nov 16, 2024
74eb95e
Worked on vite timestamp file that it doesn't include while committing.
aakash-a-dev Nov 17, 2024
b56165a
Done with the error
aakash-a-dev Nov 18, 2024
f6defd5
Worked on another solution rather than `pnpm`
aakash-a-dev Nov 19, 2024
361d230
Because Ci-Cd Pipelinr was broke
aakash-a-dev Nov 19, 2024
9241fa8
Linting fixed
aakash-a-dev Nov 19, 2024
5a241a4
Merge branch 'main' into windows-working
aakash-a-dev Nov 19, 2024
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ srcbook/lib/**/*

# Aide
*.code-workspace

vite.config.ts.timestamp-*.mjs
4 changes: 3 additions & 1 deletion packages/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"scripts": {
"dev": "vite-node -w dev-server.mts",
"test": "vitest",
"prebuild": "rm -rf ./dist",
"prebuild": "pnpm dlx rimraf ./dist",
"build": "tsc && cp -R ./drizzle ./dist/drizzle && cp -R ./srcbook/examples ./dist/srcbook/examples && cp -R ./prompts ./dist/prompts && cp -R ./apps/templates ./dist/apps/templates",
"lint": "eslint . --max-warnings 0",
"check-types": "tsc",
Expand Down Expand Up @@ -45,7 +45,9 @@
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/ws": "^8.5.12",
"cpx": "^1.5.0",
"drizzle-kit": "^0.24.2",
"rimraf": "^6.0.1",
"vite": "^5.4.4",
"vite-node": "^2.0.5",
"vitest": "^2.0.5"
Expand Down
3 changes: 2 additions & 1 deletion packages/api/tsserver/tsservers.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ export class TsServers {
// created, the dependencies are not installed and thus this will
// shut down immediately. Make sure that we handle this case after
// package.json has finished installing its deps.
const child = spawn('npx', ['tsserver'], {
const child = spawn('pnpm', ['dlx' ,'tsserver'], {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't want to do this, because pnpm is a dependency for dev, but not for users. This would require our users to have pnpm installed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ooo okay, I didn't think that way. I will look into this further. Thank you!

cwd: options.cwd,
shell: true
});

const server = new TsServer(child);
Expand Down
5 changes: 4 additions & 1 deletion packages/shared/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "module",
"main": "./dist/index.mjs",
"scripts": {
"prebuild": "rm -rf ./dist",
"prebuild": "rimraf ./dist",
"build": "tsc",
"dev": "tsc --incremental --watch --project .",
"lint": "eslint . --max-warnings 0",
Expand All @@ -14,5 +14,8 @@
"dependencies": {
"@scure/base": "^1.1.8",
"zod": "catalog:"
},
"devDependencies": {
"rimraf": "^6.0.1"
}
}
59 changes: 59 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.