Skip to content

Commit

Permalink
Merge pull request #7522 from jasongrout/ts37-2
Browse files Browse the repository at this point in the history
Upgrade to TypeScript 3.7
  • Loading branch information
jasongrout committed Nov 15, 2019
2 parents c1e212c + cabe2ea commit 879970c
Show file tree
Hide file tree
Showing 266 changed files with 794 additions and 1,434 deletions.
2 changes: 1 addition & 1 deletion buildutils/package.json
Expand Up @@ -54,7 +54,7 @@
"prettier": "^1.18.2",
"semver": "^6.1.0",
"sort-package-json": "~1.22.1",
"typescript": "~3.5.1",
"typescript": "~3.7.2",
"webpack": "^4.32.2",
"which": "^1.3.1"
},
Expand Down
11 changes: 11 additions & 0 deletions buildutils/src/ensure-package.ts
Expand Up @@ -117,6 +117,17 @@ export async function ensurePackage(
return messages;
}

// Make sure typedoc config files are consistent
if (fs.existsSync(path.join(pkgPath, 'typedoc.json'))) {
let name = data.name.split('/');
utils.writeJSONFile(path.join(pkgPath, 'typedoc.json'), {
excludeNotExported: true,
mode: 'file',
out: `../../docs/api/${name[name.length - 1]}`,
theme: '../../typedoc-theme'
});
}

let imports: string[] = [];

