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

Jump to bottom

fix(dev tools): corrected dev tool setup #1126

Merged
merged 8 commits into from
Jan 5, 2021
Merged

fix(dev tools): corrected dev tool setup #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2f602df
fix(dev tools): corrected dev tool setup
sr258 Jan 5, 2021
b459884
refactor(development): run server & client concurrently
JPSchellenberg Jan 5, 2021
c2cb176
fix(debug): limit debug log to lumi-namespace
JPSchellenberg Jan 5, 2021
4dc980f
refactor(dev tools): reverted npm start, fixed npm format
sr258 Jan 5, 2021
11c5381
Merge branch 'fix/dev-tools' of github.com:Lumieducation/Lumi into fi…
sr258 Jan 5, 2021
47367fc
refactor(devtools): remove concurrently
JPSchellenberg Jan 5, 2021
7f66fa0
test(format): run format
JPSchellenberg Jan 5, 2021
9e5ec35
Merge branch 'master' into fix/dev-tools
JPSchellenberg Jan 5, 2021
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ data/
.DS_Store
microsoft.gpg

# dev artifacts
.eslintcache

# Dependency directory
node_modules
/h5p
2 changes: 1 addition & 1 deletion client/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react"
"jsx": "react-jsx"
},
"include": [
"src"
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"build": "npm run build:server && npm run build:client",
"build:all": "npm run build && ./node_modules/.bin/electron-builder --config builder.config.js --mac --win --linux --publish never",
"build:all:dev": "CSC_IDENTITY_AUTO_DISCOVERY=false npm run build:all",
"build:client": "npm run build --prefix client && mv client/build build/client",
"build:client": "npm run build --prefix client && cp -r client/build build/client && rm -rf client/build",
"build:linux": "npm run build && ./node_modules/.bin/electron-builder --config builder.config.js --linux --publish never",
"build:mac": "npm run build && ./node_modules/.bin/electron-builder --config builder.config.js --mac --publish never",
"build:mac:dev": "CSC_IDENTITY_AUTO_DISCOVERY=false npm run build:mac",
Expand All @@ -35,14 +35,14 @@
"build:win": "npm run build && cp -r electron/assets/appx build && npx --no-install electron-builder --config builder.config.js --win --publish never && rm -rf build/appx",
"ci": "npm run lint && npm run format:check && npm run build && npm run test",
"clean": "rm -rf build/",
"format": "npx prettier --write \"{server,client,test}/**/*.(ts|tsx)\"",
"format:check": "npx prettier --check \"{server,client,test}/**/*.(ts|tsx)\"",
"format": "npx prettier --write \"{server,client,test}/**/*.{ts,tsx}\"",
"format:check": "npx prettier --check \"{server,client,test}/**/*.{ts,tsx}\"",
"lint": "./node_modules/.bin/tslint --project tsconfig.json --config tslint.json",
"publish:mac": "npx --no-install electron-builder --config builder.config.js --mac --publish always",
"publish:win": "cp -r electron/assets/appx build && npx --no-install electron-builder --config builder.config.js --win --publish always && rm -rf build/appx",
"build:linux:dev": "CSC_IDENTITY_AUTO_DISCOVERY=false npm run build:linux",
"publish:linux": "npx --no-install electron-builder --config builder.config.js --linux --publish always",
"start": "DEBUG=* PORT=8080 NODE_ENV=development ./node_modules/.bin/electron .",
"start": "NODE_ENV=development DEBUG=lumi:* PORT=8080 ./node_modules/.bin/electron",
"test": "jest",
"test:watch": "jest --watch",
"test:mac": "npx jest --config jest.mac.config.js",
Expand Down