Fix yarn dev script

This commit is contained in:
Alice Gaudon 2020-11-03 17:26:32 +01:00
parent a4df579937
commit 04f19f5a28
2 changed files with 5 additions and 5 deletions

View File

@ -5,15 +5,15 @@
"repository": "https://gitlab.com/ArisuOngaku/wms-boilerplate", "repository": "https://gitlab.com/ArisuOngaku/wms-boilerplate",
"author": "Alice Gaudon <alice@gaudon.pro>", "author": "Alice Gaudon <alice@gaudon.pro>",
"private": true, "private": true,
"main": "dist/main.js", "main": "dist/src/main.js",
"scripts": { "scripts": {
"dist-webpack": "webpack --mode production", "dist-webpack": "webpack --mode production",
"clean": "(test ! -d dist || rm -r dist)", "clean": "(test ! -d dist || rm -r dist)",
"compile": "yarn clean && tsc && mv dist/src/* dist/", "compile": "yarn clean && tsc",
"build": "yarn compile && yarn dist-webpack", "build": "yarn compile && yarn dist-webpack",
"lint": "eslint . --ext .js,.jsx,.ts,.tsx", "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
"dev": "concurrently -k -n \"Typescript,Node,Webpack,Maildev\" -p \"[{name}]\" -c \"blue,green,red,yellow\" \"tsc --watch\" \"nodemon\" \"webpack --watch --mode development\" \"maildev\"", "dev": "concurrently -k -n \"Typescript,Node,Webpack,Maildev\" -p \"[{name}]\" -c \"blue,green,red,yellow\" \"tsc --watch\" \"nodemon\" \"webpack --watch --mode development\" \"maildev\"",
"start": "yarn build && node dist/main.js", "start": "yarn build && node dist/src/main.js",
"test": "jest --verbose --runInBand" "test": "jest --verbose --runInBand"
}, },
"devDependencies": { "devDependencies": {

View File

@ -2,9 +2,9 @@ import {delimiter} from "path";
// Load config from specified path or default + wms-core/config (default defaults) // Load config from specified path or default + wms-core/config (default defaults)
process.env['NODE_CONFIG_DIR'] = process.env['NODE_CONFIG_DIR'] =
__dirname + '/../node_modules/wms-core/config/' __dirname + '/../../node_modules/wms-core/config/'
+ delimiter + delimiter
+ (process.env['NODE_CONFIG_DIR'] || __dirname + '/../config/'); + (process.env['NODE_CONFIG_DIR'] || __dirname + '/../../config/');
import {log} from "wms-core/Logger"; import {log} from "wms-core/Logger";
import App from "./App"; import App from "./App";