Skip to content

Commit

Permalink
chore: rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
evenstensberg committed Jun 24, 2018
2 parents cd9e831 + f611c27 commit 916f363
Show file tree
Hide file tree
Showing 21 changed files with 813 additions and 179 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ lerna-debug.log

# Yarn lock file
yarn.lock

# Custom typings
custom_typing/*.js
37 changes: 33 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 14 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,25 @@
"bin"
],
"scripts": {
"lint": "eslint \"./bin/*.js\" \"./test/**/*.js\" \"{packages}/**/!(node_modules)/*.js\" ",
"appveyor:lint": "lerna bootstrap && npm run lint",
"appveyor:test": "npm run test",
"bootstrap": "npm run clean:all && npm install && lerna bootstrap",
"build": "tsc",
"bundlesize": "bundlesize",
"changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile CHANGELOG.md --same-file",
"clean:all": "rimraf node_modules package-lock.json packages/*/node_modules packages/*/package-lock.json",
"format": "prettier-eslint ./bin/*.js ./test/**/*.js ./packages/**/*.js --write",
"jsdoc": "jsdoc -c jsdoc.json -r -d docs",
"lint:codeOnly": "eslint \"{bin}/**/!(__testfixtures__)/*.js\" \"{bin}/**.js\"",
"lint": "eslint \"./bin/*.js\" \"./test/**/*.js\" \"{packages}/**/!(node_modules)/*.test.js\" && npm run tslint",
"precommit": "lint-staged",
"pretest": "npm run lint",
"test": "nyc jest",
"reportCoverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json --disable=gcov",
"jsdoc": "jsdoc -c jsdoc.json -r -d docs",
"appveyor:lint": "lerna bootstrap && npm run lint",
"appveyor:test": "npm run test",
"test": "nyc jest",
"travis:integration": "npm run test && npm run reportCoverage",
"travis:lint": "lerna bootstrap && npm run lint && npm run bundlesize",
"bundlesize": "bundlesize",
"changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile CHANGELOG.md --same-file",
"clean:all": "rimraf node_modules package-lock.json packages/*/node_modules packages/*/package-lock.json",
"bootstrap": "npm run clean:all && npm install && lerna bootstrap"
"tslint": "tslint -c tslint.json \"packages/**/*.ts\"",
"watch": "tsc -w"
},
"lint-staged": {
"{packages,bin}/**/!(__testfixtures__)/**.js": [
Expand Down Expand Up @@ -128,6 +131,8 @@
"prettier-eslint-cli": "^4.7.1",
"rimraf": "^2.6.2",
"schema-utils": "^0.4.5",
"tslint": "^5.10.0",
"typescript": "^2.9.2",
"webpack": "^4.8.3",
"webpack-dev-server": "^3.1.4"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/generators/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/info/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.js
2 changes: 2 additions & 0 deletions packages/info/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.ts
tsconfig.json
14 changes: 6 additions & 8 deletions packages/info/index.js → packages/info/index.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
"use strict";

const envinfo = require("envinfo");
import * as envinfo from "envinfo";

/**
* Prints debugging information for webpack issue reporting
*/

module.exports = async function info() {
export default async function info() {
console.log(
await envinfo.run({
System: ["OS", "CPU"],
Binaries: ["Node", "Yarn", "npm"],
Browsers: ["Chrome", "Firefox", "Safari"],
System: ["OS", "CPU"],
npmGlobalPackages: ["webpack", "webpack-cli"],
npmPackages: "*webpack*",
npmGlobalPackages: ["webpack", "webpack-cli"]
})
}),
);
};
}
Loading

0 comments on commit 916f363

Please sign in to comment.