development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-02 22:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update prettier

Browse source
This commit is contained in:
iAmWillShepherd 2018-01-10 09:35:07 -06:00
parent 8099f66788
commit 97ed6d8c40
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
package.json
View file

@ -5,32 +5,43 @@
},
"description": "GitHub Desktop build dependencies",
"scripts": {
"cli": "ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.js app/src/cli/main.ts",
"test:integration": "cross-env TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe mocha -t 30000 --require ts-node/register app/test/integration/*.ts",
"test:unit": "cross-env GIT_AUTHOR_NAME=\"Joe Bloggs\" GIT_AUTHOR_EMAIL=\"joe.bloggs@somewhere.com\" GIT_COMMITTER_NAME=\"Joe Bloggs\" GIT_COMMITTER_EMAIL=\"joe.bloggs@somewhere.com\" TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe electron-mocha -t 10000 --renderer --require ts-node/register --require ./app/test/globals.ts app/test/unit/*.{ts,tsx} app/test/unit/**/*.{ts,tsx}",
"cli":
"ts-node --require ./app/test/globals.ts --require ./app/src/cli/dev-commands-global.js app/src/cli/main.ts",
"test:integration":
"cross-env TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe mocha -t 30000 --require ts-node/register app/test/integration/*.ts",
"test:unit":
"cross-env GIT_AUTHOR_NAME=\"Joe Bloggs\" GIT_AUTHOR_EMAIL=\"joe.bloggs@somewhere.com\" GIT_COMMITTER_NAME=\"Joe Bloggs\" GIT_COMMITTER_EMAIL=\"joe.bloggs@somewhere.com\" TEST_ENV=1 ELECTRON_NO_ATTACH_CONSOLE=1 xvfb-maybe electron-mocha -t 10000 --renderer --require ts-node/register --require ./app/test/globals.ts app/test/unit/*.{ts,tsx} app/test/unit/**/*.{ts,tsx}",
"test": "yarn test:unit && yarn test:integration",
"test:setup": "ts-node script/test-setup.ts",
"test:review": "ts-node script/test-review.ts",
"postinstall": "cd app && yarn install --force && cd .. && git submodule update --recursive --init && yarn compile:tslint",
"postinstall":
"cd app && yarn install --force && cd .. && git submodule update --recursive --init && yarn compile:tslint",
"start": "cross-env NODE_ENV=development node script/start",
"start:prod": "cross-env NODE_ENV=production node script/start",
"debug": "cross-env NODE_ENV=development node script/debug",
"compile:dev": "cross-env NODE_ENV=development parallel-webpack --config app/webpack.development.js",
"compile:prod": "cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.js",
"build:dev": "yarn compile:dev && cross-env NODE_ENV=development ts-node script/build.ts",
"build:prod": "yarn compile:prod && cross-env NODE_ENV=production ts-node script/build.ts",
"compile:dev":
"cross-env NODE_ENV=development parallel-webpack --config app/webpack.development.js",
"compile:prod":
"cross-env NODE_ENV=production parallel-webpack --config app/webpack.production.js",
"build:dev":
"yarn compile:dev && cross-env NODE_ENV=development ts-node script/build.ts",
"build:prod":
"yarn compile:prod && cross-env NODE_ENV=production ts-node script/build.ts",
"package": "ts-node -P script script/package.ts",
"generate-octicons": "ts-node script/generate-octicons.ts",
"clean:tslint": "rimraf tslint-rules/*.js",
"compile:tslint": "tsc -p tslint-rules",
"compile:script": "tsc -p script",
"lint": "yarn compile:tslint && yarn compile:script && yarn tslint && yarn eslint-check && yarn eslint",
"lint":
"yarn compile:tslint && yarn compile:script && yarn tslint && yarn eslint-check && yarn eslint",
"lint:fix": "yarn compile:tslint && yarn tslint:fix && yarn eslint:fix",
"tslint": "tslint ./{script,tslint-rules}/*.ts ./app/{src,typings,test}/**/*.{ts,tsx}",
"tslint":
"tslint ./{script,tslint-rules}/*.ts ./app/{src,typings,test}/**/*.{ts,tsx}",
"tslint:fix": "yarn tslint --fix",
"eslint": "ts-node script/eslint.ts",
"eslint:fix": "yarn eslint --fix",
"eslint-check": "eslint --print-config .eslintrc.* | eslint-config-prettier-check",
"eslint-check":
"eslint --print-config .eslintrc.* | eslint-config-prettier-check",
"publish": "node script/publish",
"clean-slate": "rimraf out node_modules app/node_modules && yarn",
"rebuild-hard:dev": "yarn clean-slate && yarn build:dev",
@ -76,7 +87,7 @@
"node-sass": "^4.7.2",
"octicons": "^7.0.1",
"parallel-webpack": "^2.1.0",
"prettier": "1.9.2",
"prettier": "1.10.0",
"request": "^2.72.0",
"rimraf": "^2.5.2",
"sass-loader": "^6.0.6",

6
yarn.lock
View file

@ -5298,9 +5298,9 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@1.9.2:
version "1.9.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
prettier@1.10.0:
version "1.10.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.0.tgz#0b89c9b0d55d0862d9c977e4b459696bdea564fb"
pretty-bytes@^1.0.2:
version "1.0.4"