Skip to content

Commit 51e6eb4

Browse files
committed
Upgrade puppeteer, then upgrade typescript, then upgrade other packages
and types
1 parent 63b2de1 commit 51e6eb4

File tree

9 files changed

+312
-190
lines changed

9 files changed

+312
-190
lines changed

package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,22 @@
88
"private": true,
99
"devDependencies": {
1010
"@actions/core": "^1.2.6",
11-
"@types/glob": "^7.1.1",
12-
"@types/image-size": "^0.7.0",
11+
"@types/glob": "^8.0.0",
12+
"@types/image-size": "^0.8.0",
1313
"@types/mdast": "^3.0.2",
14-
"@types/mkdirp": "^0.5.2",
14+
"@types/mkdirp": "^1.0.2",
1515
"@types/ncp": "^2.0.1",
16-
"@types/node": "^12.7.2",
17-
"@types/puppeteer": "^2.0.0",
16+
"@types/node": "^18.11.18",
1817
"@types/unist": "^2.0.3",
19-
"@types/vfile": "^3.0.2",
18+
"@types/vfile": "^4.0.0",
2019
"chalk": "^2.4.2",
2120
"ember-cli": "*",
2221
"ember-dictionary": "^0.2.3",
23-
"image-size": "^0.7.4",
24-
"mkdirp": "^0.5.1",
22+
"image-size": "^1.0.2",
23+
"mkdirp": "^1.0.4",
2524
"ncp": "^2.0.0",
2625
"node-glob": "^1.2.0",
27-
"puppeteer": "~2.1.1",
26+
"puppeteer": "~19.5.2",
2827
"rehype-stringify": "^6.0.0",
2928
"remark": "^11.0.1",
3029
"remark-cli": "^7.0.0",
@@ -46,9 +45,9 @@
4645
"retext-syntax-urls": "^1.0.2",
4746
"shx": "^0.3.2",
4847
"ts-std": "^0.7.0",
49-
"tslint": "^5.18.0",
48+
"tslint": "^6.1.3",
5049
"tslint-config-prettier": "^1.18.0",
51-
"typescript": "^3.5.3",
50+
"typescript": "^4.9.4",
5251
"unified": "^8.4.0"
5352
},
5453
"scripts": {

src/bin/generate.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
writeFile as _writeFile
66
} from 'fs';
77
import _glob from 'glob';
8-
import _mkdirp from 'mkdirp';
8+
import mkdirp from 'mkdirp';
99
import { ncp as _ncp } from 'ncp';
1010
import { basename, dirname, join, relative, sep } from 'path';
1111
import frontmatter from 'remark-frontmatter';
@@ -21,7 +21,6 @@ import { doNotEdit, retinaImages, runCodeBlocks, todoLinks, zoeySays } from '../
2121
const glob = promisify(_glob);
2222
const readFile = promisify(_readFile);
2323
const writeFile = promisify(_writeFile);
24-
const mkdirp = promisify(_mkdirp);
2524
const ncp = promisify(_ncp);
2625

