diff --git a/.eslintrc.json b/.eslintrc.json index e1aedbdd..198786a1 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -12,8 +12,7 @@ { "files": ["client/**/*.js", "overlay/**/*.js", "lib/runtime/**/*.js", "sockets/**/*.js"], "parserOptions": { - "ecmaVersion": 2015, - "sourceType": "module" + "ecmaVersion": 2015 }, "env": { "browser": true, diff --git a/client/ErrorOverlayEntry.js b/client/ErrorOverlayEntry.js index 8d7cd146..d6dfdb93 100644 --- a/client/ErrorOverlayEntry.js +++ b/client/ErrorOverlayEntry.js @@ -1,9 +1,9 @@ /* global __react_refresh_error_overlay__, __react_refresh_socket__, __resourceQuery */ -import { handleError, handleUnhandledRejection } from './utils/errorEventHandlers.js'; -import formatWebpackErrors from './utils/formatWebpackErrors.js'; -import runWithPatchedUrl from './utils/patchUrl.cjs'; -import runWithRetry from './utils/retry.js'; +const { handleError, handleUnhandledRejection } = require('./utils/errorEventHandlers.js'); +const formatWebpackErrors = require('./utils/formatWebpackErrors.js'); +const runWithPatchedUrl = require('./utils/patchUrl.cjs'); +const runWithRetry = require('./utils/retry.js'); // Setup error states let isHotReload = false; @@ -72,27 +72,29 @@ function compileMessageHandler(message) { } } -if (process.env.NODE_ENV !== 'production' && typeof window !== 'undefined') { - runWithPatchedUrl(function setupOverlay() { - // Only register if no other overlay have been registered - if (!window.__reactRefreshOverlayInjected && __react_refresh_socket__) { - // Registers handlers for compile errors with retry - - // This is to prevent mismatching injection order causing errors to be thrown - runWithRetry(function initSocket() { - __react_refresh_socket__.init(compileMessageHandler, __resourceQuery); - }, 3); - // Registers handlers for runtime errors - handleError(function handleError(error) { - hasRuntimeErrors = true; - __react_refresh_error_overlay__.handleRuntimeError(error); - }); - handleUnhandledRejection(function handleUnhandledPromiseRejection(error) { - hasRuntimeErrors = true; - __react_refresh_error_overlay__.handleRuntimeError(error); - }); +if (process.env.NODE_ENV !== 'production') { + if (typeof window !== 'undefined') { + runWithPatchedUrl(function setupOverlay() { + // Only register if no other overlay have been registered + if (!window.__reactRefreshOverlayInjected && __react_refresh_socket__) { + // Registers handlers for compile errors with retry - + // This is to prevent mismatching injection order causing errors to be thrown + runWithRetry(function initSocket() { + __react_refresh_socket__.init(compileMessageHandler, __resourceQuery); + }, 3); + // Registers handlers for runtime errors + handleError(function handleError(error) { + hasRuntimeErrors = true; + __react_refresh_error_overlay__.handleRuntimeError(error); + }); + handleUnhandledRejection(function handleUnhandledPromiseRejection(error) { + hasRuntimeErrors = true; + __react_refresh_error_overlay__.handleRuntimeError(error); + }); - // Mark overlay as injected to prevent double-injection - window.__reactRefreshOverlayInjected = true; - } - }); + // Mark overlay as injected to prevent double-injection + window.__reactRefreshOverlayInjected = true; + } + }); + } } diff --git a/client/LegacyWDSSocketEntry.js b/client/LegacyWDSSocketEntry.js index a2021382..1d055181 100644 --- a/client/LegacyWDSSocketEntry.js +++ b/client/LegacyWDSSocketEntry.js @@ -1,4 +1,4 @@ -import * as SockJS from 'sockjs-client/dist/sockjs.js'; +const SockJS = require('sockjs-client/dist/sockjs.js'); /** * A SockJS client adapted for use with webpack-dev-server. diff --git a/client/ReactRefreshEntry.js b/client/ReactRefreshEntry.js index 0f9bafb7..980073bc 100644 --- a/client/ReactRefreshEntry.js +++ b/client/ReactRefreshEntry.js @@ -1,21 +1,23 @@ /* global __react_refresh_library__ */ -import safeThis from 'core-js-pure/features/global-this'; -import * as RefreshRuntime from 'react-refresh/runtime'; +const safeThis = require('core-js-pure/features/global-this.js'); +const RefreshRuntime = require('react-refresh/runtime.js'); -if (process.env.NODE_ENV !== 'production' && typeof safeThis !== 'undefined') { - var $RefreshInjected$ = '__reactRefreshInjected'; - // Namespace the injected flag (if necessary) for monorepo compatibility - if (typeof __react_refresh_library__ !== 'undefined' && __react_refresh_library__) { - $RefreshInjected$ += '_' + __react_refresh_library__; - } +if (process.env.NODE_ENV !== 'production') { + if (typeof safeThis !== 'undefined') { + var $RefreshInjected$ = '__reactRefreshInjected'; + // Namespace the injected flag (if necessary) for monorepo compatibility + if (typeof __react_refresh_library__ !== 'undefined' && __react_refresh_library__) { + $RefreshInjected$ += '_' + __react_refresh_library__; + } - // Only inject the runtime if it hasn't been injected - if (!safeThis[$RefreshInjected$]) { - // Inject refresh runtime into global scope - RefreshRuntime.injectIntoGlobalHook(safeThis); + // Only inject the runtime if it hasn't been injected + if (!safeThis[$RefreshInjected$]) { + // Inject refresh runtime into global scope + RefreshRuntime.injectIntoGlobalHook(safeThis); - // Mark the runtime as injected to prevent double-injection - safeThis[$RefreshInjected$] = true; + // Mark the runtime as injected to prevent double-injection + safeThis[$RefreshInjected$] = true; + } } } diff --git a/client/utils/errorEventHandlers.js b/client/utils/errorEventHandlers.js index a0ebb9bf..90b5ebb0 100644 --- a/client/utils/errorEventHandlers.js +++ b/client/utils/errorEventHandlers.js @@ -90,8 +90,13 @@ function createWindowEventHandler(eventType, createHandler) { return register; } -export const handleError = createWindowEventHandler('error', createErrorHandler); -export const handleUnhandledRejection = createWindowEventHandler( +const handleError = createWindowEventHandler('error', createErrorHandler); +const handleUnhandledRejection = createWindowEventHandler( 'unhandledrejection', createRejectionHandler ); + +module.exports = { + handleError: handleError, + handleUnhandledRejection: handleUnhandledRejection, +}; diff --git a/client/utils/formatWebpackErrors.js b/client/utils/formatWebpackErrors.js index b1b3316c..8a64ec4d 100644 --- a/client/utils/formatWebpackErrors.js +++ b/client/utils/formatWebpackErrors.js @@ -93,4 +93,4 @@ function formatWebpackErrors(errors) { return formattedErrors; } -export default formatWebpackErrors; +module.exports = formatWebpackErrors; diff --git a/client/utils/retry.js b/client/utils/retry.js index 2d92eec2..f5217254 100644 --- a/client/utils/retry.js +++ b/client/utils/retry.js @@ -17,4 +17,4 @@ function runWithRetry(callback, maxRetries) { executeWithRetryAndTimeout(0); } -export default runWithRetry; +module.exports = runWithRetry; diff --git a/overlay/components/CompileErrorTrace.js b/overlay/components/CompileErrorTrace.js index 861e41bc..bc975a5a 100644 --- a/overlay/components/CompileErrorTrace.js +++ b/overlay/components/CompileErrorTrace.js @@ -1,7 +1,7 @@ -import * as ansiHTML from 'ansi-html'; -import * as entities from 'html-entities'; -import theme from '../theme.js'; -import { formatFilename } from '../utils.js'; +const ansiHTML = require('ansi-html'); +const entities = require('html-entities'); +const theme = require('../theme.js'); +const { formatFilename } = require('../utils.js'); ansiHTML.setColors(theme); @@ -50,4 +50,4 @@ function CompileErrorTrace(document, root, props) { root.appendChild(stackContainer); } -export default CompileErrorTrace; +module.exports = CompileErrorTrace; diff --git a/overlay/components/PageHeader.js b/overlay/components/PageHeader.js index ded7c9b0..0a344b93 100644 --- a/overlay/components/PageHeader.js +++ b/overlay/components/PageHeader.js @@ -1,5 +1,5 @@ -import theme from '../theme.js'; -import Spacer from './Spacer.js'; +const Spacer = require('./Spacer.js'); +const theme = require('../theme.js'); /** * @typedef {Object} PageHeaderProps @@ -53,4 +53,4 @@ function PageHeader(document, root, props) { }); } -export default PageHeader; +module.exports = PageHeader; diff --git a/overlay/components/RuntimeErrorFooter.js b/overlay/components/RuntimeErrorFooter.js index 8b91aea0..294f4261 100644 --- a/overlay/components/RuntimeErrorFooter.js +++ b/overlay/components/RuntimeErrorFooter.js @@ -1,5 +1,5 @@ -import theme from '../theme.js'; -import Spacer from './Spacer.js'; +const Spacer = require('./Spacer.js'); +const theme = require('../theme.js'); /** * @typedef {Object} RuntimeErrorFooterProps @@ -88,4 +88,4 @@ function RuntimeErrorFooter(document, root, props) { } } -export default RuntimeErrorFooter; +module.exports = RuntimeErrorFooter; diff --git a/overlay/components/RuntimeErrorHeader.js b/overlay/components/RuntimeErrorHeader.js index ad31e31f..0b07b0a1 100644 --- a/overlay/components/RuntimeErrorHeader.js +++ b/overlay/components/RuntimeErrorHeader.js @@ -1,5 +1,5 @@ -import theme from '../theme.js'; -import Spacer from './Spacer.js'; +const Spacer = require('./Spacer.js'); +const theme = require('../theme.js'); /** * @typedef {Object} RuntimeErrorHeaderProps @@ -34,4 +34,4 @@ function RuntimeErrorHeader(document, root, props) { Spacer(document, root, { space: '2.5rem' }); } -export default RuntimeErrorHeader; +module.exports = RuntimeErrorHeader; diff --git a/overlay/components/RuntimeErrorStack.js b/overlay/components/RuntimeErrorStack.js index d954c6c9..ea2a210d 100644 --- a/overlay/components/RuntimeErrorStack.js +++ b/overlay/components/RuntimeErrorStack.js @@ -1,6 +1,6 @@ -import * as ErrorStackParser from 'error-stack-parser'; -import theme from '../theme.js'; -import { formatFilename } from '../utils.js'; +const ErrorStackParser = require('error-stack-parser'); +const theme = require('../theme.js'); +const { formatFilename } = require('../utils.js'); /** * @typedef {Object} RuntimeErrorStackProps @@ -76,4 +76,4 @@ function RuntimeErrorStack(document, root, props) { root.appendChild(stackContainer); } -export default RuntimeErrorStack; +module.exports = RuntimeErrorStack; diff --git a/overlay/components/Spacer.js b/overlay/components/Spacer.js index c332aa7c..6bb02996 100644 --- a/overlay/components/Spacer.js +++ b/overlay/components/Spacer.js @@ -16,4 +16,4 @@ function Spacer(document, root, props) { root.appendChild(spacer); } -export default Spacer; +module.exports = Spacer; diff --git a/overlay/containers/CompileErrorContainer.js b/overlay/containers/CompileErrorContainer.js index 82b05689..7f68e7e9 100644 --- a/overlay/containers/CompileErrorContainer.js +++ b/overlay/containers/CompileErrorContainer.js @@ -1,6 +1,6 @@ -import CompileErrorTrace from '../components/CompileErrorTrace.js'; -import PageHeader from '../components/PageHeader.js'; -import Spacer from '../components/Spacer.js'; +const CompileErrorTrace = require('../components/CompileErrorTrace.js'); +const PageHeader = require('../components/PageHeader.js'); +const Spacer = require('../components/Spacer.js'); /** * @typedef {Object} CompileErrorContainerProps @@ -22,4 +22,4 @@ function CompileErrorContainer(document, root, props) { Spacer(document, root, { space: '1rem' }); } -export default CompileErrorContainer; +module.exports = CompileErrorContainer; diff --git a/overlay/containers/RuntimeErrorContainer.js b/overlay/containers/RuntimeErrorContainer.js index a913935e..11a6f9dc 100644 --- a/overlay/containers/RuntimeErrorContainer.js +++ b/overlay/containers/RuntimeErrorContainer.js @@ -1,6 +1,6 @@ -import PageHeader from '../components/PageHeader.js'; -import RuntimeErrorStack from '../components/RuntimeErrorStack.js'; -import Spacer from '../components/Spacer.js'; +const PageHeader = require('../components/PageHeader.js'); +const RuntimeErrorStack = require('../components/RuntimeErrorStack.js'); +const Spacer = require('../components/Spacer.js'); /** * @typedef {Object} RuntimeErrorContainerProps @@ -26,4 +26,4 @@ function RuntimeErrorContainer(document, root, props) { Spacer(document, root, { space: '1rem' }); } -export default RuntimeErrorContainer; +module.exports = RuntimeErrorContainer; diff --git a/overlay/index.js b/overlay/index.js index d3697d77..462dcd27 100644 --- a/overlay/index.js +++ b/overlay/index.js @@ -1,9 +1,9 @@ -import RuntimeErrorFooter from './components/RuntimeErrorFooter.js'; -import RuntimeErrorHeader from './components/RuntimeErrorHeader.js'; -import CompileErrorContainer from './containers/CompileErrorContainer.js'; -import RuntimeErrorContainer from './containers/RuntimeErrorContainer.js'; -import theme from './theme.js'; -import { debounce, removeAllChildren } from './utils.js'; +const RuntimeErrorFooter = require('./components/RuntimeErrorFooter.js'); +const RuntimeErrorHeader = require('./components/RuntimeErrorHeader.js'); +const CompileErrorContainer = require('./containers/CompileErrorContainer.js'); +const RuntimeErrorContainer = require('./containers/RuntimeErrorContainer.js'); +const theme = require('./theme.js'); +const { debounce, removeAllChildren } = require('./utils.js'); /** * @callback RenderFn @@ -235,7 +235,7 @@ function cleanup() { * Clears Webpack compilation errors and dismisses the compile error overlay. * @returns {void} */ -export function clearCompileError() { +function clearCompileError() { if (!root || currentMode !== 'compileError') { return; } @@ -250,7 +250,7 @@ export function clearCompileError() { * @param {boolean} [dismissOverlay] Whether to dismiss the overlay or not. * @returns {void} */ -export function clearRuntimeErrors(dismissOverlay) { +function clearRuntimeErrors(dismissOverlay) { if (!root || currentMode !== 'runtimeError') { return; } @@ -269,7 +269,7 @@ export function clearRuntimeErrors(dismissOverlay) { * @param {string} message * @returns {void} */ -export function showCompileError(message) { +function showCompileError(message) { if (!message) { return; } @@ -284,7 +284,7 @@ export function showCompileError(message) { * @param {Error[]} errors * @returns {void} */ -export function showRuntimeErrors(errors) { +function showRuntimeErrors(errors) { if (!errors || !errors.length) { return; } @@ -317,9 +317,17 @@ function isWebpackCompileError(error) { * @param {Error} error A valid error object. * @returns {void} */ -export function handleRuntimeError(error) { +function handleRuntimeError(error) { if (error && !isWebpackCompileError(error) && currentRuntimeErrors.indexOf(error) === -1) { currentRuntimeErrors = currentRuntimeErrors.concat(error); } debouncedShowRuntimeErrors(currentRuntimeErrors); } + +module.exports = Object.freeze({ + clearCompileError: clearCompileError, + clearRuntimeErrors: clearRuntimeErrors, + handleRuntimeError: handleRuntimeError, + showCompileError: showCompileError, + showRuntimeErrors: showRuntimeErrors, +}); diff --git a/overlay/theme.js b/overlay/theme.js index c4dabf45..a1d32f01 100644 --- a/overlay/theme.js +++ b/overlay/theme.js @@ -36,4 +36,4 @@ const theme = { dimgrey: '343434', }; -export default theme; +module.exports = theme; diff --git a/overlay/utils.js b/overlay/utils.js index d60ceb7b..fed4dea6 100644 --- a/overlay/utils.js +++ b/overlay/utils.js @@ -4,7 +4,7 @@ * @param {number} wait Milliseconds to wait before invoking again. * @return {function(...*): void} The debounced function. */ -export function debounce(fn, wait) { +function debounce(fn, wait) { /** * A cached setTimeout handler. * @type {number | undefined} @@ -32,7 +32,7 @@ export function debounce(fn, wait) { * @param {string} filename The filename to be formatted. * @returns {string} The formatted filename. */ -export function formatFilename(filename) { +function formatFilename(filename) { // Strip away protocol and domain for compiled files const htmlMatch = /^https?:\/\/(.*)\/(.*)/.exec(filename); if (htmlMatch && htmlMatch[1] && htmlMatch[2]) { @@ -55,7 +55,7 @@ export function formatFilename(filename) { * @param {number} [skip] Number of elements to skip removing. * @returns {void} */ -export function removeAllChildren(element, skip) { +function removeAllChildren(element, skip) { /** @type {Node[]} */ const childList = Array.prototype.slice.call( element.childNodes, @@ -66,3 +66,9 @@ export function removeAllChildren(element, skip) { element.removeChild(childList[i]); } } + +module.exports = { + debounce: debounce, + formatFilename: formatFilename, + removeAllChildren: removeAllChildren, +}; diff --git a/package.json b/package.json index a2e082ab..8b03feb1 100644 --- a/package.json +++ b/package.json @@ -37,11 +37,11 @@ "types" ], "scripts": { - "pretest": "yarn link && yarn link \"@pmmmwh/react-refresh-webpack-plugin\"", - "posttest": "yarn unlink \"@pmmmwh/react-refresh-webpack-plugin\"", + "pretest": "yalc publish --no-scripts && yalc add --dev @pmmmwh/react-refresh-webpack-plugin", + "posttest": "yalc remove --all", "test": "node scripts/test.js", "test:webpack-4": "cross-env WEBPACK_VERSION=4 yarn test", - "lint": "eslint --report-unused-disable-directives --ext .js .", + "lint": "eslint --report-unused-disable-directives --ext .js,.jsx .", "lint:fix": "yarn lint --fix", "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,md}\"", "format:check": "prettier --check \"**/*.{js,jsx,ts,tsx,json,md}\"", @@ -100,6 +100,7 @@ "webpack-hot-middleware": "^2.25.0", "webpack-plugin-serve": "^1.4.1", "webpack.legacy": "npm:webpack@4.x", + "yalc": "^1.0.0-pre.53", "yn": "^4.0.0" }, "peerDependencies": { diff --git a/sockets/WDSSocket.js b/sockets/WDSSocket.js index ede1bb82..e34158a6 100644 --- a/sockets/WDSSocket.js +++ b/sockets/WDSSocket.js @@ -1,7 +1,7 @@ /* global __webpack_dev_server_client__ */ -import getSocketUrlParts from './utils/getSocketUrlParts.js'; -import getUrlFromParts from './utils/getUrlFromParts'; +const getSocketUrlParts = require('./utils/getSocketUrlParts.js'); +const getUrlFromParts = require('./utils/getUrlFromParts'); /** * Initializes a socket server for HMR for webpack-dev-server. @@ -33,4 +33,4 @@ function initWDSSocket(messageHandler, resourceQuery) { } } -export const init = initWDSSocket; +module.exports = { init: initWDSSocket }; diff --git a/sockets/WHMEventSource.js b/sockets/WHMEventSource.js index 8eb0789f..505a81a8 100644 --- a/sockets/WHMEventSource.js +++ b/sockets/WHMEventSource.js @@ -28,4 +28,4 @@ function initWHMEventSource(messageHandler) { }); } -export const init = initWHMEventSource; +module.exports = { init: initWHMEventSource }; diff --git a/sockets/WPSSocket.js b/sockets/WPSSocket.js index 2e63ea07..13ee8a89 100644 --- a/sockets/WPSSocket.js +++ b/sockets/WPSSocket.js @@ -1,5 +1,5 @@ /* global ʎɐɹɔosǝʌɹǝs */ -import { ClientSocket } from 'webpack-plugin-serve/lib/client/ClientSocket.js'; +const { ClientSocket } = require('webpack-plugin-serve/lib/client/ClientSocket.js'); /** * Initializes a socket server for HMR for webpack-plugin-serve. @@ -48,4 +48,4 @@ function initWPSSocket(messageHandler) { }); } -export const init = initWPSSocket; +module.exports = { init: initWPSSocket }; diff --git a/sockets/utils/getCurrentScriptSource.js b/sockets/utils/getCurrentScriptSource.js index f9fcd96f..91301b6d 100644 --- a/sockets/utils/getCurrentScriptSource.js +++ b/sockets/utils/getCurrentScriptSource.js @@ -20,4 +20,4 @@ function getCurrentScriptSource() { } } -export default getCurrentScriptSource; +module.exports = getCurrentScriptSource; diff --git a/sockets/utils/getSocketUrlParts.js b/sockets/utils/getSocketUrlParts.js index 35fc935e..78ec0c64 100644 --- a/sockets/utils/getSocketUrlParts.js +++ b/sockets/utils/getSocketUrlParts.js @@ -1,5 +1,5 @@ -import getCurrentScriptSource from './getCurrentScriptSource.js'; -import parseQuery from './parseQuery.js'; +const getCurrentScriptSource = require('./getCurrentScriptSource.js'); +const parseQuery = require('./parseQuery.js'); /** * @typedef {Object} SocketUrlParts @@ -106,4 +106,4 @@ function getSocketUrlParts(resourceQuery) { }; } -export default getSocketUrlParts; +module.exports = getSocketUrlParts; diff --git a/sockets/utils/getUrlFromParts.js b/sockets/utils/getUrlFromParts.js index 74bef0ae..4da986d3 100644 --- a/sockets/utils/getUrlFromParts.js +++ b/sockets/utils/getUrlFromParts.js @@ -28,4 +28,4 @@ function urlFromParts(urlParts, enforceWs) { return url.href; } -export default urlFromParts; +module.exports = urlFromParts; diff --git a/sockets/utils/parseQuery.js b/sockets/utils/parseQuery.js index 17880b5b..4422b30b 100644 --- a/sockets/utils/parseQuery.js +++ b/sockets/utils/parseQuery.js @@ -30,4 +30,4 @@ function parseQuery(querystring) { }, {}); } -export default parseQuery; +module.exports = parseQuery; diff --git a/yarn.lock b/yarn.lock index 2808e59c..bd973a68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2429,6 +2429,11 @@ detect-file@^1.0.0: resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= +detect-indent@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6" + integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA== + detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" @@ -3211,6 +3216,15 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +fs-extra@^8.0.1: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-extra@^9.0.1: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" @@ -3337,7 +3351,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -3712,12 +3726,19 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= +ignore-walk@^3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" + integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== + dependencies: + minimatch "^3.0.4" + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.1, ignore@^5.1.4: +ignore@^5.0.4, ignore@^5.1.1, ignore@^5.1.4: version "5.1.8" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== @@ -3789,6 +3810,11 @@ ini@^1.3.4, ini@^1.3.5: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +ini@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== + internal-ip@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" @@ -4702,6 +4728,13 @@ json5@^2.1.2: dependencies: minimist "^1.2.5" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + jsonfile@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" @@ -5416,6 +5449,28 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== +npm-bundled@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" + integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== + dependencies: + npm-normalize-package-bin "^1.0.1" + +npm-normalize-package-bin@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" + integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + +npm-packlist@^2.1.5: + version "2.2.2" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8" + integrity sha512-Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg== + dependencies: + glob "^7.1.6" + ignore-walk "^3.0.3" + npm-bundled "^1.1.1" + npm-normalize-package-bin "^1.0.1" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -7236,7 +7291,7 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -universalify@^0.1.2: +universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== @@ -7797,6 +7852,20 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== +yalc@^1.0.0-pre.53: + version "1.0.0-pre.53" + resolved "https://registry.yarnpkg.com/yalc/-/yalc-1.0.0-pre.53.tgz#c51db2bb924a6908f4cb7e82af78f7e5606810bc" + integrity sha512-tpNqBCpTXplnduzw5XC+FF8zNJ9L/UXmvQyyQj7NKrDNavbJtHvzmZplL5ES/RCnjX7JR7W9wz5GVDXVP3dHUQ== + dependencies: + chalk "^4.1.0" + detect-indent "^6.0.0" + fs-extra "^8.0.1" + glob "^7.1.4" + ignore "^5.0.4" + ini "^2.0.0" + npm-packlist "^2.1.5" + yargs "^16.1.1" + yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" @@ -7844,7 +7913,7 @@ yargs@^13.3.2: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^16.0.3: +yargs@^16.0.3, yargs@^16.1.1: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==