Skip to content

Commit

Permalink
fix(dev tools): corrected dev tool setup (#1126)
Browse files Browse the repository at this point in the history
* fix(dev tools): corrected dev tool setup

On Windows running 'mv ...' doesn't work if the directory is opened with
VS Code at the same time. The only workaround is to use cp & rm.

npm start doesn't work with the NODE_ENV environment variable on
any of my machines.

tsconfig.json was updated by create-react-app

* refactor(development): run server & client concurrently

* fix(debug): limit debug log to lumi-namespace

* refactor(dev tools): reverted npm start, fixed npm format

* refactor(devtools): remove concurrently

* test(format): run format

Co-authored-by: JPSchellenberg <jps@Lumi.education>
  • Loading branch information
sr258 and JPSchellenberg committed Jan 5, 2021
1 parent 76258dd commit 99c6695
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitignore
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
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
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

0 comments on commit 99c6695

Please sign in to comment.