Skip to content

Commit c1cbe62

Browse files
fiskerfisker
committed
Merge branch 'master' into globby-10-update-with-fast-glob
# Conflicts: # yarn.lock
2 parents 1703029 + d47c77e commit c1cbe62

5 files changed

Lines changed: 114 additions & 270 deletions

File tree

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"dependencies": {
1717
"@angular/compiler": "8.2.7",
1818
"@babel/code-frame": "7.5.5",
19-
"@babel/parser": "7.6.3",
19+
"@babel/parser": "7.6.4",
2020
"@glimmer/syntax": "0.41.0",
2121
"@iarna/toml": "2.2.3",
2222
"@typescript-eslint/typescript-estree": "2.6.0",
@@ -77,6 +77,7 @@
7777
"devDependencies": {
7878
"@babel/core": "7.6.3",
7979
"@babel/preset-env": "7.6.3",
80+
"@rollup/plugin-alias": "2.2.0",
8081
"@rollup/plugin-replace": "2.2.0",
8182
"babel-loader": "8.0.6",
8283
"babel-plugin-transform-async-to-promises": "0.8.15",
@@ -90,7 +91,7 @@
9091
"eslint-plugin-import": "2.18.2",
9192
"eslint-plugin-prettier": "3.1.1",
9293
"eslint-plugin-react": "7.14.3",
93-
"execa": "1.0.0",
94+
"execa": "3.2.0",
9495
"jest": "23.3.0",
9596
"jest-junit": "9.0.0",
9697
"jest-snapshot-serializer-ansi": "1.0.0",
@@ -101,8 +102,7 @@
101102
"prettier": "1.18.2",
102103
"prettylint": "1.0.0",
103104
"rimraf": "3.0.0",
104-
"rollup": "1.21.4",
105-
"rollup-plugin-alias": "2.0.1",
105+
"rollup": "1.26.0",
106106
"rollup-plugin-babel": "4.3.3",
107107
"rollup-plugin-commonjs": "10.1.0",
108108
"rollup-plugin-json": "4.0.0",
@@ -114,7 +114,7 @@
114114
"strip-ansi": "5.2.0",
115115
"tempy": "0.2.1",
116116
"terser-webpack-plugin": "2.1.3",
117-
"webpack": "4.41.0"
117+
"webpack": "4.41.2"
118118
},
119119
"scripts": {
120120
"prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",

‎scripts/build/bundler.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const path = require("path");
55
const { rollup } = require("rollup");
66
const webpack = require("webpack");
77
const resolve = require("rollup-plugin-node-resolve");
8-
const alias = require("rollup-plugin-alias");
8+
const alias = require("@rollup/plugin-alias");
99
const commonjs = require("rollup-plugin-commonjs");
1010
const nodeGlobals = require("rollup-plugin-node-globals");
1111
const json = require("rollup-plugin-json");

‎website/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"concurrently": "5.0.0",
2727
"docusaurus": "1.14.0",
2828
"js-yaml": "3.13.1",
29-
"svgo": "1.3.0",
29+
"svgo": "1.3.2",
3030
"webpack": "4.41.2",
3131
"webpack-cli": "3.3.9"
3232
}

‎website/yarn.lock‎

Lines changed: 19 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,12 +1851,6 @@ coa@^2.0.2:
18511851
chalk "^2.4.1"
18521852
q "^1.1.2"
18531853

1854-
coa@~2.0.1:
1855-
version "2.0.1"
1856-
resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.1.tgz#f3f8b0b15073e35d70263fb1042cb2c023db38af"
1857-
dependencies:
1858-
q "^1.1.2"
1859-
18601854
code-point-at@^1.0.0:
18611855
version "1.1.0"
18621856
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -1922,10 +1916,6 @@ color@^3.0.0:
19221916
color-convert "^1.9.1"
19231917
color-string "^1.5.2"
19241918

1925-
colors@~1.1.2:
1926-
version "1.1.2"
1927-
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
1928-
19291919
combined-stream@^1.0.6, combined-stream@~1.0.6:
19301920
version "1.0.8"
19311921
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -2192,10 +2182,6 @@ css-select-base-adapter@^0.1.1:
21922182
resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
21932183
integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
21942184

2195-
css-select-base-adapter@~0.1.0:
2196-
version "0.1.0"
2197-
resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz#0102b3d14630df86c3eb9fa9f5456270106cf990"
2198-
21992185
css-select@^2.0.0:
22002186
version "2.0.2"
22012187
resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz#ab4386cec9e1f668855564b17c3733b43b2a5ede"
@@ -2216,54 +2202,19 @@ css-select@~1.2.0:
22162202
domutils "1.5.1"
22172203
nth-check "~1.0.1"
22182204

2219-
css-select@~1.3.0-rc0:
2220-
version "1.3.0-rc0"
2221-
resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.3.0-rc0.tgz#6f93196aaae737666ea1036a8cb14a8fcb7a9231"
2222-
dependencies:
2223-
boolbase "^1.0.0"
2224-
css-what "2.1"
2225-
domutils "1.5.1"
2226-
nth-check "^1.0.1"
2227-
2228-
[email protected]:
2229-
version "1.0.0-alpha.27"
2230-
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.27.tgz#f211526909c7dc940843d83b9376ed98ddb8de47"
2231-
dependencies:
2232-
mdn-data "^1.0.0"
2233-
source-map "^0.5.3"
2234-
2235-
[email protected]:
2236-
version "1.0.0-alpha.29"
2237-
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
2238-
integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==
2239-
dependencies:
2240-
mdn-data "~1.1.0"
2241-
source-map "^0.5.3"
2242-
2243-
[email protected]:
2244-
version "1.0.0-alpha.33"
2245-
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.33.tgz#970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e"
2246-
integrity sha512-SPt57bh5nQnpsTBsx/IXbO14sRc9xXu5MtMAVuo0BaQQmyf0NupNPPSoMaqiAF5tDFafYsTkfeH4Q/HCKXkg4w==
2205+
[email protected]:
2206+
version "1.0.0-alpha.37"
2207+
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
2208+
integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==
22472209
dependencies:
22482210
mdn-data "2.0.4"
2249-
source-map "^0.5.3"
2250-
2251-
[email protected]:
2252-
version "1.0.0-alpha25"
2253-
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha25.tgz#1bbfabfbf6eeef4f01d9108ff2edd0be2fe35597"
2254-
dependencies:
2255-
mdn-data "^1.0.0"
2256-
source-map "^0.5.3"
2211+
source-map "^0.6.1"
22572212

22582213
css-unit-converter@^1.1.1:
22592214
version "1.1.1"
22602215
resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
22612216
integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
22622217

2263-
css-url-regex@^1.1.0:
2264-
version "1.1.0"
2265-
resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec"
2266-
22672218
[email protected]:
22682219
version "2.1.0"
22692220
resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
@@ -2346,18 +2297,12 @@ cssnano@^4.1.10:
23462297
is-resolvable "^1.0.0"
23472298
postcss "^7.0.0"
23482299

2349-
csso@^3.5.0:
2350-
version "3.5.0"
2351-
resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.0.tgz#acdbba5719e2c87bc801eadc032764b2e4b9d4e7"
2352-
dependencies:
2353-
css-tree "1.0.0-alpha.27"
2354-
2355-
csso@^3.5.1:
2356-
version "3.5.1"
2357-
resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
2358-
integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==
2300+
csso@^4.0.2:
2301+
version "4.0.2"
2302+
resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz#e5f81ab3a56b8eefb7f0092ce7279329f454de3d"
2303+
integrity sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==
23592304
dependencies:
2360-
css-tree "1.0.0-alpha.29"
2305+
css-tree "1.0.0-alpha.37"
23612306

23622307
currently-unhandled@^0.4.1:
23632308
version "0.4.1"
@@ -2859,7 +2804,7 @@ es-abstract@^1.12.0:
28592804
string.prototype.trimleft "^2.1.0"
28602805
string.prototype.trimright "^2.1.0"
28612806

2862-
es-abstract@^1.5.1, es-abstract@^1.6.1:
2807+
es-abstract@^1.5.1:
28632808
version "1.10.0"
28642809
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
28652810
dependencies:
@@ -3432,7 +3377,7 @@ fsevents@~2.1.0:
34323377
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.0.tgz#ce1a5f9ac71c6d75278b0c5bd236d7dfece4cbaa"
34333378
integrity sha512-+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ==
34343379

3435-
function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
3380+
function-bind@^1.0.2, function-bind@^1.1.1:
34363381
version "1.1.1"
34373382
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
34383383

@@ -4525,13 +4470,6 @@ [email protected], js-yaml@^3.10.0, js-yaml@^3.13.1, js-yaml@^3.8.1:
45254470
argparse "^1.0.7"
45264471
esprima "^4.0.0"
45274472

4528-
js-yaml@~3.10.0:
4529-
version "3.10.0"
4530-
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
4531-
dependencies:
4532-
argparse "^1.0.7"
4533-
esprima "^4.0.0"
4534-
45354473
jsbn@~0.1.0:
45364474
version "0.1.1"
45374475
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -4948,15 +4886,6 @@ [email protected]:
49484886
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
49494887
integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
49504888

4951-
mdn-data@^1.0.0:
4952-
version "1.1.0"
4953-
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.0.tgz#a7056319da95a2d0881267d7263075042eb061e2"
4954-
4955-
mdn-data@~1.1.0:
4956-
version "1.1.4"
4957-
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
4958-
integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
4959-
49604889
[email protected]:
49614890
version "0.3.0"
49624891
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -5365,12 +5294,6 @@ npmlog@^4.0.2:
53655294
gauge "~2.7.3"
53665295
set-blocking "~2.0.0"
53675296

5368-
nth-check@^1.0.1:
5369-
version "1.0.1"
5370-
resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
5371-
dependencies:
5372-
boolbase "~1.0.0"
5373-
53745297
nth-check@^1.0.2, nth-check@~1.0.1:
53755298
version "1.0.2"
53765299
resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -5448,15 +5371,6 @@ object.pick@^1.2.0, object.pick@^1.3.0:
54485371
dependencies:
54495372
isobject "^3.0.1"
54505373

5451-
object.values@^1.0.4:
5452-
version "1.0.4"
5453-
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
5454-
dependencies:
5455-
define-properties "^1.1.2"
5456-
es-abstract "^1.6.1"
5457-
function-bind "^1.1.0"
5458-
has "^1.0.1"
5459-
54605374
object.values@^1.1.0:
54615375
version "1.1.0"
54625376
resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
@@ -7017,7 +6931,7 @@ source-map-url@^0.4.0:
70176931
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
70186932
integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
70196933

7020-
source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6:
6934+
source-map@^0.5.0, source-map@^0.5.6:
70216935
version "0.5.7"
70226936
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
70236937

@@ -7099,10 +7013,6 @@ stable@^0.1.8:
70997013
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
71007014
integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
71017015

7102-
stable@~0.1.6:
7103-
version "0.1.6"
7104-
resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.6.tgz#910f5d2aed7b520c6e777499c1f32e139fdecb10"
7105-
71067016
static-extend@^0.1.1:
71077017
version "0.1.2"
71087018
resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -7308,17 +7218,17 @@ supports-color@^5.3.0:
73087218
dependencies:
73097219
has-flag "^3.0.0"
73107220

7311-
[email protected], svgo@^1.0.5:
7312-
version "1.3.0"
7313-
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz#bae51ba95ded9a33a36b7c46ce9c359ae9154313"
7314-
integrity sha512-MLfUA6O+qauLDbym+mMZgtXCGRfIxyQoeH6IKVcFslyODEe/ElJNwr0FohQ3xG4C6HK6bk3KYPPXwHVJk3V5NQ==
7221+
[email protected].2, svgo@^1.0.0, svgo@^1.0.5:
7222+
version "1.3.2"
7223+
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
7224+
integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==
73157225
dependencies:
73167226
chalk "^2.4.1"
73177227
coa "^2.0.2"
73187228
css-select "^2.0.0"
73197229
css-select-base-adapter "^0.1.1"
7320-
css-tree "1.0.0-alpha.33"
7321-
csso "^3.5.1"
7230+
css-tree "1.0.0-alpha.37"
7231+
csso "^4.0.2"
73227232
js-yaml "^3.13.1"
73237233
mkdirp "~0.5.1"
73247234
object.values "^1.1.0"
@@ -7327,25 +7237,6 @@ [email protected], svgo@^1.0.5:
73277237
unquote "~1.1.1"
73287238
util.promisify "~1.0.0"
73297239

7330-
svgo@^1.0.0:
7331-
version "1.0.5"
7332-
resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.0.5.tgz#7040364c062a0538abacff4401cea6a26a7a389a"
7333-
dependencies:
7334-
coa "~2.0.1"
7335-
colors "~1.1.2"
7336-
css-select "~1.3.0-rc0"
7337-
css-select-base-adapter "~0.1.0"
7338-
css-tree "1.0.0-alpha25"
7339-
css-url-regex "^1.1.0"
7340-
csso "^3.5.0"
7341-
js-yaml "~3.10.0"
7342-
mkdirp "~0.5.1"
7343-
object.values "^1.0.4"
7344-
sax "~1.2.4"
7345-
stable "~0.1.6"
7346-
unquote "~1.1.1"
7347-
util.promisify "~1.0.0"
7348-
73497240
tapable@^1.0.0, tapable@^1.1.3:
73507241
version "1.1.3"
73517242
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"

0 commit comments

Comments
 (0)