Skip to content

Commit 51c7d5f

Browse files
committed
chore: bump all dependencies, use eslint to replace tslint
1 parent 3b448d7 commit 51c7d5f

File tree

16 files changed

+1582
-1122
lines changed

16 files changed

+1582
-1122
lines changed

.eslintignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/lib
2+
/client-plugin.js
3+
/client-plugin.d.ts
4+
/server-plugin.js
5+
/server-plugin.d.ts

.eslintrc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"extends": "1stg/react",
3+
"rules": {
4+
"@typescript-eslint/camelcase": 0,
5+
"@typescript-eslint/no-explicit-any": 0,
6+
"@typescript-eslint/no-use-before-define": [
7+
2,
8+
{
9+
"functions": false,
10+
"classes": true
11+
}
12+
],
13+
"promise/param-names": 0
14+
}
15+
}

.huskyrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"hooks": {
3+
"pre-commit": "lint-staged",
4+
"pre-push": "tsc"
5+
}
6+
}

.lintstagedrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"*.ts": ["eslint --fix", "git add"],
3+
"*.{md,json}": ["prettier --write", "git add"]
4+
}

.prettierrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"semi": false,
3+
"singleQuote": true,
4+
"trailingComma": "all"
5+
}

package.json

Lines changed: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "react-server-renderer",
3-
"version": "1.1.1",
3+
"version": "1.2.0",
44
"description": "simple React SSR solution inspired by vue-server-render",
55
"repository": "git@github.com:JounQin/react-server-renderer.git",
66
"main": "lib/index.js",
77
"types": "lib/index.d.ts",
88
"author": "JounQin <admin@1stg.me>",
99
"license": "MIT",
1010
"scripts": {
11-
"lint": "tslint -p . -t stylish",
11+
"lint": "eslint . --ext .js,.ts",
1212
"build": "tsc"
1313
},
1414
"files": [
@@ -18,56 +18,32 @@
1818
"server-plugin.js",
1919
"server-plugin.d.ts"
2020
],
21-
"husky": {
22-
"hooks": {
23-
"pre-commit": "lint-staged",
24-
"pre-push": "tsc"
25-
}
26-
},
27-
"lint-staged": {
28-
"*.ts": [
29-
"tslint -p . -t stylish --fix",
30-
"git add"
31-
],
32-
"*.{md,json}": [
33-
"prettier --write",
34-
"git add"
35-
]
36-
},
37-
"prettier": {
38-
"semi": false,
39-
"singleQuote": true,
40-
"trailingComma": "all"
41-
},
4221
"peerDependencies": {
4322
"react": "^16.4.2",
4423
"react-dom": "^16.4.2"
4524
},
4625
"dependencies": {
47-
"hash-sum": "^1.0.2",
26+
"hash-sum": "^2.0.0",
4827
"lodash": "^4.17.11",
49-
"lodash.uniq": "^4.5.0",
50-
"resolve": "^1.8.1",
51-
"serialize-javascript": "^1.5.0",
28+
"resolve": "^1.11.1",
29+
"serialize-javascript": "^1.7.0",
5230
"source-map": "^0.7.0"
5331
},
5432
"devDependencies": {
5533
"@types/hash-sum": "^1.0.0",
56-
"@types/lodash.uniq": "^4.5.4",
57-
"@types/node": "^10.12.0",
58-
"@types/react": "^16.4.18",
59-
"@types/react-dom": "^16.0.9",
34+
"@types/lodash": "^4.14.135",
35+
"@types/node": "^12.0.12",
36+
"@types/react": "^16.8.23",
37+
"@types/react-dom": "^16.8.4",
6038
"@types/resolve": "^0.0.8",
6139
"@types/serialize-javascript": "^1.5.0",
62-
"husky": "^1.1.2",
63-
"lint-staged": "^7.3.0",
64-
"prettier": "^1.14.3",
65-
"react": "^16.5.2",
66-
"react-dom": "^16.5.2",
67-
"tslint": "^5.11.0",
68-
"tslint-config-prettier": "^1.15.0",
69-
"tslint-config-standard": "^8.0.1",
70-
"tslint-plugin-prettier": "^2.0.0",
71-
"typescript": "^3.1.3"
40+
"eslint": "^6.0.1",
41+
"eslint-config-1stg": "^5.2.0",
42+
"husky": "^3.0.0",
43+
"lint-staged": "^9.1.0",
44+
"prettier": "^1.18.2",
45+
"react": "^16.8.6",
46+
"react-dom": "^16.8.6",
47+
"typescript": "^3.5.2"
7248
}
7349
}

src/bundle-renderer/create-bundle-renderer.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ import fs from 'fs'
22
import path from 'path'
33
import { PassThrough } from 'stream'
44

5-
import { ReactElement } from 'react'
6-
75
import { RenderOptions, Renderer } from '../create-renderer'
86
import { UserContext, createPromiseCallback } from '../util'
7+
98
import { createBundleRunner } from './create-bundle-runner'
109
import {
1110
createSourceMapConsumers,
1211
rewriteErrorTrace,
1312
} from './source-map-support'
1413

14+
import { ReactElement } from 'react'
15+
1516
const INVALID_MSG =
1617
'Invalid server-rendering bundle format. Should be a string ' +
1718
'or a bundle Object of type:\n\n' +

src/bundle-renderer/create-bundle-runner.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import path from 'path'
22
import vm from 'vm'
3-
4-
import { isPlainObject } from 'lodash'
5-
import _resolve from 'resolve'
3+
import NativeModule from 'module'
64

75
import { UserContext } from '../util'
86

9-
// tslint:disable-next-line no-var-requires
10-
const NativeModule = require('module')
7+
import { isPlainObject } from 'lodash'
8+
import _resolve from 'resolve'
119

1210
function createSandbox(context?) {
1311
const sandbox = {

src/create-renderer.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { ReactElement } from 'react'
2-
import { renderToNodeStream, renderToString } from 'react-dom/server'
3-
41
import TemplateRenderer, { TemplateRendererOptions } from './template-renderer'
52
import { UserContext, createPromiseCallback } from './util'
63

4+
import { ReactElement } from 'react'
5+
import { renderToNodeStream, renderToString } from 'react-dom/server'
6+
77
export type RenderOptions = TemplateRendererOptions & {
88
basedir?: string
99
runInNewContext?: false | 'once'

src/template-renderer/create-async-file-mapper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export function createMapper(clientManifest: ClientManifest): AsyncFileMapper {
1212
const map = createMap(clientManifest)
1313
// map server-side moduleIds to client-side files
1414
return function mapper(moduleIds: string[]): string[] {
15-
const res = new Set()
15+
const res = new Set<string>()
1616
for (const moduleId of moduleIds) {
1717
const mapped = map.get(moduleId)
1818
if (mapped) {

0 commit comments

Comments
 (0)