wip

2025-12-26 19:00:08 +00:00 · 2021-11-30 11:44:41 -08:00
10 changed files with 171 additions and 130 deletions
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -74,6 +74,7 @@
    "@types/load-json-file": "2.0.7",
    "@types/mime-types": "2.1.0",
    "@types/minimatch": "3.0.3",
+    "@types/mkdirp": "1.0.2",
    "@types/mri": "1.1.0",
    "@types/ms": "0.7.30",
    "@types/node": "11.11.0",
--- a/packages/cli/src/commands/dev/dev.ts
+++ b/packages/cli/src/commands/dev/dev.ts
@@ -70,6 +70,7 @@ export default async function dev(
          frameworkSlug = framework.slug;
        }

+        //@ts-ignore
        const defaults = framework.settings.devCommand.value;
        if (defaults) {
          devCommand = defaults;
--- a/packages/cli/test/fixtures/unit/edge-middleware-strict-mode/_middleware.js
+++ b/packages/cli/test/fixtures/unit/edge-middleware-strict-mode/_middleware.js
@@ -0,0 +1,6 @@
+export default function (req) {
+  const isStrict = (function () {
+    return !this;
+  })();
+  return new Response('is strict mode? (next.js) ' + (isStrict ? 'yes' : 'no'));
+}
--- a/packages/cli/test/util/dev/server.test.ts
+++ b/packages/cli/test/util/dev/server.test.ts
@@ -385,4 +385,14 @@ describe('DevServer', () => {
      );
    })
  );
+
+  it(
+    'should run middleware in strict mode',
+    testFixture('edge-middleware-strict-mode', async server => {
+      const response = await fetch(`${server.address}/index.html`);
+      const body = await response.text();
+      console.log(body);
+      expect(body).toStrictEqual('is strict mode? (next.js) yes');
+    })
+  );
 });