// Extract all of the imports from the TypeScript files.
Expand Down
2 changes: 1 addition & 1 deletion buildutils/template/package.json
Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"rimraf": "~2.6.2",
"typescript": "~3.5.1"
"typescript": "~3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion buildutils/test-template/package.json
Expand Up @@ -17,6 +17,6 @@
"devDependencies": {
"karma": "^4.1.0",
"rimraf": "~2.6.2",
"typescript": "~3.5.1"
"typescript": "~3.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/cell/package.json
Expand Up @@ -29,7 +29,7 @@
"svg-url-loader": "~2.3.2",
"svgo": "~1.2.1",
"svgo-loader": "~2.2.0",
"typescript": "~3.5.1",
"typescript": "~3.7.2",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "^4.32.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/console/package.json
Expand Up @@ -28,7 +28,7 @@
"svg-url-loader": "~2.3.2",
"svgo": "~1.2.1",
"svgo-loader": "~2.2.0",
"typescript": "~3.5.1",
"typescript": "~3.7.2",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "^4.32.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/filebrowser/package.json
Expand Up @@ -33,7 +33,7 @@
"svg-url-loader": "~2.3.2",
"svgo": "~1.2.1",
"svgo-loader": "~2.2.0",
"typescript": "~3.5.1",
"typescript": "~3.7.2",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "^4.32.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/notebook/package.json
Expand Up @@ -33,7 +33,7 @@
"svg-url-loader": "~2.3.2",
"svgo": "~1.2.1",
"svgo-loader": "~2.2.0",
"typescript": "~3.5.1",
"typescript": "~3.7.2",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "^4.32.2",
Expand Down
2 changes: 1 addition & 1 deletion examples/terminal/package.json
Expand Up @@ -24,7 +24,7 @@
"svg-url-loader": "~2.3.2",
"svgo": "~1.2.1",
"svgo-loader": "~2.2.0",
"typescript": "~3.5.1",
"typescript": "~3.7.2",
"url-loader": "~1.1.2",
"watch": "~1.0.2",
"webpack": "^4.32.2",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -51,7 +51,7 @@
"create:test": "node buildutils/lib/create-test-package.js",
"create:theme": "node buildutils/lib/create-theme.js",
"deduplicate": "jlpm yarn-deduplicate -s fewer",
"docs": "lerna run docs",
"docs": "lerna run docs --ignore \"@jupyterlab/coreutils\" ",
"eslint": "eslint --fix .",
"eslint:check": "eslint .",
"get:dependency": "node buildutils/lib/get-dependency.js",
Expand Down
6 changes: 3 additions & 3 deletions packages/application-extension/package.json
Expand Up @@ -31,7 +31,7 @@
"scripts": {
"build": "tsc -b",
"clean": "rimraf lib",
"docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src",
"docs": "typedoc src",
"prepublishOnly": "npm run build",
"watch": "tsc -b --watch"
},
Expand All @@ -45,8 +45,8 @@
},
"devDependencies": {
"rimraf": "~2.6.2",
"typedoc": "^0.14.2",
"typescript": "~3.5.1"
"typedoc": "^0.15.2",
"typescript": "~3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 0 additions & 15 deletions packages/application-extension/tdoptions.json

This file was deleted.

6 changes: 6 additions & 0 deletions packages/application-extension/typedoc.json
@@ -0,0 +1,6 @@
{
"excludeNotExported": true,
"mode": "file",
"out": "../../docs/api/application-extension",
"theme": "../../typedoc-theme"
}
6 changes: 3 additions & 3 deletions packages/application/package.json
Expand Up @@ -31,7 +31,7 @@
"scripts": {
"build": "tsc -b",
"clean": "rimraf lib",
"docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src",
"docs": "typedoc src",
"prepublishOnly": "npm run build",
"watch": "tsc -b --watch"
},
Expand All @@ -56,8 +56,8 @@
},
"devDependencies": {
"rimraf": "~2.6.2",
"typedoc": "^0.14.2",
"typescript": "~3.5.1"
"typedoc": "^0.15.2",
"typescript": "~3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 0 additions & 15 deletions packages/application/tdoptions.json

This file was deleted.

6 changes: 6 additions & 0 deletions packages/application/typedoc.json
@@ -0,0 +1,6 @@
{
"excludeNotExported": true,
"mode": "file",
"out": "../../docs/api/application",
"theme": "../../typedoc-theme"
}
6 changes: 3 additions & 3 deletions packages/apputils-extension/package.json
Expand Up @@ -32,7 +32,7 @@
"scripts": {
"build": "tsc -b",
"clean": "rimraf lib",
"docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src",
"docs": "typedoc src",
"prepublishOnly": "npm run build",
"watch": "tsc -b --watch"
},
Expand All @@ -51,8 +51,8 @@
},
"devDependencies": {
"rimraf": "~2.6.2",
"typedoc": "^0.14.2",
"typescript": "~3.5.1"
"typedoc": "^0.15.2",
"typescript": "~3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 0 additions & 15 deletions packages/apputils-extension/tdoptions.json

This file was deleted.

6 changes: 6 additions & 0 deletions packages/apputils-extension/typedoc.json
@@ -0,0 +1,6 @@
{
"excludeNotExported": true,
"mode": "file",
"out": "../../docs/api/apputils-extension",
"theme": "../../typedoc-theme"
}
6 changes: 3 additions & 3 deletions packages/apputils/package.json
Expand Up @@ -30,7 +30,7 @@
"scripts": {
"build": "tsc -b",
"clean": "rimraf lib",
"docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src",
"docs": "typedoc src",
"prepublishOnly": "npm run build",
"watch": "tsc -b --watch"
},
Expand All @@ -57,8 +57,8 @@
"@types/react-dom": "^16.8.4",
"@types/sanitize-html": "^1.18.3",
"rimraf": "~2.6.2",
"typedoc": "^0.14.2",
"typescript": "~3.5.1"
"typedoc": "^0.15.2",
"typescript": "~3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 0 additions & 15 deletions packages/apputils/tdoptions.json

This file was deleted.

6 changes: 6 additions & 0 deletions packages/apputils/typedoc.json
@@ -0,0 +1,6 @@
{
"excludeNotExported": true,
"mode": "file",
"out": "../../docs/api/apputils",
"theme": "../../typedoc-theme"
}
6 changes: 3 additions & 3 deletions packages/attachments/package.json
Expand Up @@ -30,7 +30,7 @@
"scripts": {
"build": "tsc -b",
"clean": "rimraf lib",
"docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src",
"docs": "typedoc src",
"prepublishOnly": "npm run build",
"watch": "tsc -b --watch"
},
Expand All @@ -44,8 +44,8 @@
},
"devDependencies": {
"rimraf": "~2.6.2",
"typedoc": "^0.14.2",
"typescript": "~3.5.1"
"typedoc": "^0.15.2",
"typescript": "~3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 0 additions & 15 deletions packages/attachments/tdoptions.json

This file was deleted.

6 changes: 6 additions & 0 deletions packages/attachments/typedoc.json
@@ -0,0 +1,6 @@
{
"excludeNotExported": true,
"mode": "file",
"out": "../../docs/api/attachments",
"theme": "../../typedoc-theme"
}
6 changes: 3 additions & 3 deletions packages/cells/package.json
Expand Up @@ -30,7 +30,7 @@
"scripts": {
"build": "tsc -b",
"clean": "rimraf lib",
"docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src",
"docs": "typedoc src",
"prepublishOnly": "npm run build",
"watch": "tsc -b --watch"
},
Expand All @@ -57,8 +57,8 @@
"devDependencies": {
"@types/react": "~16.8.18",
"rimraf": "~2.6.2",
"typedoc": "^0.14.2",
"typescript": "~3.5.1"
"typedoc": "^0.15.2",
"typescript": "~3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 0 additions & 15 deletions packages/cells/tdoptions.json

This file was deleted.

6 changes: 6 additions & 0 deletions packages/cells/typedoc.json
@@ -0,0 +1,6 @@
{
"excludeNotExported": true,
"mode": "file",
"out": "../../docs/api/cells",
"theme": "../../typedoc-theme"
}
6 changes: 3 additions & 3 deletions packages/codeeditor/package.json
Expand Up @@ -30,7 +30,7 @@
"scripts": {
"build": "tsc -b",
"clean": "rimraf lib",
"docs": "typedoc --options tdoptions.json --theme ../../typedoc-theme src",
"docs": "typedoc src",
"prepublishOnly": "npm run build",
"watch": "tsc -b --watch"
},
Expand All @@ -46,8 +46,8 @@
},
"devDependencies": {
"rimraf": "~2.6.2",
"typedoc": "^0.14.2",
"typescript": "~3.5.1"
"typedoc": "^0.15.2",
"typescript": "~3.7.2"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 0 additions & 15 deletions packages/codeeditor/tdoptions.json

This file was deleted.

6 changes: 6 additions & 0 deletions packages/codeeditor/typedoc.json
@@ -0,0 +1,6 @@
{
"excludeNotExported": true,
"mode": "file",
"out": "../../docs/api/codeeditor",
"theme": "../../typedoc-theme"
}

0 comments on commit 879970c

Please sign in to comment.