@umijs/bundler-webpack 4.0.0-canary.20220323.1 → 4.0.0-canary.20220412.2

package/client/client/client.js

@@ -1,18 +1,34 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import stripAnsi from '@umijs/utils/compiled/strip-ansi';
 // @ts-ignore
 import * as ErrorOverlay from 'react-error-overlay';
 import { MESSAGE_TYPE } from '../constants';
 import { formatWebpackMessages } from '../utils/formatWebpackMessages';
 console.log('[webpack] connecting...');
+function getSocketHost() {
+    let l = location;
+    if (process.env.SOCKET_SERVER) {
+        l = new URL(process.env.SOCKET_SERVER);
+    }
+    const host = l.host;
+    const isHttps = l.protocol === 'https:';
+    return `${isHttps ? 'wss' : 'ws'}://${host}`;
+}
 let pingTimer = null;
-const host = location.host;
-const wsUrl = `ws://${host}`;
 let isFirstCompilation = true;
 let mostRecentCompilationHash = null;
 let hasCompileErrors = false;
 let hadRuntimeError = false;
-const socket = new WebSocket(wsUrl, 'webpack-hmr');
-socket.addEventListener('message', async ({ data }) => {
+const socket = new WebSocket(getSocketHost(), 'webpack-hmr');
+socket.addEventListener('message', ({ data }) => __awaiter(void 0, void 0, void 0, function* () {
     data = JSON.parse(data);
     if (data.type === 'connected') {
         console.log(`[webpack] connected.`);
@@ -23,26 +39,28 @@ socket.addEventListener('message', async ({ data }) => {
     else {
         handleMessage(data).catch(console.error);
     }
-});
-async function waitForSuccessfulPing(ms = 1000) {
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-        try {
-            await fetch(`/__umi_ping`);
-            break;
-        }
-        catch (e) {
-            await new Promise((resolve) => setTimeout(resolve, ms));
+}));
+function waitForSuccessfulPing(ms = 1000) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // eslint-disable-next-line no-constant-condition
+        while (true) {
+            try {
+                yield fetch(`/__umi_ping`);
+                break;
+            }
+            catch (e) {
+                yield new Promise((resolve) => setTimeout(resolve, ms));
+            }
         }
-    }
+    });
 }
-socket.addEventListener('close', async () => {
+socket.addEventListener('close', () => __awaiter(void 0, void 0, void 0, function* () {
     if (pingTimer)
         clearInterval(pingTimer);
     console.info('[webpack] Dev server disconnected. Polling for restart...');
-    await waitForSuccessfulPing();
+    yield waitForSuccessfulPing();
     location.reload();
-});
+}));
 ErrorOverlay.startReportingRuntimeErrors({
     onError: function () {
         hadRuntimeError = true;
@@ -180,23 +198,25 @@ function tryApplyUpdates(onHotUpdateSuccess) {
         handleApplyUpdates(err, null);
     });
 }
-async function handleMessage(payload) {
-    // console.log('[payload]', payload);
-    switch (payload.type) {
-        case MESSAGE_TYPE.hash:
-            handleAvailableHash(payload.data);
-            break;
-        case MESSAGE_TYPE.stillOk:
-        case MESSAGE_TYPE.ok:
-            handleSuccess();
-            break;
-        case MESSAGE_TYPE.errors:
-            handleErrors(payload.data);
-            break;
-        case MESSAGE_TYPE.warnings:
-            handleWarnings(payload.data);
-            break;
-        default:
-        // Do nothing
-    }
+function handleMessage(payload) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // console.log('[payload]', payload);
+        switch (payload.type) {
+            case MESSAGE_TYPE.hash:
+                handleAvailableHash(payload.data);
+                break;
+            case MESSAGE_TYPE.stillOk:
+            case MESSAGE_TYPE.ok:
+                handleSuccess();
+                break;
+            case MESSAGE_TYPE.errors:
+                handleErrors(payload.data);
+                break;
+            case MESSAGE_TYPE.warnings:
+                handleWarnings(payload.data);
+                break;
+            default:
+            // Do nothing
+        }
+    });
 }

package/client/constants.js

@@ -10,3 +10,12 @@ export var MESSAGE_TYPE;
     MESSAGE_TYPE["stillOk"] = "still-ok";
     MESSAGE_TYPE["invalid"] = "invalid";
 })(MESSAGE_TYPE || (MESSAGE_TYPE = {}));
+export const DEFAULT_BROWSER_TARGETS = {
+    chrome: 80,
+};
+export const DEFAULT_ESBUILD_TARGET_KEYS = [
+    'chrome',
+    'firefox',
+    'edge',
+    'safari',
+];

package/compiled/copy-webpack-plugin/{576.index.js → 939.index.js}

@@ -1,14 +1,14 @@
-exports.id = 576;
-exports.ids = [576];
+exports.id = 939;
+exports.ids = [939];
 exports.modules = {
 
-/***/ 1199:
+/***/ 5352:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 "use strict";
 
 const path = __webpack_require__(1017);
-const pathType = __webpack_require__(6163);
+const pathType = __webpack_require__(9223);
 
 const getExtensions = extensions => extensions.length > 1 ? `{${extensions.join(',')}}` : extensions[0];
 
@@ -85,7 +85,7 @@ module.exports.sync = (input, options) => {
 
 /***/ }),
 
-/***/ 6339:
+/***/ 6302:
 /***/ (function(module) {
 
 // A simple implementation of make-array
@@ -695,7 +695,7 @@ if (
 
 /***/ }),
 
-/***/ 6163:
+/***/ 9223:
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -746,7 +746,7 @@ exports.isSymlinkSync = isTypeSync.bind(null, 'lstatSync', 'isSymbolicLink');
 
 /***/ }),
 
-/***/ 3576:
+/***/ 1939:
 /***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -772,11 +772,11 @@ const arrayUnion = (...arguments_) => [...new Set(arguments_.flat())];
 /* harmony default export */ var array_union = (arrayUnion);
 
 // EXTERNAL MODULE: ../../node_modules/.pnpm/merge2@1.4.1/node_modules/merge2/index.js
-var merge2 = __webpack_require__(3891);
+var merge2 = __webpack_require__(1382);
 // EXTERNAL MODULE: ../../node_modules/.pnpm/fast-glob@3.2.11/node_modules/fast-glob/out/index.js
-var out = __webpack_require__(9918);
+var out = __webpack_require__(3924);
 // EXTERNAL MODULE: ../../node_modules/.pnpm/dir-glob@3.0.1/node_modules/dir-glob/index.js
-var dir_glob = __webpack_require__(1199);
+var dir_glob = __webpack_require__(5352);
 // EXTERNAL MODULE: external "node:url"
 var external_node_url_ = __webpack_require__(1041);
 ;// CONCATENATED MODULE: ../../node_modules/.pnpm/globby@12.2.0/node_modules/globby/to-path.js
@@ -801,7 +801,7 @@ var external_node_process_ = __webpack_require__(7742);
 // EXTERNAL MODULE: external "node:path"
 var external_node_path_ = __webpack_require__(9411);
 // EXTERNAL MODULE: ../../node_modules/.pnpm/ignore@5.2.0/node_modules/ignore/index.js
-var ignore = __webpack_require__(6339);
+var ignore = __webpack_require__(6302);
 ;// CONCATENATED MODULE: ../../node_modules/.pnpm/slash@4.0.0/node_modules/slash/index.js
 function slash(path) {
 	const isExtendedLengthPath = /^\\\\\?\\/.test(path);