Skip to content

Commit 268bc69

Browse files
authored
chore(deps): upgrade most production deps (#1237)
* chore(deps): upgrade most production deps adjusted chalk import/initialization to new major * refactor: use namespace import * chore: bump patch version; update changelog * docs: add contributor name
1 parent e160564 commit 268bc69

File tree

4 files changed

+53
-23
lines changed

4 files changed

+53
-23
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Changelog
2+
## v8.0.14
3+
* [Upgrade `chalk`, `loader-utils`, and `semver` to latest stable versions](https://github.com/TypeStrong/ts-loader/pull/1237) - thanks Avi Vahl
4+
25
## v8.0.13
36
* [Speed up builds by adding an in-memory cache to file path lookups](https://github.com/TypeStrong/ts-loader/pull/1228) - thanks @berickson1
47

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ts-loader",
3-
"version": "8.0.13",
3+
"version": "8.0.14",
44
"description": "TypeScript loader for webpack",
55
"main": "index.js",
66
"types": "dist",
@@ -54,16 +54,16 @@
5454
},
5555
"homepage": "https://github.com/TypeStrong/ts-loader",
5656
"dependencies": {
57-
"chalk": "^2.3.0",
57+
"chalk": "^4.1.0",
5858
"enhanced-resolve": "^4.0.0",
59-
"loader-utils": "^1.0.2",
59+
"loader-utils": "^2.0.0",
6060
"micromatch": "^4.0.0",
61-
"semver": "^6.0.0"
61+
"semver": "^7.3.4"
6262
},
6363
"devDependencies": {
6464
"@types/micromatch": "^3.1.0",
6565
"@types/node": "*",
66-
"@types/semver": "^6.0.0",
66+
"@types/semver": "^7.3.4",
6767
"@types/webpack": "^4.4.30",
6868
"@typescript-eslint/eslint-plugin": "^4.0.0",
6969
"@typescript-eslint/parser": "^4.0.0",

src/instances.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import chalk, { Chalk } from 'chalk';
1+
import * as chalk from 'chalk';
22
import * as fs from 'fs';
33
import * as path from 'path';
44
import * as typescript from 'typescript';
@@ -58,7 +58,9 @@ export function getTypeScriptInstance(
5858
return { instance: existing };
5959
}
6060

61-
const colors = new chalk.constructor({ enabled: loaderOptions.colors });
61+
const level =
62+
loaderOptions.colors && chalk.supportsColor ? chalk.supportsColor.level : 0;
63+
const colors = new chalk.Instance({ level });
6264
const log = logger.makeLogger(loaderOptions, colors);
6365
const compiler = getCompiler(loaderOptions, log);
6466

@@ -123,7 +125,7 @@ function successfulTypeScriptInstance(
123125
loaderOptions: LoaderOptions,
124126
loader: webpack.loader.LoaderContext,
125127
log: logger.Logger,
126-
colors: Chalk,
128+
colors: chalk.Chalk,
127129
compiler: typeof typescript,
128130
compilerCompatible: boolean,
129131
compilerDetailsLogMessage: string

yarn.lock

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,10 @@
111111
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
112112
integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
113113

114-
"@types/semver@^6.0.0":
115-
version "6.0.0"
116-
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-6.0.0.tgz#86ba89f02a414e39c68d02b351872e4ed31bd773"
117-
integrity sha512-OO0srjOGH99a4LUN2its3+r6CBYcplhJ466yLqs+zvAWgphCpS8hYZEZ797tRDP/QKcqTdb/YCN6ifASoAWkrQ==
114+
"@types/semver@^7.3.4":
115+
version "7.3.4"
116+
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
117+
integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
118118

119119
"@types/source-list-map@*":
120120
version "0.1.2"
@@ -1616,7 +1616,7 @@ chalk@^1.0.0, chalk@^1.1.3:
16161616
strip-ansi "^3.0.0"
16171617
supports-color "^2.0.0"
16181618

1619-
chalk@^2.0.0, chalk@^2.3.0:
1619+
chalk@^2.0.0:
16201620
version "2.4.2"
16211621
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
16221622
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1634,7 +1634,7 @@ chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1:
16341634
escape-string-regexp "^1.0.5"
16351635
supports-color "^5.3.0"
16361636

1637-
chalk@^4.0.0:
1637+
chalk@^4.0.0, chalk@^4.1.0:
16381638
version "4.1.0"
16391639
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
16401640
integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -3819,6 +3819,13 @@ json5@^1.0.1:
38193819
dependencies:
38203820
minimist "^1.2.0"
38213821

3822+
json5@^2.1.2:
3823+
version "2.1.3"
3824+
resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
3825+
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
3826+
dependencies:
3827+
minimist "^1.2.5"
3828+
38223829
jsonfile@^4.0.0:
38233830
version "4.0.0"
38243831
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -4064,6 +4071,15 @@ loader-utils@^1.1.0, loader-utils@^1.2.3:
40644071
emojis-list "^3.0.0"
40654072
json5 "^1.0.1"
40664073

4074+
loader-utils@^2.0.0:
4075+
version "2.0.0"
4076+
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
4077+
integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
4078+
dependencies:
4079+
big.js "^5.2.2"
4080+
emojis-list "^3.0.0"
4081+
json5 "^2.1.2"
4082+
40674083
locate-path@^2.0.0:
40684084
version "2.0.0"
40694085
resolved "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -4176,6 +4192,13 @@ lru-cache@^5.1.1:
41764192
dependencies:
41774193
yallist "^3.0.2"
41784194

4195+
lru-cache@^6.0.0:
4196+
version "6.0.0"
4197+
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
4198+
integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
4199+
dependencies:
4200+
yallist "^4.0.0"
4201+
41794202
make-dir@^1.0.0:
41804203
version "1.3.0"
41814204
resolved "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -5554,20 +5577,17 @@ semver@^5.7.0:
55545577
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
55555578
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
55565579

5557-
semver@^6.0.0:
5558-
version "6.0.0"
5559-
resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
5560-
integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
5561-
55625580
semver@^6.1.0:
55635581
version "6.3.0"
55645582
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
55655583
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
55665584

5567-
semver@^7.2.1, semver@^7.3.2:
5568-
version "7.3.2"
5569-
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
5570-
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
5585+
semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
5586+
version "7.3.4"
5587+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
5588+
integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
5589+
dependencies:
5590+
lru-cache "^6.0.0"
55715591

55725592
serialize-javascript@^3.1.0:
55735593
version "3.1.0"
@@ -6636,6 +6656,11 @@ yallist@^3.0.2:
66366656
resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
66376657
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
66386658

6659+
yallist@^4.0.0:
6660+
version "4.0.0"
6661+
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
6662+
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
6663+
66396664
yargs-parser@13.0.0, yargs-parser@^13.0.0:
66406665
version "13.0.0"
66416666
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"

0 commit comments

Comments
 (0)