2726
// 01-orientation.md -> orientation.md
@@ -55,8 +54,8 @@ async function main() {
5554
let codeDir = join(project, 'dist', 'code');
5655

5756
await ncp(join(project, 'src', 'assets'), assetsDir);
58-
await mkdirp(outDir);
59-
await mkdirp(codeDir);
57+
await mkdirp(outDir, {});
58+
await mkdirp(codeDir, {});
6059

6160
let pattern = process.argv[2] || join('src', 'markdown', '**', '*.md');
6261

@@ -79,7 +78,7 @@ async function main() {
7978
let dir = unprefix(relative(srcDir, dirname(inputPath)));
8079
let name = unprefix(basename(inputPath));
8180

82-
await mkdirp(join(outDir, dir));
81+
await mkdirp(join(outDir, dir), {});
8382

8483
let outputPath = join(outDir, dir, name);
8584

src/lib/plugins/retina-images/walker.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ function attr(v: unknown): string {
3939

4040
async function toImgTag(node: Image, options: Options): Promise<HTML> {
4141
let size = await imageSize(pathFor(node.url, options));
42+
// @ts-ignore
4243
let width = Math.floor(size.width / 2);
44+
// @ts-ignore
4345
let height = Math.floor(size.height / 2);
4446

4547
let attrs = [];

src/lib/plugins/run-code-blocks/directives/file/copy.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { lstat as _lstat, readFile as _readFile } from 'fs';
22
import { Code } from 'mdast';
3-
import _mkdirp from 'mkdirp';
3+
import mkdirp from 'mkdirp';
44
import { ncp as _ncp } from 'ncp';
55
import { basename, dirname, join } from 'path';
66
import { Option } from 'ts-std';
@@ -9,7 +9,6 @@ import Options from '../../options';
99
import parseArgs, { ToBool, optional, required } from '../../parse-args';
1010

1111
const lstat = promisify(_lstat);
12-
const mkdirp = promisify(_mkdirp);
1312
const ncp = promisify(_ncp);
1413
const readFile = promisify(_readFile);
1514

@@ -53,7 +52,7 @@ export default async function copyFile(node: Code, options: Options): Promise<Op
5352
throw new Error(`\`${src}\` is neither a regular file or a directory`);
5453
}
5554

56-
await mkdirp(destDir);
55+
await mkdirp(destDir, {});
5756
await ncp(src, destPath);
5857

5958
if (args.hidden) {

src/lib/plugins/run-code-blocks/directives/file/create.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { writeFile as _writeFile } from 'fs';
22
import { Code } from 'mdast';
3-
import _mkdirp from 'mkdirp';
3+
import mkdirp from 'mkdirp';
44
import { basename, dirname, join } from 'path';
55
import { Option } from 'ts-std';
66
import { promisify } from 'util';
77
import Options from '../../options';
88
import parseArgs, { ToBool, optional, required } from '../../parse-args';
99

10-
const mkdirp = promisify(_mkdirp);
1110
const writeFile = promisify(_writeFile);
1211

1312
interface Args {
@@ -37,7 +36,7 @@ export default async function createFile(node: Code, options: Options): Promise<
3736

3837
dir = join(dir, dirname(args.filename));
3938

40-
await mkdirp(dir);
39+
await mkdirp(dir, {});
4140

4241
let path = join(dir, basename(args.filename));
4342

src/lib/plugins/run-code-blocks/directives/pause.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Options from '../options';
66
async function prompt(message: string): Promise<void> {
77
console.log(`\n${message}\n`);
88

9-
await new Promise(resolve => {
9+
await new Promise<void>(resolve => {
1010
let rl = readline.createInterface({
1111
input: process.stdin,
1212
output: process.stdout

src/lib/plugins/run-code-blocks/directives/screenshot.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { exec as _exec } from 'child_process';
22
import { Code, Image } from 'mdast';
3-
import _mkdirp from 'mkdirp';
3+
import mkdirp from 'mkdirp';
44
import { basename, extname, join, sep } from 'path';
55
import { ScreenshotOptions, Viewport } from 'puppeteer';
66
import { JSONObject, JSONValue, assert } from 'ts-std';
@@ -10,7 +10,6 @@ import Options from '../options';
1010
import parseArgs, { ToBool, optional, required } from '../parse-args';
1111

1212
const exec = promisify(_exec);
13-
const mkdirp = promisify(_mkdirp);
1413

1514
interface Args {
1615
filename: string;
@@ -156,7 +155,7 @@ export default async function screenshot(node: Code, options: Options, vfile: VF
156155
filename = `${basename(filename, '.png')}@2x.png`;
157156
}
158157

159-
await mkdirp(dir);
158+
await mkdirp(dir, {});
160159

161160
let path = join(dir, filename);
162161

src/lib/plugins/run-code-blocks/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default class Server {
2525
// TODO
2626
}
2727

28-
get pid(): Option<number> {
28+
get pid(): null | number | undefined {
2929
return this.process && this.process.pid;
3030
}
3131

0 commit comments

Comments
 (0)