diff --git a/app/utils/colors.ts b/app/utils/colors.ts index 5aa7fafd..d4adc882 100644 --- a/app/utils/colors.ts +++ b/app/utils/colors.ts @@ -20,7 +20,7 @@ const colorList = [ ]; export const getColorMap: { - (colors: T): T extends (infer U)[] ? { [k: string]: U } : T + (colors: T): T extends (infer U)[] ? {[k: string]: U} : T; } = colors => { if (!Array.isArray(colors)) { return colors; diff --git a/package.json b/package.json index 87783b17..a8950a94 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "start": "echo 'please run `yarn run dev` in one tab and then `yarn run app` in another one'", "app": "electron target", - "dev": "concurrently -n \"Webpack,TypeScript Compiler\" \"webpack -w\" \"tsc --pretty --watch --preserveWatchOutput\" -k", + "dev": "concurrently -n \"Webpack,TypeScript Compiler\" -c \"cyan.bold,blue.bold\" \"webpack -w\" \"tsc --pretty --watch --preserveWatchOutput\" -k", "build": "cross-env NODE_ENV=production webpack && tsc", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", "test": "yarn run lint && yarn run test:unit", @@ -14,8 +14,7 @@ "prepush": "yarn test", "postinstall": "webpack --config-name hyper-app && electron-builder install-app-deps && yarn run rebuild-node-pty && cp -r ./target/node_modules ./app/", "rebuild-node-pty": "electron-rebuild -f -w target/node_modules/node-pty -m target", - "dist": - "yarn run build && cross-env BABEL_ENV=production babel --out-file target/renderer/bundle.js --no-comments --minified target/renderer/bundle.js && build", + "dist": "yarn run build && cross-env BABEL_ENV=production babel --out-file target/renderer/bundle.js --no-comments --minified target/renderer/bundle.js && build", "clean": "node ./bin/rimraf-standalone.js node_modules && node ./bin/rimraf-standalone.js ./app/node_modules && node ./bin/rimraf-standalone.js ./app/renderer" }, "eslintConfig": { diff --git a/yarn.lock b/yarn.lock index 892f0c34..a814c48c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5417,7 +5417,7 @@ lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.4: +lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.4: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -7593,7 +7593,7 @@ rxjs@^5.5.2: dependencies: symbol-observable "1.0.1" -rxjs@^6.5.2: +rxjs@^6.4.0, rxjs@^6.5.2: version "6.5.3" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==