Skip to content

chore(deps): update #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 15, 2022
Merged

chore(deps): update #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f90eda
chore(deps): update
alexander-akait Jun 15, 2022
3aeea18
test: fix
alexander-akait Jun 15, 2022
f64fee2
ci: update
alexander-akait Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [12.x, 14.x, 16.x, 17.x]
node-version: [12.x, 14.x, 16.x, 18.x]

runs-on: ${{ matrix.os }}

Expand Down
1 change: 0 additions & 1 deletion jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
module.exports = {
testURL: "http://localhost/",
transformIgnorePatterns: ["/node_modules/", "<rootDir>/dist/"],
watchPathIgnorePatterns: ["<rootDir>/test/js"],
setupFilesAfterEnv: ["<rootDir>/setupTest.js"],
Expand Down
8,294 changes: 3,871 additions & 4,423 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
"@babel/core": "^7.17.5",
"@babel/eslint-parser": "^7.17.0",
"@babel/preset-env": "^7.16.11",
"@commitlint/cli": "^16.2.1",
"@commitlint/config-conventional": "^16.2.1",
"@commitlint/cli": "^17.0.2",
"@commitlint/config-conventional": "^17.0.2",
"@webpack-contrib/eslint-config-webpack": "^3.0.0",
"babel-jest": "^27.5.1",
"babel-jest": "^28.1.1",
"bootstrap": "^4.6.0",
"cross-env": "^7.0.3",
"css-loader": "^6.7.0",
Expand All @@ -70,7 +70,8 @@
"eslint-plugin-import": "^2.25.4",
"file-loader": "^6.2.0",
"husky": "^7.0.0",
"jest": "^27.5.1",
"jest": "^28.1.1",
"jest-environment-jsdom": "^28.1.1",
"jsdom": "^19.0.0",
"lint-staged": "^12.3.4",
"memfs": "^3.4.1",
Expand Down
53 changes: 35 additions & 18 deletions test/cases/hmr/expected/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,8 @@ __webpack_require__.r(__webpack_exports__);
/******/ var currentStatus = "idle";
/******/
/******/ // while downloading
/******/ var blockingPromises;
/******/ var blockingPromises = 0;
/******/ var blockingPromisesWaiting = [];
/******/
/******/ // The update info
/******/ var currentUpdateApplyHandlers;
Expand Down Expand Up @@ -723,29 +724,40 @@ __webpack_require__.r(__webpack_exports__);
/******/ return Promise.all(results);
/******/ }
/******/
/******/ function unblock() {
/******/ if (--blockingPromises === 0) {
/******/ setStatus("ready").then(function () {
/******/ if (blockingPromises === 0) {
/******/ var list = blockingPromisesWaiting;
/******/ blockingPromisesWaiting = [];
/******/ for (var i = 0; i < list.length; i++) {
/******/ list[i]();
/******/ }
/******/ }
/******/ });
/******/ }
/******/ }
/******/
/******/ function trackBlockingPromise(promise) {
/******/ switch (currentStatus) {
/******/ case "ready":
/******/ setStatus("prepare");
/******/ blockingPromises.push(promise);
/******/ waitForBlockingPromises(function () {
/******/ return setStatus("ready");
/******/ });
/******/ return promise;
/******/ /* fallthrough */
/******/ case "prepare":
/******/ blockingPromises.push(promise);
/******/ blockingPromises++;
/******/ promise.then(unblock, unblock);
/******/ return promise;
/******/ default:
/******/ return promise;
/******/ }
/******/ }
/******/
/******/ function waitForBlockingPromises(fn) {
/******/ if (blockingPromises.length === 0) return fn();
/******/ var blocker = blockingPromises;
/******/ blockingPromises = [];
/******/ return Promise.all(blocker).then(function () {
/******/ return waitForBlockingPromises(fn);
/******/ if (blockingPromises === 0) return fn();
/******/ return new Promise(function (resolve) {
/******/ blockingPromisesWaiting.push(function () {
/******/ resolve(fn());
/******/ });
/******/ });
/******/ }
/******/
Expand All @@ -766,7 +778,6 @@ __webpack_require__.r(__webpack_exports__);
/******/
/******/ return setStatus("prepare").then(function () {
/******/ var updatedModules = [];
/******/ blockingPromises = [];
/******/ currentUpdateApplyHandlers = [];
/******/
/******/ return Promise.all(
Expand Down Expand Up @@ -803,7 +814,11 @@ __webpack_require__.r(__webpack_exports__);
/******/ function hotApply(options) {
/******/ if (currentStatus !== "ready") {
/******/ return Promise.resolve().then(function () {
/******/ throw new Error("apply() is only allowed in ready status");
/******/ throw new Error(
/******/ "apply() is only allowed in ready status (state: " +
/******/ currentStatus +
/******/ ")"
/******/ );
/******/ });
/******/ }
/******/ return internalApply(options);
Expand Down Expand Up @@ -1024,7 +1039,8 @@ __webpack_require__.r(__webpack_exports__);
/******/
/******/ var currentUpdatedModulesList;
/******/ var waitingUpdateResolves = {};
/******/ function loadUpdateChunk(chunkId) {
/******/ function loadUpdateChunk(chunkId, updatedModulesList) {
/******/ currentUpdatedModulesList = updatedModulesList;
/******/ return new Promise((resolve, reject) => {
/******/ waitingUpdateResolves[chunkId] = resolve;
/******/ // start update chunk loading
Expand Down Expand Up @@ -1487,15 +1503,16 @@ __webpack_require__.r(__webpack_exports__);
/******/ ) {
/******/ promises.push(loadUpdateChunk(chunkId, updatedModulesList));
/******/ currentUpdateChunks[chunkId] = true;
/******/ } else {
/******/ currentUpdateChunks[chunkId] = false;
/******/ }
/******/ });
/******/ if (__webpack_require__.f) {
/******/ __webpack_require__.f.jsonpHmr = function (chunkId, promises) {
/******/ if (
/******/ currentUpdateChunks &&
/******/ !__webpack_require__.o(currentUpdateChunks, chunkId) &&
/******/ __webpack_require__.o(installedChunks, chunkId) &&
/******/ installedChunks[chunkId] !== undefined
/******/ __webpack_require__.o(currentUpdateChunks, chunkId) &&
/******/ !currentUpdateChunks[chunkId]
/******/ ) {
/******/ promises.push(loadUpdateChunk(chunkId));
/******/ currentUpdateChunks[chunkId] = true;
Expand Down
2 changes: 1 addition & 1 deletion test/cases/publicpath-function-2/expected/webpack-5/nested/again/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
body {
background: green;
background-image: url(http://example.com/a825917f3984c437782f/c9e192c015437a21dea1.svg);
background-image: url(http://example.com/47e6924dce47554c1058/c9e192c015437a21dea1.svg);
}

2 changes: 1 addition & 1 deletion test/cases/publicpath-function-2/expected/webpack-5/nested/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
body {
background: red;
background-image: url(http://example.com/72e334a82b025af50931/c9e192c015437a21dea1.svg);
background-image: url(http://example.com/220588b7ee0332ae20e5/c9e192c015437a21dea1.svg);
}