From 47e9369436e2f47d133d4c7b10f22211ea72df04 Mon Sep 17 00:00:00 2001 From: Raymond Feng Date: Mon, 20 Aug 2018 10:01:37 -0700 Subject: [PATCH] chore: upgrade to typescript 3.0.x --- packages/build/.prettierrc | 6 ------ packages/build/package.json | 16 +++++----------- .../test/integration/scripts.integration.js | 5 +++-- 3 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 packages/build/.prettierrc diff --git a/packages/build/.prettierrc b/packages/build/.prettierrc deleted file mode 100644 index fb1c07ce0f90..000000000000 --- a/packages/build/.prettierrc +++ /dev/null @@ -1,6 +0,0 @@ -{ - "bracketSpacing": false, - "singleQuote": true, - "printWidth": 80, - "trailingComma": "es5" -} diff --git a/packages/build/package.json b/packages/build/package.json index bf30baad593d..f6a25986ad53 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -17,16 +17,16 @@ "@types/node": "^10.1.1", "cross-spawn": "^6.0.5", "debug": "^3.1.0", - "fs-extra": "^6.0.1", + "fs-extra": "^7.0.0", "glob": "^7.1.2", "mocha": "^5.1.1", - "nyc": "^11.7.1", + "nyc": "^12.0.2", "prettier": "^1.14.0", "rimraf": "^2.6.2", "source-map-support": "^0.5.5", - "strong-docs": "^3.2.0", + "strong-docs": "^4.0.0", "tslint": "^5.9.1", - "typescript": "~2.8.4" + "typescript": "^3.0.1" }, "bin": { "lb-tsc": "./bin/compile-package.js", @@ -39,13 +39,7 @@ "lb-clean": "./bin/run-clean.js" }, "scripts": { - "lint": "npm run prettier:check", - "lint:fix": "npm run prettier:fix", - "prettier:cli": "node bin/run-prettier \"bin/**/*.js\"", - "prettier:check": "npm run prettier:cli -- -l", - "prettier:fix": "npm run prettier:cli -- --write", "test": "npm run mocha", - "mocha": "node bin/run-mocha --timeout 30000 \"test/integration/*.js\"", - "posttest": "npm run lint" + "mocha": "node bin/run-mocha --timeout 30000 \"test/integration/*.js\"" } } diff --git a/packages/build/test/integration/scripts.integration.js b/packages/build/test/integration/scripts.integration.js index 663f0fe1744a..376cd10fd446 100644 --- a/packages/build/test/integration/scripts.integration.js +++ b/packages/build/test/integration/scripts.integration.js @@ -173,13 +173,14 @@ describe('build', function() { 'api-docs should have been created', ); var typedocDir = require.resolve('typedoc/package.json'); + typedocDir = path.resolve(typedocDir, '..'); assert( - !fs.existsSync(path.join(typedocDir, '../node_modules/typescript')), + !fs.existsSync(path.join(typedocDir, './node_modules/typescript')), 'typedoc local dependency of typescript should have been renamed', ); assert( !fs.existsSync( - path.join(typedocDir, '../node_modules/.bin'), + path.join(typedocDir, './node_modules/.bin/tsc'), 'typedoc local scripts from typescript should have been removed', ), );