Skip to content

Commit 916f363

Browse files
committed
chore: rebase
2 parents cd9e831 + f611c27 commit 916f363

21 files changed

+813
-179
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ lerna-debug.log
3333

3434
# Yarn lock file
3535
yarn.lock
36+
37+
# Custom typings
38+
custom_typing/*.js

package-lock.json

+33-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+14-9
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,25 @@
2525
"bin"
2626
],
2727
"scripts": {
28-
"lint": "eslint \"./bin/*.js\" \"./test/**/*.js\" \"{packages}/**/!(node_modules)/*.js\" ",
28+
"appveyor:lint": "lerna bootstrap && npm run lint",
29+
"appveyor:test": "npm run test",
30+
"bootstrap": "npm run clean:all && npm install && lerna bootstrap",
31+
"build": "tsc",
32+
"bundlesize": "bundlesize",
33+
"changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile CHANGELOG.md --same-file",
34+
"clean:all": "rimraf node_modules package-lock.json packages/*/node_modules packages/*/package-lock.json",
2935
"format": "prettier-eslint ./bin/*.js ./test/**/*.js ./packages/**/*.js --write",
36+
"jsdoc": "jsdoc -c jsdoc.json -r -d docs",
3037
"lint:codeOnly": "eslint \"{bin}/**/!(__testfixtures__)/*.js\" \"{bin}/**.js\"",
38+
"lint": "eslint \"./bin/*.js\" \"./test/**/*.js\" \"{packages}/**/!(node_modules)/*.test.js\" && npm run tslint",
3139
"precommit": "lint-staged",
3240
"pretest": "npm run lint",
33-
"test": "nyc jest",
3441
"reportCoverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json --disable=gcov",
35-
"jsdoc": "jsdoc -c jsdoc.json -r -d docs",
36-
"appveyor:lint": "lerna bootstrap && npm run lint",
37-
"appveyor:test": "npm run test",
42+
"test": "nyc jest",
3843
"travis:integration": "npm run test && npm run reportCoverage",
3944
"travis:lint": "lerna bootstrap && npm run lint && npm run bundlesize",
40-
"bundlesize": "bundlesize",
41-
"changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile CHANGELOG.md --same-file",
42-
"clean:all": "rimraf node_modules package-lock.json packages/*/node_modules packages/*/package-lock.json",
43-
"bootstrap": "npm run clean:all && npm install && lerna bootstrap"
45+
"tslint": "tslint -c tslint.json \"packages/**/*.ts\"",
46+
"watch": "tsc -w"
4447
},
4548
"lint-staged": {
4649
"{packages,bin}/**/!(__testfixtures__)/**.js": [
@@ -128,6 +131,8 @@
128131
"prettier-eslint-cli": "^4.7.1",
129132
"rimraf": "^2.6.2",
130133
"schema-utils": "^0.4.5",
134+
"tslint": "^5.10.0",
135+
"typescript": "^2.9.2",
131136
"webpack": "^4.8.3",
132137
"webpack-dev-server": "^3.1.4"
133138
}

packages/generators/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/info/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.js

packages/info/.npmignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.ts
2+
tsconfig.json
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
"use strict";
2-
3-
const envinfo = require("envinfo");
1+
import * as envinfo from "envinfo";
42

53
/**
64
* Prints debugging information for webpack issue reporting
75
*/
86

9-
module.exports = async function info() {
7+
export default async function info() {
108
console.log(
119
await envinfo.run({
12-
System: ["OS", "CPU"],
1310
Binaries: ["Node", "Yarn", "npm"],
1411
Browsers: ["Chrome", "Firefox", "Safari"],
12+
System: ["OS", "CPU"],
13+
npmGlobalPackages: ["webpack", "webpack-cli"],
1514
npmPackages: "*webpack*",
16-
npmGlobalPackages: ["webpack", "webpack-cli"]
17-
})
15+
}),
1816
);
19-
};
17+
}

0 commit comments

Comments
 (0)