Skip to content

Commit 83c2606

Browse files
committed
Merge branch 'develop' into greenkeeper/default/css-loader-2.1.0
# Conflicts: # packages/core/package.json
2 parents 62dd6c6 + 535a677 commit 83c2606

File tree

7 files changed

+2005
-1646
lines changed

7 files changed

+2005
-1646
lines changed

.huskyrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"hooks": {
3-
"pre-commit": "npm run lint",
4-
"commit-msg": "commitlint -e $GIT_PARAMS"
3+
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
54
}
65
}

package-lock.json

Lines changed: 1993 additions & 1634 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "techpacket-build-tools",
33
"types": "lib/index.d.ts",
44
"main": "lib/index.js",
5-
"version": "1.0.13",
5+
"version": "1.0.14",
66
"scripts": {
77
"test": "npm run lint && jest",
88
"lint": "eslint .",
@@ -24,14 +24,14 @@
2424
"techpacket-build-tools": "bin/cli.js"
2525
},
2626
"dependencies": {
27-
"@techpacket-build-tools/core": "^1.0.5",
27+
"@techpacket-build-tools/core": "^1.0.6",
2828
"@techpacket-build-tools/dev-utils": "^1.0.3",
2929
"@techpacket-build-tools/errors": "^1.0.2",
3030
"@techpacket-build-tools/logger": "^1.0.4",
3131
"@techpacket-build-tools/preset-babel-base": "^1.0.3",
3232
"address": "^1.0.1",
3333
"cac": "^5.0.12",
34-
"chalk": "2.4.1",
34+
"chalk": "2.4.2",
3535
"chokidar": "^2.0.3",
3636
"dotenv": "^6.0.0",
3737
"find-babel-config": "^1.1.0",
@@ -40,7 +40,7 @@
4040
"lodash": "^4.17.11",
4141
"loud-rejection": "^1.6.0",
4242
"opn": "^5.4.0",
43-
"parse-json-config": "^0.3.1",
43+
"parse-json-config": "^0.4.2",
4444
"update-notifier": "^2.1.0",
4545
"use-config": "^2.0.4",
4646
"webpack-chain": "^4.11.0",
@@ -69,4 +69,4 @@
6969
"workspaces": [
7070
"packages/*"
7171
]
72-
}
72+
}

packages/core/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"babel-loader": "^8.0.2",
88
"copy-webpack-plugin": "^4.5.2",
99
"css-loader": "^2.1.0",
10-
"file-loader": "^2.0.0",
10+
"file-loader": "^3.0.0",
1111
"html-webpack-plugin": "^3.2.0",
1212
"lodash.merge": "^4.6.1",
1313
"mini-css-extract-plugin": "^0.4.3",
@@ -18,6 +18,7 @@
1818
"style-loader": "^0.23.0",
1919
"trash": "^4.3.0",
2020
"url-loader": "^1.1.1",
21+
"uglifyjs-webpack-plugin": "^2.0.1",
2122
"webpack": "^4.19.1",
2223
"webpack-dev-server": "^3.1.8",
2324
"webpack-handle-css-loader": "^3.0.1",
@@ -44,6 +45,6 @@
4445
"type": "git",
4546
"url": "https://github.com/TechPacket/techpacket-build-tools/tree/master/packages/core"
4647
},
47-
"version": "1.0.5",
48+
"version": "1.0.6",
4849
"gitHead": "1eb433abdd7ef036d1fd62c3a6a798c472dc8e1f"
4950
}

packages/dev-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"chalk": "2.4.1",
3+
"chalk": "2.4.2",
44
"react-error-overlay": "^4.0.1",
55
"shell-quote": "^1.6.1",
66
"sockjs-client": "^1.2.0",

packages/logger/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"chalk": "2.4.1",
3+
"chalk": "2.4.2",
44
"log-update": "^2.3.0"
55
},
66
"deprecated": false,

packages/plugin-webpack-logger/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"repository": "https://github.com/TechPacket/techpacket-build-tools/tree/master/packages/plugin-webpack-logger",
99
"dependencies": {
1010
"bytes": "^3.0.0",
11-
"chalk": "2.4.1",
11+
"chalk": "2.4.2",
1212
"text-table": "^0.2.0"
1313
},
1414
"version": "1.0.3",

0 commit comments

Comments
 (0)