--- a/packages/middleware/build.js
+++ b/packages/middleware/build.js
@@ -12,7 +12,14 @@ async function main() {

  await execa(
    'ncc',
-    ['build', join(srcDir, 'index.ts'), '-o', outDir, '--external', 'esbuild'],
+    [
+      'build',
+      join(srcDir, 'index.ts'),
+      '-o',
+      outDir,
+      '--external',
+      '@swc/core',
+    ],
    {
      stdio: 'inherit',
    }
--- a/packages/middleware/package.json
+++ b/packages/middleware/package.json
@@ -18,7 +18,7 @@
    "dist"
  ],
  "dependencies": {
-    "esbuild": "0.13.12"
+    "@swc/core": "1.2.113"
  },
  "devDependencies": {
    "@peculiar/webcrypto": "1.2.0",
@@ -26,6 +26,7 @@
    "@types/glob": "7.2.0",
    "@types/http-proxy": "1.17.7",
    "@types/jest": "27.0.2",
+    "@types/mkdirp": "1.0.2",
    "@types/node": "16.11.6",
    "@types/node-fetch": "^2",
    "@types/ua-parser-js": "0.7.36",
@@ -35,6 +36,7 @@
    "formdata-node": "4.3.1",
    "glob": "7.2.0",
    "http-proxy": "1.18.1",
+    "mkdirp": "1.0.4",
    "node-fetch": "^2",
    "ua-parser-js": "1.0.2",
    "url": "0.11.0",
--- a/packages/middleware/src/entries.js
+++ b/packages/middleware/src/entries.js
@@ -2,6 +2,7 @@ import * as middleware from './_middleware';
 _ENTRIES = typeof _ENTRIES === 'undefined' ? {} : _ENTRIES;
 _ENTRIES['middleware_pages/_middleware'] = {
  default: async function (ev) {
+    'use strict';
    const result = await middleware.default(ev.request, ev);
    return {
      promise: Promise.resolve(),
--- a/packages/middleware/src/index.ts
+++ b/packages/middleware/src/index.ts
@@ -1,10 +1,11 @@
 import util from 'util';
-import { extname, join, basename } from 'path';
-import * as esbuild from 'esbuild';
+import { extname, join, basename, dirname } from 'path';
+import * as swc from '@swc/core';
 import { promises as fsp } from 'fs';
 import { IncomingMessage, ServerResponse } from 'http';
 import libGlob from 'glob';
 import Proxy from 'http-proxy';
+import mkdirp from 'mkdirp';

 import { run } from './websandbox';
 import type { FetchEventResult } from './websandbox/types';
@@ -16,6 +17,7 @@ import {
  UrlWithParsedQuery,
 } from 'url';
 import { toNodeHeaders } from './websandbox/utils';
+import { SpackConfig } from '@swc/core/spack';

 const glob = util.promisify(libGlob);
 const SUPPORTED_EXTENSIONS = ['.js', '.ts'];
@@ -61,14 +63,29 @@ export async function build({ workPath }: { workPath: string }) {
  // Create `_ENTRIES` wrapper
  await fsp.copyFile(join(__dirname, 'entries.js'), entriesPath);

+  const outputPath = join(workPath, '.output/server/pages');
+  mkdirp.sync(outputPath);
  // Build
  try {
-    await esbuild.build({
-      entryPoints: [entriesPath],
-      bundle: true,
-      absWorkingDir: workPath,
-      outfile: join(workPath, '.output/server/pages/_middleware.js'),
-    });
+    const output = await swc.bundle({
+      entry: [entriesPath],
+      module: {
+        type: 'commonjs',
+      },
+      isModule: false,
+      workingDir: workPath,
+      output: {
+        name: '_middleware.js',
+        path: outputPath,
+      },
+    } as SpackConfig);
+    //@ts-ignore
+    await fsp.writeFile(
+      join(outputPath, '_middleware.js'),
+      output['___vc_entries.js'].code
+    );
+  } catch (e) {
+    console.log('error compiltin', e);
  } finally {
    await fsp.unlink(entriesPath);
  }
@@ -92,6 +109,7 @@ export async function build({ workPath }: { workPath: string }) {
    workPath,
    '.output/server/middleware-manifest.json'
  );
+  mkdirp.sync(dirname(middlewareManifestPath));
  await fsp.writeFile(middlewareManifestPath, middlewareManifestData);
 }

--- a/packages/middleware/src/websandbox/sandbox/sandbox.ts
+++ b/packages/middleware/src/websandbox/sandbox/sandbox.ts
@@ -14,7 +14,7 @@ import fetch, {
  RequestInfo,
 } from 'node-fetch';
 import { adapter } from '../adapter';
-import * as esbuild from 'esbuild';
+import * as swc from '@swc/core';
 import m from 'module';

 interface URLLike {
@@ -112,8 +112,11 @@ export async function run(params: {
  }
  try {
    const content = readFileSync(params.path, 'utf-8');
-    const esBuildResult = esbuild.transformSync(content, {
-      format: 'cjs',
+    const esBuildResult = await swc.transformSync(content, {
+      isModule: true,
+      module: {
+        type: 'commonjs',
+      },
    });
    const x = vm.runInNewContext(m.wrap(esBuildResult.code), cache.sandbox, {
      filename: params.path,
@@ -161,16 +164,17 @@ function sandboxRequire(referrer: string, specifier: string) {

  cache?.require.set(resolved, module);

-  const transformOptions: esbuild.TransformOptions = {
-    format: 'cjs',
-  };
+  let fileContent = readFileSync(resolved, 'utf-8');
  if (extname(resolved) === '.json') {
-    transformOptions.loader = 'json';
+    fileContent = `export default ${fileContent}`;
  }
-  const transformedContent = esbuild.transformSync(
-    readFileSync(resolved, 'utf-8'),
-    transformOptions
-  ).code;
+  const { code: transformedContent } = swc.transformSync(fileContent, {
+    isModule: true,
+    module: {
+      type: 'commonjs',
+    },
+  });
+
  const fn = vm.runInContext(
    `(function(module,exports,require,__dirname,__filename) {${transformedContent}\n})`,
    cache!.sandbox
--- a/yarn.lock
+++ b/yarn.lock
@@ -1624,11 +1624,23 @@
    call-me-maybe "^1.0.1"
    glob-to-regexp "^0.3.0"

+"@napi-rs/triples@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@napi-rs/triples/-/triples-1.0.3.tgz#76d6d0c3f4d16013c61e45dfca5ff1e6c31ae53c"
+  integrity sha512-jDJTpta+P4p1NZTFVLHJ/TLFVYVcOqv6l8xwOeBKNPMgY/zDYH/YH7SJbvrr/h1RcS9GzbPcLKGzpuK9cV56UA==
+
 "@next/env@11.1.2":
  version "11.1.2"
  resolved "https://registry.yarnpkg.com/@next/env/-/env-11.1.2.tgz#27996efbbc54c5f949f5e8c0a156e3aa48369b99"
  integrity sha512-+fteyVdQ7C/OoulfcF6vd1Yk0FEli4453gr8kSFbU8sKseNSizYq6df5MKz/AjwLptsxrUeIkgBdAzbziyJ3mA==

+"@node-rs/helper@^1.0.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@node-rs/helper/-/helper-1.2.1.tgz#e079b05f21ff4329d82c4e1f71c0290e4ecdc70c"
+  integrity sha512-R5wEmm8nbuQU0YGGmYVjEc0OHtYsuXdpRG+Ut/3wZ9XAvQWyThN08bTh2cBJgoZxHQUPtvRfeQuxcAgLuiBISg==
+  dependencies:
+    "@napi-rs/triples" "^1.0.3"
+
 "@nodelib/fs.scandir@2.1.3":
  version "2.1.3"
  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -1890,6 +1902,86 @@
  dependencies:
    "@sinonjs/commons" "^1.7.0"

+"@swc/core-android-arm64@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.113.tgz#fb0fa98f85100bffa10107a9641f19c6ac3c9384"
+  integrity sha512-b3kyZdw1R7aSXzaHE29ffsA+NPE0bCnhCmvghfKLWoB4FPlvEzPBKc4RTh7Kwhp7GbKVA6nMx4Mnr7FJBL8CHg==
+
+"@swc/core-darwin-arm64@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.113.tgz#2fd7c5a89cb00c0d1d2da89b1b2077e16df4fbd9"
+  integrity sha512-rFWtDYsrTh9233AglRcGObcqdDfrXcAULOrgCwds7oEFPTZbib9DNudgOq0EbUoQWG0jmMv1CJ0U1o0OfFyPCQ==
+
+"@swc/core-darwin-x64@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.113.tgz#b96d6899e6a86937cfec9d4ebacc8ccceed475b1"
+  integrity sha512-AzRdIyYBE2b6g6+XtaGDZQAVU2SAedWywTj+AlXyBOyAStUksbDwC44OZUB2LVsGZCTN2Aqb8EZHUbKHmhvXbA==
+
+"@swc/core-freebsd-x64@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.113.tgz#77ccb071276e544663af9988307ab6bbd108d2e4"
+  integrity sha512-WexHgJevtWRLJjOpOAiy9qyKHuCiHqXWjf9P0XJg2VcYs1adHMuDXeSrju4+V+G+Mali9N8+zDo83+VjzbdJKQ==
+
+"@swc/core-linux-arm-gnueabihf@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.113.tgz#86abb6ade04edaf80e4ff57580d66265e03f0418"
+  integrity sha512-3gjNaOyI5J/UgB8tnuZWmw3qXyErl7EebKGOw6YRru70HP3Y/gD6nvQvUG9X+Fm8Druwj/rX7TybUVtIFQkMvw==
+
+"@swc/core-linux-arm64-gnu@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.113.tgz#4891e1b51366ab1dc8813d256122422b20e7d797"
+  integrity sha512-DibAiSI/LbT5WrxFPx4BtKM6UfzM3/TTObq0E1UGjzRSqbes63G0W5IE1TTBn/qKzISvOKelRUNH/y0GBCTfBg==
+
+"@swc/core-linux-arm64-musl@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.113.tgz#f51e6ebbaeaeb80a3c312cdfd8d44dd22fab48da"
+  integrity sha512-UO8llK5/HBTBZ9460OwTmfV9ZnXEEpzagksEWJa2d0UeKwspxmSaRG+/2fV1mRG7jOC1tQ2mF8lZ1u7zM3M3nQ==
+
+"@swc/core-linux-x64-gnu@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.113.tgz#5c49e3cde5fd57b2dd36e622bbd617a0840206bf"
+  integrity sha512-yUk+1oCP1ZI4/iT50wQjYxUXu+Cu4mqBrmyzqv8vHO4jTb7YhD2a/6QiZSprcmz/veDF6i93xoxsLHDIzm5UjA==
+
+"@swc/core-linux-x64-musl@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.113.tgz#513b1c8be4092b1bea6245cfc3bbbd2f547a7252"
+  integrity sha512-3Cz7FecAptNb9dmy0tig9FsIh35mUKM5Kr4hzbiqK/82uub6+B2F+Ykd8vCvrWgLM/X9woKk4FDBb4YTBrZdWA==
+
+"@swc/core-win32-arm64-msvc@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.113.tgz#09e2cc1e7328c31e4f48041d21679da645d78b59"
+  integrity sha512-85M7Q0EdSaLpKbi6Ba9pqnptMByQOjJLZOhONCRXfB5CNZqvaITGOYAAL7qiojjt0GZguDuUeACRuG4PX8ROOA==
+
+"@swc/core-win32-ia32-msvc@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.113.tgz#66ce3ece946bae527e99ebb4df34afeec0e7d852"
+  integrity sha512-ENFpLUS16KQZBGRs7BEzxQGmfqoJfX6vCsnUKcopDlMXWaNius+vNhUWRTR3jH/tijIFM5n4UeichGJ2wJNTmQ==
+
+"@swc/core-win32-x64-msvc@^1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.113.tgz#28a2e6aacef7e75048546731e01cbd298ba3dfe6"
+  integrity sha512-f5VaSruBEO24fXYlKfntaFxqQ3fIHKYonOFxGs1fx9PPXWl12ccFHgl8Q0viOkQIASULdy8ToN2EBO/tgrxpGw==
+
+"@swc/core@1.2.113":
+  version "1.2.113"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.113.tgz#84b77eb510e73e5f056a70e214bbdfeb50b678ef"
+  integrity sha512-wvmdyM4ENA1MeuGuk5uQfCIoKOwkoF0u8BJKMJk1MtOzxH70rmQDXMEkMLIQgVIrfm3OMTXZU4Cqeu20JYa01w==
+  dependencies:
+    "@node-rs/helper" "^1.0.0"
+  optionalDependencies:
+    "@swc/core-android-arm64" "^1.2.113"
+    "@swc/core-darwin-arm64" "^1.2.113"
+    "@swc/core-darwin-x64" "^1.2.113"
+    "@swc/core-freebsd-x64" "^1.2.113"
+    "@swc/core-linux-arm-gnueabihf" "^1.2.113"
+    "@swc/core-linux-arm64-gnu" "^1.2.113"
+    "@swc/core-linux-arm64-musl" "^1.2.113"
+    "@swc/core-linux-x64-gnu" "^1.2.113"
+    "@swc/core-linux-x64-musl" "^1.2.113"
+    "@swc/core-win32-arm64-msvc" "^1.2.113"
+    "@swc/core-win32-ia32-msvc" "^1.2.113"
+    "@swc/core-win32-x64-msvc" "^1.2.113"
+
 "@szmarczak/http-timer@^1.1.2":
  version "1.1.2"
  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -2285,6 +2377,13 @@
  dependencies:
    "@types/node" "*"

+"@types/mkdirp@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-1.0.2.tgz#8d0bad7aa793abe551860be1f7ae7f3198c16666"
+  integrity sha512-o0K1tSO0Dx5X6xlU5F1D6625FawhC3dU3iqr25lluNv/+/QIVH8RLNEiVokgIZo+mz+87w/3Mkg/VvQS+J51fQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/mri@1.1.0":
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/@types/mri/-/mri-1.1.0.tgz#66555e4d797713789ea0fefdae0898d8170bf5af"
@@ -5161,114 +5260,6 @@ es6-promisify@^5.0.0:
  dependencies:
    es6-promise "^4.0.3"

-esbuild-android-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.12.tgz#e1f199dc05405cdc6670c00fb6c793822bf8ae4c"
-  integrity sha512-TSVZVrb4EIXz6KaYjXfTzPyyRpXV5zgYIADXtQsIenjZ78myvDGaPi11o4ZSaHIwFHsuwkB6ne5SZRBwAQ7maw==
-
-esbuild-darwin-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.12.tgz#f5c59e622955c01f050e5a7ac9c1d41db714b94d"
-  integrity sha512-c51C+N+UHySoV2lgfWSwwmlnLnL0JWj/LzuZt9Ltk9ub1s2Y8cr6SQV5W3mqVH1egUceew6KZ8GyI4nwu+fhsw==
-
-esbuild-darwin-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.12.tgz#8abae74c2956a8aa568fc52c78829338c4a4b988"
-  integrity sha512-JvAMtshP45Hd8A8wOzjkY1xAnTKTYuP/QUaKp5eUQGX+76GIie3fCdUUr2ZEKdvpSImNqxiZSIMziEiGB5oUmQ==
-
-esbuild-freebsd-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.12.tgz#6ad2ab8c0364ee7dd2d6e324d876a8e60ae75d12"
-  integrity sha512-r6On/Skv9f0ZjTu6PW5o7pdXr8aOgtFOEURJZYf1XAJs0IQ+gW+o1DzXjVkIoT+n1cm3N/t1KRJfX71MPg/ZUA==
-
-esbuild-freebsd-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.12.tgz#6f38155f4c300ac4c8adde1fde3cc6a4440a8294"
-  integrity sha512-F6LmI2Q1gii073kmBE3NOTt/6zLL5zvZsxNLF8PMAwdHc+iBhD1vzfI8uQZMJA1IgXa3ocr3L3DJH9fLGXy6Yw==
-
-esbuild-linux-32@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.12.tgz#b1d15e330188a8c21de75c3f0058628a3eefade7"
-  integrity sha512-U1UZwG3UIwF7/V4tCVAo/nkBV9ag5KJiJTt+gaCmLVWH3bPLX7y+fNlhIWZy8raTMnXhMKfaTvWZ9TtmXzvkuQ==
-
-esbuild-linux-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.12.tgz#25bd64b66162b02348e32d8f12e4c9ee61f1d070"
-  integrity sha512-YpXSwtu2NxN3N4ifJxEdsgd6Q5d8LYqskrAwjmoCT6yQnEHJSF5uWcxv783HWN7lnGpJi9KUtDvYsnMdyGw71Q==
-
-esbuild-linux-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.12.tgz#ba582298457cc5c9ac823a275de117620c06537f"
-  integrity sha512-sgDNb8kb3BVodtAlcFGgwk+43KFCYjnFOaOfJibXnnIojNWuJHpL6aQJ4mumzNWw8Rt1xEtDQyuGK9f+Y24jGA==
-
-esbuild-linux-arm@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.12.tgz#6bc81c957bff22725688cc6359c29a25765be09b"
-  integrity sha512-SyiT/JKxU6J+DY2qUiSLZJqCAftIt3uoGejZ0HDnUM2MGJqEGSGh7p1ecVL2gna3PxS4P+j6WAehCwgkBPXNIw==
-
-esbuild-linux-mips64le@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.12.tgz#ef3c4aba3e585d847cbade5945a8b4a5c62c7ce2"
-  integrity sha512-qQJHlZBG+QwVIA8AbTEtbvF084QgDi4DaUsUnA+EolY1bxrG+UyOuGflM2ZritGhfS/k7THFjJbjH2wIeoKA2g==
-
-esbuild-linux-ppc64le@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.12.tgz#a21fb64e80c38bef06122e48283990fc6db578e1"
-  integrity sha512-2dSnm1ldL7Lppwlo04CGQUpwNn5hGqXI38OzaoPOkRsBRWFBozyGxTFSee/zHFS+Pdh3b28JJbRK3owrrRgWNw==
-
-esbuild-netbsd-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.12.tgz#1ea7fc8cfce88a20a4047b867ef184049a6641ae"
-  integrity sha512-D4raxr02dcRiQNbxOLzpqBzcJNFAdsDNxjUbKkDMZBkL54Z0vZh4LRndycdZAMcIdizC/l/Yp/ZsBdAFxc5nbA==
-
-esbuild-openbsd-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.12.tgz#adde32f2f1b05dc4bd4fc544d6ea5a4379f9ca4d"
-  integrity sha512-KuLCmYMb2kh05QuPJ+va60bKIH5wHL8ypDkmpy47lzwmdxNsuySeCMHuTv5o2Af1RUn5KLO5ZxaZeq4GEY7DaQ==
-
-esbuild-sunos-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.12.tgz#a7ecaf52b7364fbee76dc8aa707fa3e1cff3342c"
-  integrity sha512-jBsF+e0woK3miKI8ufGWKG3o3rY9DpHvCVRn5eburMIIE+2c+y3IZ1srsthKyKI6kkXLvV4Cf/E7w56kLipMXw==
-
-esbuild-windows-32@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.12.tgz#a8756033dc905c4b7bea19be69f7ee68809f8770"
-  integrity sha512-L9m4lLFQrFeR7F+eLZXG82SbXZfUhyfu6CexZEil6vm+lc7GDCE0Q8DiNutkpzjv1+RAbIGVva9muItQ7HVTkQ==
-
-esbuild-windows-64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.12.tgz#ae694aa66ca078acb8509b2da31197ed1f40f798"
-  integrity sha512-k4tX4uJlSbSkfs78W5d9+I9gpd+7N95W7H2bgOMFPsYREVJs31+Q2gLLHlsnlY95zBoPQMIzHooUIsixQIBjaQ==
-
-esbuild-windows-arm64@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.12.tgz#782c5a8bd6d717ea55aaafe648f9926ca36a4a88"
-  integrity sha512-2tTv/BpYRIvuwHpp2M960nG7uvL+d78LFW/ikPItO+2GfK51CswIKSetSpDii+cjz8e9iSPgs+BU4o8nWICBwQ==
-
-esbuild@0.13.12:
-  version "0.13.12"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.12.tgz#9cac641594bf03cf34145258c093d743ebbde7ca"
-  integrity sha512-vTKKUt+yoz61U/BbrnmlG9XIjwpdIxmHB8DlPR0AAW6OdS+nBQBci6LUHU2q9WbBobMEIQxxDpKbkmOGYvxsow==
-  optionalDependencies:
-    esbuild-android-arm64 "0.13.12"
-    esbuild-darwin-64 "0.13.12"
-    esbuild-darwin-arm64 "0.13.12"
-    esbuild-freebsd-64 "0.13.12"
-    esbuild-freebsd-arm64 "0.13.12"
-    esbuild-linux-32 "0.13.12"
-    esbuild-linux-64 "0.13.12"
-    esbuild-linux-arm "0.13.12"
-    esbuild-linux-arm64 "0.13.12"
-    esbuild-linux-mips64le "0.13.12"
-    esbuild-linux-ppc64le "0.13.12"
-    esbuild-netbsd-64 "0.13.12"
-    esbuild-openbsd-64 "0.13.12"
-    esbuild-sunos-64 "0.13.12"
-    esbuild-windows-32 "0.13.12"
-    esbuild-windows-64 "0.13.12"
-    esbuild-windows-arm64 "0.13.12"
-
 esbuild@^0.11.20:
  version "0.11.23"
  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.23.tgz#c42534f632e165120671d64db67883634333b4b8"
@@ -8842,7 +8833,7 @@ mkdirp-promise@5.0.1, mkdirp-promise@^5.0.1:
  dependencies:
    mkdirp "*"

-mkdirp@*, mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@*, mkdirp@1.0.4, mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4:
  version "1.0.4"
  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==