Skip to content

Commit b4ea597

Browse files
authored
Merge pull request #540 from ckeditor/t/ckeditor5/1945
Other: Bumped style-loader to v1.0.0. Aligned the webpack config to the new loader API. See ckeditor/ckeditor5#1945.
2 parents 6d8112e + 793b9bb commit b4ea597

File tree

3 files changed

+48
-47
lines changed

3 files changed

+48
-47
lines changed

packages/ckeditor5-dev-tests/lib/utils/manual-tests/getwebpackconfig.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,7 @@ module.exports = function getWebpackConfigForManualTests( options ) {
5555
test: /\.css$/,
5656
use: [
5757
{
58-
loader: 'style-loader',
59-
options: {
60-
// Note: "singleton" option does not work when sourceMap is enabled.
61-
// See: https://github.com/webpack-contrib/style-loader/issues/134
62-
sourceMap: true
63-
}
58+
loader: 'style-loader'
6459
},
6560
{
6661
loader: 'postcss-loader',

packages/ckeditor5-dev-tests/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
"mocha": "^6.1.4",
4242
"mrgit": "^1.0.0",
4343
"postcss-loader": "^3.0.0",
44-
"raw-loader": "^1.0.0",
44+
"raw-loader": "^3.1.0",
4545
"sinon": "^7.3.2",
4646
"slack-notify": "^0.1.7",
47-
"style-loader": "^0.23.0",
48-
"webpack": "^4.15.0"
47+
"style-loader": "1.0.0",
48+
"webpack": "^4.39.1"
4949
},
5050
"devDependencies": {
5151
"mockery": "^2.1.0",

yarn.lock

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,9 +1242,9 @@ acorn@^3.0.4, acorn@^3.3.0:
12421242
integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
12431243

12441244
acorn@^6.0.7, acorn@^6.2.1:
1245-
version "6.2.1"
1246-
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz#3ed8422d6dec09e6121cc7a843ca86a330a86b51"
1247-
integrity sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==
1245+
version "6.3.0"
1246+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
1247+
integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
12481248

12491249
12501250
version "0.8.2"
@@ -2791,9 +2791,9 @@ core-js@^2.4.0, core-js@^2.5.0:
27912791
integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
27922792

27932793
core-js@^3.1.3:
2794-
version "3.2.0"
2795-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.0.tgz#0a835fdf6aa677fff83a823a7b5276c9e7cebb76"
2796-
integrity sha512-gybgLzmr7SQRSF6UzGYXducx4eE10ONQlyEnQoqiGPbmbn7zLkb73tPfc4YbZN0lvcTQwoLNPjq4RuCaCumGyQ==
2794+
version "3.2.1"
2795+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09"
2796+
integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==
27972797

27982798
[email protected], core-util-is@~1.0.0:
27992799
version "1.0.2"
@@ -3446,9 +3446,9 @@ [email protected]:
34463446
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
34473447

34483448
electron-to-chromium@^1.3.191:
3449-
version "1.3.224"
3450-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.224.tgz#511abb2829a58c5ddb36c319094fe936bc82e3cd"
3451-
integrity sha512-vTH9UcMbi53x/pZKQrEcD83obE8agqQwUIx/G03/mpE1vzLm0KA3cHwuZXCysvxI1gXfNjV7Nu7Vjtp89kDzmg==
3449+
version "1.3.225"
3450+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.225.tgz#c6786475b5eb5f491ade01a78b82ba2c5bfdf72b"
3451+
integrity sha512-7W/L3jw7HYE+tUPbcVOGBmnSrlUmyZ/Uyg24QS7Vx0a9KodtNrN0r0Q/LyGHrcYMtw2rv7E49F/vTXwlV/fuaA==
34523452

34533453
elegant-spinner@^1.0.1:
34543454
version "1.0.1"
@@ -3672,9 +3672,9 @@ [email protected]:
36723672
source-map "~0.2.0"
36733673

36743674
escodegen@^1.9.0:
3675-
version "1.11.1"
3676-
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
3677-
integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
3675+
version "1.12.0"
3676+
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541"
3677+
integrity sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==
36783678
dependencies:
36793679
esprima "^3.1.3"
36803680
estraverse "^4.2.0"
@@ -4646,11 +4646,9 @@ home-or-tmp@^2.0.0:
46464646
os-tmpdir "^1.0.1"
46474647

46484648
hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
4649-
version "2.8.2"
4650-
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.2.tgz#a35c3f355ac1249f1093c0c2a542ace8818c171a"
4651-
integrity sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==
4652-
dependencies:
4653-
lru-cache "^5.1.1"
4649+
version "2.8.4"
4650+
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.4.tgz#44119abaf4bc64692a16ace34700fed9c03e2546"
4651+
integrity sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==
46544652

46554653
hsl-regex@^1.0.0:
46564654
version "1.0.0"
@@ -6729,9 +6727,9 @@ npm-bundled@^1.0.1:
67296727
integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
67306728

67316729
npm-lifecycle@^3.1.2:
6732-
version "3.1.2"
6733-
resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.2.tgz#06f2253ea3b9e122ce3e55e3496670a810afcc84"
6734-
integrity sha512-nhfOcoTHrW1lJJlM2o77vTE2RWR4YOVyj7YzmY0y5itsMjEuoJHteio/ez0BliENEPsNxIUQgwhyEW9dShj3Ww==
6730+
version "3.1.3"
6731+
resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.3.tgz#09e9b0b6686e85fd53bab82364386222d97a3730"
6732+
integrity sha512-M0QmmqbEHBXxDrmc6X3+eKjW9+F7Edg1ENau92WkYw1sox6wojHzEZJIRm1ItljEiaigZlKL8mXni/4ylAy1Dg==
67356733
dependencies:
67366734
byline "^5.0.0"
67376735
graceful-fs "^4.1.15"
@@ -7748,9 +7746,9 @@ protoduck@^5.0.1:
77487746
genfun "^5.0.0"
77497747

77507748
proxyquire@^2.1.0:
7751-
version "2.1.2"
7752-
resolved "https://registry.yarnpkg.com/proxyquire/-/proxyquire-2.1.2.tgz#287acf81330723fdb7ab1be69907169e61a4e19f"
7753-
integrity sha512-ovE7O5UhsDE3pBtf8YgTr+w3S0xCMYAbUAbJUbqHODB+JK1jyZnvjbSGKe54ewyyEHXc6uZfZNYhlSxYJDZQ8A==
7749+
version "2.1.3"
7750+
resolved "https://registry.yarnpkg.com/proxyquire/-/proxyquire-2.1.3.tgz#2049a7eefa10a9a953346a18e54aab2b4268df39"
7751+
integrity sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==
77547752
dependencies:
77557753
fill-keys "^1.0.2"
77567754
module-not-found-error "^1.0.1"
@@ -7888,13 +7886,13 @@ [email protected]:
78887886
iconv-lite "0.4.24"
78897887
unpipe "1.0.0"
78907888

7891-
raw-loader@^1.0.0:
7892-
version "1.0.0"
7893-
resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405"
7894-
integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==
7889+
raw-loader@^3.1.0:
7890+
version "3.1.0"
7891+
resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f"
7892+
integrity sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==
78957893
dependencies:
78967894
loader-utils "^1.1.0"
7897-
schema-utils "^1.0.0"
7895+
schema-utils "^2.0.1"
78987896

78997897
rc@^1.2.7:
79007898
version "1.2.8"
@@ -8344,15 +8342,23 @@ schema-utils@^1.0.0:
83448342
ajv-errors "^1.0.0"
83458343
ajv-keywords "^3.1.0"
83468344

8345+
schema-utils@^2.0.1:
8346+
version "2.1.0"
8347+
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.1.0.tgz#940363b6b1ec407800a22951bdcc23363c039393"
8348+
integrity sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==
8349+
dependencies:
8350+
ajv "^6.1.0"
8351+
ajv-keywords "^3.1.0"
8352+
83478353
semver-compare@^1.0.0:
83488354
version "1.0.0"
83498355
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
83508356
integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
83518357

83528358
"semver@2 || 3 || 4 || 5", "[email protected] || 3.x || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
8353-
version "5.7.0"
8354-
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
8355-
integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
8359+
version "5.7.1"
8360+
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
8361+
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
83568362

83578363
semver@^6.0.0, semver@^6.2.0:
83588364
version "6.3.0"
@@ -8919,13 +8925,13 @@ strong-log-transformer@^2.0.0:
89198925
minimist "^1.2.0"
89208926
through "^2.3.4"
89218927

8922-
style-loader@^0.23.0:
8923-
version "0.23.1"
8924-
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
8925-
integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
8928+
style-loader@1.0.0:
8929+
version "1.0.0"
8930+
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz#1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"
8931+
integrity sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==
89268932
dependencies:
8927-
loader-utils "^1.1.0"
8928-
schema-utils "^1.0.0"
8933+
loader-utils "^1.2.3"
8934+
schema-utils "^2.0.1"
89298935

89308936
stylehacks@^4.0.0:
89318937
version "4.0.3"
@@ -9673,7 +9679,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
96739679
source-list-map "^2.0.0"
96749680
source-map "~0.6.1"
96759681

9676-
webpack@^4.15.0:
9682+
webpack@^4.39.1:
96779683
version "4.39.1"
96789684
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.39.1.tgz#60ed9fb2b72cd60f26ea526c404d2a4cc97a1bd8"
96799685
integrity sha512-/LAb2TJ2z+eVwisldp3dqTEoNhzp/TLCZlmZm3GGGAlnfIWDgOEE758j/9atklNLfRyhKbZTCOIoPqLJXeBLbQ==

0 commit comments

Comments
 (0)