Skip to content

Commit 096d28e

Browse files
committed
move server folder into demo
1 parent adc47c3 commit 096d28e

12 files changed

+8
-9
lines changed

Diff for: .github/workflows/test.yml

-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,4 @@ jobs:
2323
lake --version
2424
- run: npm install
2525
- run: npm run build
26-
- run: npm run build_server
2726
- run: npm run test

Diff for: demo/package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: demo/package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
"version": "0.0.0",
55
"type": "module",
66
"scripts": {
7+
"postinstall": "cd server && npm install",
8+
"build_server": "cd server/LeanProject && lake build",
9+
"start_server": "cd server && npm start",
710
"start_client": "vite --host",
8-
"start_server": "cd ../server && npm start",
911
"start": "concurrently \"npm run start_client\" \"npm run start_server\" -n client,server -c \"bgBlue.bold,bgMagenta.bold\"",
10-
"build": "tsc -b && vite build",
12+
"build_client": "tsc -b && vite build",
13+
"build": "npm run build_client && npm run build_server",
1114
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
1215
"preview": "concurrently \"vite preview\" \"npm run start_server\" -n client,server -c \"bgBlue.bold,bgMagenta.bold\""
1316
},
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: server/index.mjs renamed to demo/server/index.mjs

File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: package.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
"url": "https://github.com/hhu-adam/lean4monaco"
1212
},
1313
"scripts": {
14-
"postinstall": "if [ -d \"server\" ]; then cd server && npm install; fi",
15-
"build_server": "cd server/LeanProject && lake build",
16-
"start_server": "cd server && npm start",
17-
"start": "concurrently \"tsc -w\" \"webpack --watch\" \"cd demo && npm run start_client\" \"npm run start_server\" -n tsc,webpack,vite,server -c \"bgGreen.bold,bgBlue.bold,bgYellow.bold,bgMagenta.bold\"",
14+
"start": "concurrently \"tsc -w\" \"webpack --watch\" \"cd demo && npm run start_client\" \"cd demo && npm run start_server\" -n tsc,webpack,vite,server -c \"bgGreen.bold,bgBlue.bold,bgYellow.bold,bgMagenta.bold\"",
1815
"build": "tsc && webpack && cd src && copyfiles \"**/*.json\" \"**/*.css\" \"**/*.ttf\" ../dist/",
19-
"test": "concurrently --kill-others \"cd demo && npm install && npm start\" \"wait-on http://localhost:5173 && cypress run\" -n server,cypress -s command-cypress"
16+
"test": "(cd demo && npm install && npm run build_server) && concurrently --kill-others \"npm start 1> /dev/null\" \"wait-on http://localhost:5173 && cypress run\" -n server,cypress -s command-cypress"
2017
},
2118
"devDependencies": {
2219
"@chialab/esbuild-plugin-meta-url": "^0.18.2",

0 commit comments

Comments
 (0)