diff --git a/.pnp.cjs b/.pnp.cjs index 3c398e26..758e9941 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -37,7 +37,7 @@ const RAW_RUNTIME_STATE = [null, {\ "packageLocation": "./",\ "packageDependencies": [\ - ["lerna", "npm:8.1.6"]\ + ["lerna", "npm:8.1.7"]\ ],\ "linkType": "SOFT"\ }]\ @@ -74,208 +74,217 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@esbuild/aix-ppc64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-aix-ppc64-npm-0.21.5-ebeb42da03/node_modules/@esbuild/aix-ppc64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-aix-ppc64-npm-0.23.0-0337c5431f/node_modules/@esbuild/aix-ppc64/",\ "packageDependencies": [\ - ["@esbuild/aix-ppc64", "npm:0.21.5"]\ + ["@esbuild/aix-ppc64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/android-arm", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-android-arm-npm-0.21.5-7e30e7b6d7/node_modules/@esbuild/android-arm/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-android-arm-npm-0.23.0-e42e4852e6/node_modules/@esbuild/android-arm/",\ "packageDependencies": [\ - ["@esbuild/android-arm", "npm:0.21.5"]\ + ["@esbuild/android-arm", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/android-arm64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-android-arm64-npm-0.21.5-916e33d43e/node_modules/@esbuild/android-arm64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-android-arm64-npm-0.23.0-b1c8de4ba9/node_modules/@esbuild/android-arm64/",\ "packageDependencies": [\ - ["@esbuild/android-arm64", "npm:0.21.5"]\ + ["@esbuild/android-arm64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/android-x64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-android-x64-npm-0.21.5-07abfd6fa9/node_modules/@esbuild/android-x64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-android-x64-npm-0.23.0-4c962cc578/node_modules/@esbuild/android-x64/",\ "packageDependencies": [\ - ["@esbuild/android-x64", "npm:0.21.5"]\ + ["@esbuild/android-x64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/darwin-arm64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-darwin-arm64-npm-0.21.5-62349c1520/node_modules/@esbuild/darwin-arm64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-darwin-arm64-npm-0.23.0-c07423ec26/node_modules/@esbuild/darwin-arm64/",\ "packageDependencies": [\ - ["@esbuild/darwin-arm64", "npm:0.21.5"]\ + ["@esbuild/darwin-arm64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/darwin-x64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-darwin-x64-npm-0.21.5-491c2ae06c/node_modules/@esbuild/darwin-x64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-darwin-x64-npm-0.23.0-38ebeac8f3/node_modules/@esbuild/darwin-x64/",\ "packageDependencies": [\ - ["@esbuild/darwin-x64", "npm:0.21.5"]\ + ["@esbuild/darwin-x64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/freebsd-arm64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-arm64-npm-0.21.5-2465c8f200/node_modules/@esbuild/freebsd-arm64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-arm64-npm-0.23.0-fb19bccdd7/node_modules/@esbuild/freebsd-arm64/",\ "packageDependencies": [\ - ["@esbuild/freebsd-arm64", "npm:0.21.5"]\ + ["@esbuild/freebsd-arm64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/freebsd-x64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-x64-npm-0.21.5-f866a2f0cc/node_modules/@esbuild/freebsd-x64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-x64-npm-0.23.0-7c674b778d/node_modules/@esbuild/freebsd-x64/",\ "packageDependencies": [\ - ["@esbuild/freebsd-x64", "npm:0.21.5"]\ + ["@esbuild/freebsd-x64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-arm", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm-npm-0.21.5-9485bcbfc7/node_modules/@esbuild/linux-arm/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm-npm-0.23.0-0dbfc888a9/node_modules/@esbuild/linux-arm/",\ "packageDependencies": [\ - ["@esbuild/linux-arm", "npm:0.21.5"]\ + ["@esbuild/linux-arm", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-arm64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm64-npm-0.21.5-c6a54cd648/node_modules/@esbuild/linux-arm64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm64-npm-0.23.0-9639e2cb7c/node_modules/@esbuild/linux-arm64/",\ "packageDependencies": [\ - ["@esbuild/linux-arm64", "npm:0.21.5"]\ + ["@esbuild/linux-arm64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-ia32", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-ia32-npm-0.21.5-499a15b672/node_modules/@esbuild/linux-ia32/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-ia32-npm-0.23.0-03f9bf02de/node_modules/@esbuild/linux-ia32/",\ "packageDependencies": [\ - ["@esbuild/linux-ia32", "npm:0.21.5"]\ + ["@esbuild/linux-ia32", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-loong64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-loong64-npm-0.21.5-b2d213a264/node_modules/@esbuild/linux-loong64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-loong64-npm-0.23.0-f3f7fa4b99/node_modules/@esbuild/linux-loong64/",\ "packageDependencies": [\ - ["@esbuild/linux-loong64", "npm:0.21.5"]\ + ["@esbuild/linux-loong64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-mips64el", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-mips64el-npm-0.21.5-6534e468c0/node_modules/@esbuild/linux-mips64el/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-mips64el-npm-0.23.0-697f6c1953/node_modules/@esbuild/linux-mips64el/",\ "packageDependencies": [\ - ["@esbuild/linux-mips64el", "npm:0.21.5"]\ + ["@esbuild/linux-mips64el", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-ppc64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-ppc64-npm-0.21.5-38298ce68c/node_modules/@esbuild/linux-ppc64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-ppc64-npm-0.23.0-eda81de89e/node_modules/@esbuild/linux-ppc64/",\ "packageDependencies": [\ - ["@esbuild/linux-ppc64", "npm:0.21.5"]\ + ["@esbuild/linux-ppc64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-riscv64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-riscv64-npm-0.21.5-73ca00d59e/node_modules/@esbuild/linux-riscv64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-riscv64-npm-0.23.0-9f9762faa5/node_modules/@esbuild/linux-riscv64/",\ "packageDependencies": [\ - ["@esbuild/linux-riscv64", "npm:0.21.5"]\ + ["@esbuild/linux-riscv64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-s390x", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-s390x-npm-0.21.5-44720430f0/node_modules/@esbuild/linux-s390x/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-s390x-npm-0.23.0-f8dcb3d966/node_modules/@esbuild/linux-s390x/",\ "packageDependencies": [\ - ["@esbuild/linux-s390x", "npm:0.21.5"]\ + ["@esbuild/linux-s390x", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/linux-x64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-linux-x64-npm-0.21.5-88079726c4/node_modules/@esbuild/linux-x64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-x64-npm-0.23.0-4cf21ebea7/node_modules/@esbuild/linux-x64/",\ "packageDependencies": [\ - ["@esbuild/linux-x64", "npm:0.21.5"]\ + ["@esbuild/linux-x64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/netbsd-x64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-netbsd-x64-npm-0.21.5-5f21539ffa/node_modules/@esbuild/netbsd-x64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-netbsd-x64-npm-0.23.0-21ffb515ee/node_modules/@esbuild/netbsd-x64/",\ "packageDependencies": [\ - ["@esbuild/netbsd-x64", "npm:0.21.5"]\ + ["@esbuild/netbsd-x64", "npm:0.23.0"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/openbsd-arm64", [\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-openbsd-arm64-npm-0.23.0-ceb067ae1d/node_modules/@esbuild/openbsd-arm64/",\ + "packageDependencies": [\ + ["@esbuild/openbsd-arm64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/openbsd-x64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-openbsd-x64-npm-0.21.5-23fbf4de2b/node_modules/@esbuild/openbsd-x64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-openbsd-x64-npm-0.23.0-2d4b750c01/node_modules/@esbuild/openbsd-x64/",\ "packageDependencies": [\ - ["@esbuild/openbsd-x64", "npm:0.21.5"]\ + ["@esbuild/openbsd-x64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/sunos-x64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-sunos-x64-npm-0.21.5-855a15205a/node_modules/@esbuild/sunos-x64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-sunos-x64-npm-0.23.0-0674980c19/node_modules/@esbuild/sunos-x64/",\ "packageDependencies": [\ - ["@esbuild/sunos-x64", "npm:0.21.5"]\ + ["@esbuild/sunos-x64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/win32-arm64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-win32-arm64-npm-0.21.5-d0ef444aab/node_modules/@esbuild/win32-arm64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-win32-arm64-npm-0.23.0-15ef919f07/node_modules/@esbuild/win32-arm64/",\ "packageDependencies": [\ - ["@esbuild/win32-arm64", "npm:0.21.5"]\ + ["@esbuild/win32-arm64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/win32-ia32", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-win32-ia32-npm-0.21.5-a4fb03dad4/node_modules/@esbuild/win32-ia32/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-win32-ia32-npm-0.23.0-6c3939f42f/node_modules/@esbuild/win32-ia32/",\ "packageDependencies": [\ - ["@esbuild/win32-ia32", "npm:0.21.5"]\ + ["@esbuild/win32-ia32", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ ]],\ ["@esbuild/win32-x64", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/@esbuild-win32-x64-npm-0.21.5-eddc2b5ad6/node_modules/@esbuild/win32-x64/",\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-win32-x64-npm-0.23.0-8cf70e4f2b/node_modules/@esbuild/win32-x64/",\ "packageDependencies": [\ - ["@esbuild/win32-x64", "npm:0.21.5"]\ + ["@esbuild/win32-x64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -386,14 +395,14 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@lerna/create", [\ - ["npm:8.1.6", {\ - "packageLocation": "../../../../cache/others/berry/cache/@lerna-create-npm-8.1.6-8b4a0f0380-10c0.zip/node_modules/@lerna/create/",\ + ["npm:8.1.7", {\ + "packageLocation": "../../../../cache/others/berry/cache/@lerna-create-npm-8.1.7-cfa1c0c10c-10c0.zip/node_modules/@lerna/create/",\ "packageDependencies": [\ - ["@lerna/create", "npm:8.1.6"],\ + ["@lerna/create", "npm:8.1.7"],\ ["@npmcli/arborist", "npm:7.5.3"],\ ["@npmcli/package-json", "npm:5.2.0"],\ ["@npmcli/run-script", "npm:8.1.0"],\ - ["@nx/devkit", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2"],\ + ["@nx/devkit", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2"],\ ["@octokit/plugin-enterprise-rest", "npm:6.0.1"],\ ["@octokit/rest", "npm:19.0.11"],\ ["aproba", "npm:2.0.0"],\ @@ -406,8 +415,8 @@ const RAW_RUNTIME_STATE = ["console-control-strings", "npm:1.1.0"],\ ["conventional-changelog-core", "npm:5.0.1"],\ ["conventional-recommended-bump", "npm:7.0.1"],\ - ["cosmiconfig", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:8.3.6"],\ - ["dedent", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:1.5.3"],\ + ["cosmiconfig", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:8.3.6"],\ + ["dedent", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:1.5.3"],\ ["execa", "npm:5.0.0"],\ ["fs-extra", "npm:11.2.0"],\ ["get-stream", "npm:6.0.0"],\ @@ -428,11 +437,11 @@ const RAW_RUNTIME_STATE = ["make-dir", "npm:4.0.0"],\ ["minimatch", "npm:3.0.5"],\ ["multimatch", "npm:5.0.0"],\ - ["node-fetch", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:2.6.7"],\ + ["node-fetch", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:2.6.7"],\ ["npm-package-arg", "npm:11.0.2"],\ ["npm-packlist", "npm:8.0.2"],\ ["npm-registry-fetch", "npm:17.1.0"],\ - ["nx", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2"],\ + ["nx", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2"],\ ["p-map", "npm:4.0.0"],\ ["p-map-series", "npm:2.1.0"],\ ["p-queue", "npm:6.6.2"],\ @@ -448,6 +457,7 @@ const RAW_RUNTIME_STATE = ["slash", "npm:3.0.0"],\ ["ssri", "npm:10.0.6"],\ ["string-width", "npm:4.2.3"],\ + ["strip-ansi", "npm:6.0.1"],\ ["strong-log-transformer", "npm:2.1.0"],\ ["tar", "npm:6.2.1"],\ ["temp-dir", "npm:1.0.0"],\ @@ -469,7 +479,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "./",\ "packageDependencies": [\ ["@lullabot/drainpipe", "workspace:."],\ - ["lerna", "npm:8.1.6"]\ + ["lerna", "npm:8.1.7"]\ ],\ "linkType": "SOFT"\ }]\ @@ -481,7 +491,7 @@ const RAW_RUNTIME_STATE = ["@lullabot/drainpipe-javascript", "workspace:metapackages/javascript"],\ ["@yarnpkg/esbuild-plugin-pnp", "virtual:695acef4d4cde78b2c2255f1357379f47db3b8b1a9d58f9ea5012120207ebd42b4a754f5df7aeabf13834dd937f06dbbd452125dd55378f1b0ab87c078370032#npm:3.0.0-rc.15"],\ ["chokidar", "npm:3.6.0"],\ - ["esbuild", "npm:0.21.5"],\ + ["esbuild", "npm:0.23.0"],\ ["yargs", "npm:17.7.2"]\ ],\ "linkType": "SOFT"\ @@ -805,7 +815,7 @@ const RAW_RUNTIME_STATE = "packageLocation": "../../../../cache/others/berry/cache/@nrwl-tao-npm-19.0.2-a1224df3db-10c0.zip/node_modules/@nrwl/tao/",\ "packageDependencies": [\ ["@nrwl/tao", "npm:19.0.2"],\ - ["nx", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2"],\ + ["nx", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2"],\ ["tslib", "npm:2.6.2"]\ ],\ "linkType": "HARD"\ @@ -819,17 +829,17 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2", {\ - "packageLocation": "./.yarn/__virtual__/@nx-devkit-virtual-2baff227ad/5/cache/others/berry/cache/@nx-devkit-npm-19.0.2-34c8fa016f-10c0.zip/node_modules/@nx/devkit/",\ + ["virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2", {\ + "packageLocation": "./.yarn/__virtual__/@nx-devkit-virtual-2095ba6435/5/cache/others/berry/cache/@nx-devkit-npm-19.0.2-34c8fa016f-10c0.zip/node_modules/@nx/devkit/",\ "packageDependencies": [\ - ["@nx/devkit", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2"],\ + ["@nx/devkit", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2"],\ ["@nrwl/devkit", "npm:19.0.2"],\ ["@types/nx", null],\ ["ejs", "npm:3.1.9"],\ ["enquirer", "npm:2.3.6"],\ ["ignore", "npm:5.3.1"],\ ["minimatch", "npm:9.0.3"],\ - ["nx", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2"],\ + ["nx", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2"],\ ["semver", "npm:7.6.0"],\ ["tmp", "npm:0.2.3"],\ ["tslib", "npm:2.6.2"],\ @@ -1317,7 +1327,7 @@ const RAW_RUNTIME_STATE = "packageDependencies": [\ ["@yarnpkg/esbuild-plugin-pnp", "virtual:695acef4d4cde78b2c2255f1357379f47db3b8b1a9d58f9ea5012120207ebd42b4a754f5df7aeabf13834dd937f06dbbd452125dd55378f1b0ab87c078370032#npm:3.0.0-rc.15"],\ ["@types/esbuild", null],\ - ["esbuild", "npm:0.21.5"],\ + ["esbuild", "npm:0.23.0"],\ ["tslib", "npm:2.6.2"]\ ],\ "packagePeers": [\ @@ -2617,16 +2627,16 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:6ba921c4b372efb6467019726e5d353c8fc26b5a7ddca72a81452722f1c6ea7dbbb690a39f94c31fbff8d862d4c23dcb4f0e61c279b0c8de3e4df630a600942b#npm:8.3.6", {\ - "packageLocation": "./.yarn/__virtual__/cosmiconfig-virtual-bb699f8657/5/cache/others/berry/cache/cosmiconfig-npm-8.3.6-a5566e2779-10c0.zip/node_modules/cosmiconfig/",\ + ["virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:8.3.6", {\ + "packageLocation": "./.yarn/__virtual__/cosmiconfig-virtual-0165400283/5/cache/others/berry/cache/cosmiconfig-npm-8.3.6-a5566e2779-10c0.zip/node_modules/cosmiconfig/",\ "packageDependencies": [\ - ["cosmiconfig", "virtual:6ba921c4b372efb6467019726e5d353c8fc26b5a7ddca72a81452722f1c6ea7dbbb690a39f94c31fbff8d862d4c23dcb4f0e61c279b0c8de3e4df630a600942b#npm:8.3.6"],\ + ["cosmiconfig", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:8.3.6"],\ ["@types/typescript", null],\ ["import-fresh", "npm:3.3.0"],\ ["js-yaml", "npm:4.1.0"],\ ["parse-json", "npm:5.2.0"],\ ["path-type", "npm:4.0.0"],\ - ["typescript", "patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c"]\ + ["typescript", null]\ ],\ "packagePeers": [\ "@types/typescript",\ @@ -2634,16 +2644,16 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "HARD"\ }],\ - ["virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:8.3.6", {\ - "packageLocation": "./.yarn/__virtual__/cosmiconfig-virtual-8422a50e24/5/cache/others/berry/cache/cosmiconfig-npm-8.3.6-a5566e2779-10c0.zip/node_modules/cosmiconfig/",\ + ["virtual:ee96f315eb7eac2665167f96ecf76188eab5179e6cffa442d029491cfd3e664f13e2b43622c3a93bdd5e23577321491e1acb3768a62fd4ccccc7eacac41bf91e#npm:8.3.6", {\ + "packageLocation": "./.yarn/__virtual__/cosmiconfig-virtual-13706f7e3c/5/cache/others/berry/cache/cosmiconfig-npm-8.3.6-a5566e2779-10c0.zip/node_modules/cosmiconfig/",\ "packageDependencies": [\ - ["cosmiconfig", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:8.3.6"],\ + ["cosmiconfig", "virtual:ee96f315eb7eac2665167f96ecf76188eab5179e6cffa442d029491cfd3e664f13e2b43622c3a93bdd5e23577321491e1acb3768a62fd4ccccc7eacac41bf91e#npm:8.3.6"],\ ["@types/typescript", null],\ ["import-fresh", "npm:3.3.0"],\ ["js-yaml", "npm:4.1.0"],\ ["parse-json", "npm:5.2.0"],\ ["path-type", "npm:4.0.0"],\ - ["typescript", null]\ + ["typescript", "patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c"]\ ],\ "packagePeers": [\ "@types/typescript",\ @@ -3001,10 +3011,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:1.5.3", {\ - "packageLocation": "./.yarn/__virtual__/dedent-virtual-8eec5132cc/5/cache/others/berry/cache/dedent-npm-1.5.3-123726df15-10c0.zip/node_modules/dedent/",\ + ["virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:1.5.3", {\ + "packageLocation": "./.yarn/__virtual__/dedent-virtual-7197c37c46/5/cache/others/berry/cache/dedent-npm-1.5.3-123726df15-10c0.zip/node_modules/dedent/",\ "packageDependencies": [\ - ["dedent", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:1.5.3"],\ + ["dedent", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:1.5.3"],\ ["@types/babel-plugin-macros", null],\ ["babel-plugin-macros", null]\ ],\ @@ -3390,33 +3400,34 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["esbuild", [\ - ["npm:0.21.5", {\ - "packageLocation": "./.yarn/unplugged/esbuild-npm-0.21.5-d85dfbc965/node_modules/esbuild/",\ - "packageDependencies": [\ - ["esbuild", "npm:0.21.5"],\ - ["@esbuild/aix-ppc64", "npm:0.21.5"],\ - ["@esbuild/android-arm", "npm:0.21.5"],\ - ["@esbuild/android-arm64", "npm:0.21.5"],\ - ["@esbuild/android-x64", "npm:0.21.5"],\ - ["@esbuild/darwin-arm64", "npm:0.21.5"],\ - ["@esbuild/darwin-x64", "npm:0.21.5"],\ - ["@esbuild/freebsd-arm64", "npm:0.21.5"],\ - ["@esbuild/freebsd-x64", "npm:0.21.5"],\ - ["@esbuild/linux-arm", "npm:0.21.5"],\ - ["@esbuild/linux-arm64", "npm:0.21.5"],\ - ["@esbuild/linux-ia32", "npm:0.21.5"],\ - ["@esbuild/linux-loong64", "npm:0.21.5"],\ - ["@esbuild/linux-mips64el", "npm:0.21.5"],\ - ["@esbuild/linux-ppc64", "npm:0.21.5"],\ - ["@esbuild/linux-riscv64", "npm:0.21.5"],\ - ["@esbuild/linux-s390x", "npm:0.21.5"],\ - ["@esbuild/linux-x64", "npm:0.21.5"],\ - ["@esbuild/netbsd-x64", "npm:0.21.5"],\ - ["@esbuild/openbsd-x64", "npm:0.21.5"],\ - ["@esbuild/sunos-x64", "npm:0.21.5"],\ - ["@esbuild/win32-arm64", "npm:0.21.5"],\ - ["@esbuild/win32-ia32", "npm:0.21.5"],\ - ["@esbuild/win32-x64", "npm:0.21.5"]\ + ["npm:0.23.0", {\ + "packageLocation": "./.yarn/unplugged/esbuild-npm-0.23.0-176e4eb3ff/node_modules/esbuild/",\ + "packageDependencies": [\ + ["esbuild", "npm:0.23.0"],\ + ["@esbuild/aix-ppc64", "npm:0.23.0"],\ + ["@esbuild/android-arm", "npm:0.23.0"],\ + ["@esbuild/android-arm64", "npm:0.23.0"],\ + ["@esbuild/android-x64", "npm:0.23.0"],\ + ["@esbuild/darwin-arm64", "npm:0.23.0"],\ + ["@esbuild/darwin-x64", "npm:0.23.0"],\ + ["@esbuild/freebsd-arm64", "npm:0.23.0"],\ + ["@esbuild/freebsd-x64", "npm:0.23.0"],\ + ["@esbuild/linux-arm", "npm:0.23.0"],\ + ["@esbuild/linux-arm64", "npm:0.23.0"],\ + ["@esbuild/linux-ia32", "npm:0.23.0"],\ + ["@esbuild/linux-loong64", "npm:0.23.0"],\ + ["@esbuild/linux-mips64el", "npm:0.23.0"],\ + ["@esbuild/linux-ppc64", "npm:0.23.0"],\ + ["@esbuild/linux-riscv64", "npm:0.23.0"],\ + ["@esbuild/linux-s390x", "npm:0.23.0"],\ + ["@esbuild/linux-x64", "npm:0.23.0"],\ + ["@esbuild/netbsd-x64", "npm:0.23.0"],\ + ["@esbuild/openbsd-arm64", "npm:0.23.0"],\ + ["@esbuild/openbsd-x64", "npm:0.23.0"],\ + ["@esbuild/sunos-x64", "npm:0.23.0"],\ + ["@esbuild/win32-arm64", "npm:0.23.0"],\ + ["@esbuild/win32-ia32", "npm:0.23.0"],\ + ["@esbuild/win32-x64", "npm:0.23.0"]\ ],\ "linkType": "HARD"\ }]\ @@ -5201,15 +5212,15 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["lerna", [\ - ["npm:8.1.6", {\ - "packageLocation": "../../../../cache/others/berry/cache/lerna-npm-8.1.6-6ba921c4b3-10c0.zip/node_modules/lerna/",\ + ["npm:8.1.7", {\ + "packageLocation": "../../../../cache/others/berry/cache/lerna-npm-8.1.7-ee96f315eb-10c0.zip/node_modules/lerna/",\ "packageDependencies": [\ - ["lerna", "npm:8.1.6"],\ - ["@lerna/create", "npm:8.1.6"],\ + ["lerna", "npm:8.1.7"],\ + ["@lerna/create", "npm:8.1.7"],\ ["@npmcli/arborist", "npm:7.5.3"],\ ["@npmcli/package-json", "npm:5.2.0"],\ ["@npmcli/run-script", "npm:8.1.0"],\ - ["@nx/devkit", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2"],\ + ["@nx/devkit", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2"],\ ["@octokit/plugin-enterprise-rest", "npm:6.0.1"],\ ["@octokit/rest", "npm:19.0.11"],\ ["aproba", "npm:2.0.0"],\ @@ -5223,8 +5234,8 @@ const RAW_RUNTIME_STATE = ["conventional-changelog-angular", "npm:7.0.0"],\ ["conventional-changelog-core", "npm:5.0.1"],\ ["conventional-recommended-bump", "npm:7.0.1"],\ - ["cosmiconfig", "virtual:6ba921c4b372efb6467019726e5d353c8fc26b5a7ddca72a81452722f1c6ea7dbbb690a39f94c31fbff8d862d4c23dcb4f0e61c279b0c8de3e4df630a600942b#npm:8.3.6"],\ - ["dedent", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:1.5.3"],\ + ["cosmiconfig", "virtual:ee96f315eb7eac2665167f96ecf76188eab5179e6cffa442d029491cfd3e664f13e2b43622c3a93bdd5e23577321491e1acb3768a62fd4ccccc7eacac41bf91e#npm:8.3.6"],\ + ["dedent", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:1.5.3"],\ ["envinfo", "npm:7.13.0"],\ ["execa", "npm:5.0.0"],\ ["fs-extra", "npm:11.2.0"],\ @@ -5250,11 +5261,11 @@ const RAW_RUNTIME_STATE = ["make-dir", "npm:4.0.0"],\ ["minimatch", "npm:3.0.5"],\ ["multimatch", "npm:5.0.0"],\ - ["node-fetch", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:2.6.7"],\ + ["node-fetch", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:2.6.7"],\ ["npm-package-arg", "npm:11.0.2"],\ ["npm-packlist", "npm:8.0.2"],\ ["npm-registry-fetch", "npm:17.1.0"],\ - ["nx", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2"],\ + ["nx", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2"],\ ["p-map", "npm:4.0.0"],\ ["p-map-series", "npm:2.1.0"],\ ["p-pipe", "npm:3.1.0"],\ @@ -5272,6 +5283,7 @@ const RAW_RUNTIME_STATE = ["slash", "npm:3.0.0"],\ ["ssri", "npm:10.0.6"],\ ["string-width", "npm:4.2.3"],\ + ["strip-ansi", "npm:6.0.1"],\ ["strong-log-transformer", "npm:2.1.0"],\ ["tar", "npm:6.2.1"],\ ["temp-dir", "npm:1.0.0"],\ @@ -6043,10 +6055,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:2.6.7", {\ - "packageLocation": "./.yarn/__virtual__/node-fetch-virtual-dda4ac1d7b/5/cache/others/berry/cache/node-fetch-npm-2.6.7-777aa2a6df-10c0.zip/node_modules/node-fetch/",\ + ["virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:2.6.7", {\ + "packageLocation": "./.yarn/__virtual__/node-fetch-virtual-68f92bd210/5/cache/others/berry/cache/node-fetch-npm-2.6.7-777aa2a6df-10c0.zip/node_modules/node-fetch/",\ "packageDependencies": [\ - ["node-fetch", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:2.6.7"],\ + ["node-fetch", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:2.6.7"],\ ["@types/encoding", null],\ ["encoding", null],\ ["whatwg-url", "npm:5.0.0"]\ @@ -6388,16 +6400,16 @@ const RAW_RUNTIME_STATE = ]],\ ["nx", [\ ["npm:19.0.2", {\ - "packageLocation": "./.yarn/unplugged/nx-virtual-25ac92aaae/node_modules/nx/",\ + "packageLocation": "./.yarn/unplugged/nx-virtual-023b0c2a64/node_modules/nx/",\ "packageDependencies": [\ ["nx", "npm:19.0.2"]\ ],\ "linkType": "SOFT"\ }],\ - ["virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2", {\ - "packageLocation": "./.yarn/unplugged/nx-virtual-25ac92aaae/node_modules/nx/",\ + ["virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2", {\ + "packageLocation": "./.yarn/unplugged/nx-virtual-023b0c2a64/node_modules/nx/",\ "packageDependencies": [\ - ["nx", "virtual:8b4a0f038057092e630b513ba29c8e4c0354395336c66497622c113aade67ba74b1a1d672dc13b182b1aaa131a235d51827b38b814da1f8984e87d70b41eb021#npm:19.0.2"],\ + ["nx", "virtual:cfa1c0c10c07454a516b4bdbb45891520158c7100dbbf19d79ca663cafa610fb7da26ed29e38359f1981af8c47bf20c3e2e5271f9e724ca3fc74c1511798240f#npm:19.0.2"],\ ["@nrwl/tao", "npm:19.0.2"],\ ["@nx/nx-darwin-arm64", "npm:19.0.2"],\ ["@nx/nx-darwin-x64", "npm:19.0.2"],\ diff --git a/metapackages/javascript/package.json b/metapackages/javascript/package.json index 7f84f7da..1eb99706 100644 --- a/metapackages/javascript/package.json +++ b/metapackages/javascript/package.json @@ -5,7 +5,7 @@ "dependencies": { "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.15", "chokidar": "^3.6.0", - "esbuild": "^0.21.5", + "esbuild": "^0.23.0", "yargs": "^17.7.2" }, "repository": { diff --git a/package.json b/package.json index d70dc8a6..a2415ee4 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,6 @@ "metapackages/*" ], "devDependencies": { - "lerna": "^8.1.6" + "lerna": "^8.1.7" } } diff --git a/src/BinaryInstaller.php b/src/BinaryInstaller.php index b5db8482..5004cb15 100644 --- a/src/BinaryInstaller.php +++ b/src/BinaryInstaller.php @@ -1,5 +1,7 @@ installBinaries($event); } @@ -133,7 +135,7 @@ public function onPostInstallCmd(Event $event) * * @param event $event The event to handle */ - public function onPostUpdateCmd(Event $event) + public function onPostUpdateCmd(Event $event): void { $this->installBinaries($event); } @@ -143,7 +145,7 @@ public function onPostUpdateCmd(Event $event) * * @param event $event The event to handle */ - public function installBinaries(Event $event) + public function installBinaries(Event $event): void { foreach ($this->binaries as $binary => $info) { $platform = $this->platform; @@ -184,9 +186,11 @@ public function installBinaries(Event $event) * @param string $url * The URL to download the binary * @param string $sha + * The hash to validate + * @param string $hashalgo * The hashing algorithm to use * - * @see https://www.php.net/manual/en/function.hash-file.php + * @see https://www.php.net/manual/en/function.hash-file.php */ protected function installBinary($binary, $version, $url, $sha, $hashalgo = 'sha256'): void { @@ -258,12 +262,12 @@ protected function installBinary($binary, $version, $url, $sha, $hashalgo = 'sha * Return if a file needs to be downloaded or not. * * @param string $cacheDestination The destination path to the downloaded file. - * @param $hashalgo The hash algorithm used to validate the file. - * @param $hash The hash used to validate the file. + * @param string $hashalgo The hash algorithm used to validate the file. + * @param string $hash The hash used to validate the file. * * @return bool True if the file needs to be downloaded again, false otherwise. */ - private function needsDownload(string $cacheDestination, $hashalgo, $hash): bool { + private function needsDownload(string $cacheDestination, string $hashalgo, string $hash): bool { return !$this->cache->isEnabled() || !file_exists($cacheDestination) || hash_file($hashalgo, $cacheDestination) !== $hash; } } diff --git a/src/ScaffoldInstallerPlugin.php b/src/ScaffoldInstallerPlugin.php index 2994fa27..95919068 100644 --- a/src/ScaffoldInstallerPlugin.php +++ b/src/ScaffoldInstallerPlugin.php @@ -232,226 +232,278 @@ private function installDdevCommand(): void private function installCICommands(): void { $scaffoldPath = $this->config->get('vendor-dir') . '/lullabot/drainpipe/scaffold'; + $this->installGitlabCI($scaffoldPath); + $this->installGitHubActions($scaffoldPath); + $this->installTugboat($scaffoldPath); + } + + /** + * Install GitLab CI configuration if defined in composer.json + * + * @param string $scaffoldPath The path to the scaffold files to copy from. + */ + private function installGitlabCI(string $scaffoldPath): void { $fs = new Filesystem(); - // GitLab $fs->removeDirectory('./.drainpipe/gitlab'); - if (isset($this->extra['drainpipe']['gitlab']) && is_array($this->extra['drainpipe']['gitlab'])) { - if (file_exists('./.ddev/config.yaml')) { - $fs->ensureDirectoryExists('.gitlab/drainpipe'); - $fs->copy("$scaffoldPath/gitlab/DDEV.gitlab-ci.yml", ".gitlab/drainpipe/DDEV.gitlab-ci.yml"); - $this->io->write("🪠 [Drainpipe] .gitlab/drainpipe/DDEV.gitlab-ci.yml installed"); + + if (!isset($this->extra['drainpipe']['gitlab']) || !is_array($this->extra['drainpipe']['gitlab'])) { + return; + } + + if (file_exists('./.ddev/config.yaml')) { + $fs->ensureDirectoryExists('.gitlab/drainpipe'); + $fs->copy("$scaffoldPath/gitlab/DDEV.gitlab-ci.yml", ".gitlab/drainpipe/DDEV.gitlab-ci.yml"); + $this->io->write("🪠 [Drainpipe] .gitlab/drainpipe/DDEV.gitlab-ci.yml installed"); + } + else { + $fs->ensureDirectoryExists('./.drainpipe/gitlab'); + $fs->copy("$scaffoldPath/gitlab/Common.gitlab-ci.yml", ".drainpipe/gitlab/Common.gitlab-ci.yml"); + $this->io->write("🪠 [Drainpipe] .drainpipe/gitlab/Common.gitlab-ci.yml installed"); + } + foreach ($this->extra['drainpipe']['gitlab'] as $gitlab) { + $file = "gitlab/$gitlab.gitlab-ci.yml"; + if (file_exists("$scaffoldPath/$file")) {$fs->ensureDirectoryExists('./.drainpipe/gitlab'); + $fs->copy("$scaffoldPath/$file", ".drainpipe/$file"); + $this->io->write("🪠 [Drainpipe] .drainpipe/$file installed"); } else { - $fs->ensureDirectoryExists('./.drainpipe/gitlab'); - $fs->copy("$scaffoldPath/gitlab/Common.gitlab-ci.yml", ".drainpipe/gitlab/Common.gitlab-ci.yml"); - $this->io->write("🪠 [Drainpipe] .drainpipe/gitlab/Common.gitlab-ci.yml installed"); + $this->io->warning("🪠 [Drainpipe] $scaffoldPath/$file does not exist"); } - foreach ($this->extra['drainpipe']['gitlab'] as $gitlab) { - $file = "gitlab/$gitlab.gitlab-ci.yml"; - if (file_exists("$scaffoldPath/$file")) { - $fs->ensureDirectoryExists('./.drainpipe/gitlab'); - $fs->copy("$scaffoldPath/$file", ".drainpipe/$file"); - $this->io->write("🪠 [Drainpipe] .drainpipe/$file installed"); + + if ($gitlab === 'Pantheon') { + // @TODO this isn't really specific to GitLab + // .drainpipeignore + if (!file_exists('.drainpipeignore')) { + $fs->copy("$scaffoldPath/pantheon/.drainpipeignore", '.drainpipeignore'); } else { - $this->io->warning("🪠 [Drainpipe] $scaffoldPath/$file does not exist"); - } - - if ($gitlab === 'Pantheon') { - // @TODO this isn't really specific to GitLab - // .drainpipeignore - if (!file_exists('.drainpipeignore')) { - $fs->copy("$scaffoldPath/pantheon/.drainpipeignore", '.drainpipeignore'); - } - else { - $contents = file_get_contents('./.drainpipeignore'); - if (strpos($contents, '/web/sites/default/files') === false) { - $this->io->warning( - sprintf( - '.gitignore does not contain drainpipe ignores. Compare .drainpipeignore in the root of your repository with %s and update as needed.', - "$scaffoldPath/pantheon/.drainpipeignore" - ) - ); - } - } - // pantheon.yml - if (!file_exists('./pantheon.yml')) { - $fs->copy("$scaffoldPath/pantheon/pantheon.yml", './pantheon.yml'); - } - // settings.pantheon.php - if (!file_exists('./web/sites/default/settings.pantheon.php')) { - $fs->copy("$scaffoldPath/pantheon/settings.pantheon.php", './web/sites/default/settings.pantheon.php'); + $contents = file_get_contents('./.drainpipeignore'); + if (strpos($contents, '/web/sites/default/files') === false) { + $this->io->warning( + sprintf( + '.gitignore does not contain drainpipe ignores. Compare .drainpipeignore in the root of your repository with %s and update as needed.', + "$scaffoldPath/pantheon/.drainpipeignore" + ) + ); } } - } - if (!file_exists('./.gitlab-ci.yml')) { - $fs->copy("$scaffoldPath/gitlab/gitlab-ci.example.yml", './.gitlab-ci.yml'); - } - } - // GitHub - $fs->removeDirectory('./.github/actions/drainpipe'); - if (isset($this->extra['drainpipe']['github']) && is_array($this->extra['drainpipe']['github'])) { - $fs->ensureDirectoryExists('./.github/actions'); - $fs->copy("$scaffoldPath/github/actions/common", './.github/actions/drainpipe'); - foreach ($this->extra['drainpipe']['github'] as $github) { - if ($github === 'PantheonReviewApps') { - $fs->ensureDirectoryExists('./.github/actions/drainpipe/pantheon'); - $fs->ensureDirectoryExists('./.github/workflows'); - $fs->copy("$scaffoldPath/github/actions/pantheon", './.github/actions/drainpipe/pantheon'); - if (file_exists('./.ddev/config.yaml')) { - $fs->copy("$scaffoldPath/github/workflows/PantheonReviewAppsDDEV.yml", './.github/workflows/PantheonReviewApps.yml'); - } - else { - $fs->copy("$scaffoldPath/github/workflows/PantheonReviewApps.yml", './.github/workflows/PantheonReviewApps.yml'); - } + // pantheon.yml + if (!file_exists('./pantheon.yml')) { + $fs->copy("$scaffoldPath/pantheon/pantheon.yml", './pantheon.yml'); } - else if ($github === 'ComposerLockDiff') { - $fs->ensureDirectoryExists('./.github/workflows'); - $fs->copy("$scaffoldPath/github/workflows/ComposerLockDiff.yml", './.github/workflows/ComposerLockDiff.yml'); + // settings.pantheon.php + if (!file_exists('./web/sites/default/settings.pantheon.php')) { + $fs->copy("$scaffoldPath/pantheon/settings.pantheon.php", './web/sites/default/settings.pantheon.php'); } } } + if (!file_exists('./.gitlab-ci.yml')) { + $fs->copy("$scaffoldPath/gitlab/gitlab-ci.example.yml", './.gitlab-ci.yml'); + } + } - // Tugboat - if (isset($this->extra['drainpipe']['tugboat'])) { - // Look for a config override file before we wipe the directory. - $tugboatConfigOverride = []; - $tugboatConfigOverridePath = './.tugboat/config.drainpipe-override.yml'; - if (file_exists($tugboatConfigOverridePath)) { - $tugboatConfigOverride = Yaml::parseFile($tugboatConfigOverridePath); - $tugboatConfigOverrideFile = file_get_contents($tugboatConfigOverridePath); - } + /** + * Install GitLab CI configuration if defined in composer.json + * + * @param string $scaffoldPath The path to the scaffold files to copy from. + */ + private function installGitHubActions(string $scaffoldPath): void { + $fs = new Filesystem(); + $fs->removeDirectory('./.github/actions/drainpipe'); - // Wipe the Tugboat directory and define base config. - $fs->removeDirectory('./.tugboat'); - $binaryInstallerPlugin = new BinaryInstallerPlugin(); - $tugboatConfig = [ - 'nodejs_version' => '18', - 'webserver_image' => 'tugboatqa/php-nginx:8.1-fpm', - 'database_type' => 'mariadb', - 'database_version' => '10.11', - 'php_version' => '8.1', - 'sync_command' => 'sync', - 'build_command' => 'build', - 'update_command' => 'drupal:update', - 'init' => [], - 'task_version' => $binaryInstallerPlugin->getBinaryVersion('task'), - 'pantheon' => isset($this->extra['drainpipe']['tugboat']['pantheon']), - 'overrides' => ['php' => ''], - ]; - - // Read DDEV config. - if (file_exists('./.ddev/config.yaml')) { - $ddevConfig = Yaml::parseFile('./.ddev/config.yaml'); - $tugboatConfig['database_type'] = $ddevConfig['database']['type']; - $tugboatConfig['database_version'] = $ddevConfig['database']['version']; - $tugboatConfig['webserver_image'] = 'tugboatqa/php-nginx:' . $ddevConfig['php_version'] . '-fpm'; + if (!isset($this->extra['drainpipe']['github']) || !is_array($this->extra['drainpipe']['github'])) { + return; + } - if (!empty($ddevConfig['nodejs_version'])) { - $tugboatConfig['nodejs_version'] = $ddevConfig['nodejs_version']; + $fs->ensureDirectoryExists('./.github/actions'); + $fs->copy("$scaffoldPath/github/actions/common", './.github/actions/drainpipe'); + foreach ($this->extra['drainpipe']['github'] as $github) { + if ($github === 'PantheonReviewApps') { + $fs->ensureDirectoryExists('./.github/actions/drainpipe/pantheon'); + $fs->ensureDirectoryExists('./.github/workflows'); + $fs->copy("$scaffoldPath/github/actions/pantheon", './.github/actions/drainpipe/pantheon'); + if (file_exists('./.ddev/config.yaml')) { + $fs->copy("$scaffoldPath/github/workflows/PantheonReviewAppsDDEV.yml", './.github/workflows/PantheonReviewApps.yml'); } - if (!empty($ddevConfig['webserver_type']) && $ddevConfig['webserver_type'] === 'apache-fpm') { - $tugboatConfig['webserver_image'] = 'tugboatqa/php:' . $ddevConfig['php_version'] . '-apache'; + else { + $fs->copy("$scaffoldPath/github/workflows/PantheonReviewApps.yml", './.github/workflows/PantheonReviewApps.yml'); } } - - // Filter out unsupported config overrides. - if (!empty($tugboatConfigOverride['php']) && is_array($tugboatConfigOverride['php'])) { - $tugboatConfigOverride['php'] = array_filter($tugboatConfigOverride['php'], function($key) { - return in_array($key, ['aliases', 'urls', 'visualdiff', 'screenshot']); - }, ARRAY_FILTER_USE_KEY); - $overrideOutput = []; - foreach (explode(PHP_EOL, Yaml::dump($tugboatConfigOverride['php'], 2, 2)) as $line) { - $overrideOutput[] = str_repeat(' ', 4) . $line; - } - $tugboatConfig['overrides']['php'] = rtrim(implode("\n", $overrideOutput)); + else if ($github === 'ComposerLockDiff') { + $fs->ensureDirectoryExists('./.github/workflows'); + $fs->copy("$scaffoldPath/github/workflows/ComposerLockDiff.yml", './.github/workflows/ComposerLockDiff.yml'); } + } + } + + /** + * Installs Tugboat if defined in composer.json. + * + * @param string $scaffoldPath + */ + private function installTugboat(string $scaffoldPath): void { + $fs = new Filesystem(); + + if (!isset($this->extra['drainpipe']['tugboat']) || !is_array($this->extra['drainpipe']['tugboat'])) { + return; + } + + // Look for a config override file before we wipe the directory. + $tugboatConfigOverride = []; + $tugboatConfigOverridePath = './.tugboat/config.drainpipe-override.yml'; + if (file_exists($tugboatConfigOverridePath)) { + $tugboatConfigOverride = Yaml::parseFile($tugboatConfigOverridePath); + $tugboatConfigOverrideFile = file_get_contents($tugboatConfigOverridePath); + } - // Add Redis service. - if (file_exists('./.ddev/docker-compose.redis.yaml')) { - $redisConfig = Yaml::parseFile('.ddev/docker-compose.redis.yaml'); - $redisImage = explode(':', $redisConfig['services']['redis']['image']); - $tugboatConfig['memory_cache_type'] = 'redis'; - $tugboatConfig['memory_cache_version'] = array_pop($redisImage); + // Wipe the Tugboat directory and define base config. + $fs->removeDirectory('./.tugboat'); + $binaryInstallerPlugin = new BinaryInstallerPlugin(); + $tugboatConfig = [ + 'nodejs_version' => '18', + 'webserver_image' => 'tugboatqa/php-nginx:8.1-fpm', + 'database_type' => 'mariadb', + 'database_version' => '10.11', + 'php_version' => '8.1', + 'sync_command' => 'sync', + 'build_command' => 'build', + 'update_command' => 'drupal:update', + 'init' => [], + 'task_version' => $binaryInstallerPlugin->getBinaryVersion('task'), + 'pantheon' => isset($this->extra['drainpipe']['tugboat']['pantheon']), + 'overrides' => ['php' => ''], + ]; + + // Read DDEV config. + if (file_exists('./.ddev/config.yaml')) { + $ddevConfig = Yaml::parseFile('./.ddev/config.yaml'); + $tugboatConfig['database_type'] = $ddevConfig['database']['type']; + $tugboatConfig['database_version'] = $ddevConfig['database']['version']; + $tugboatConfig['webserver_image'] = 'tugboatqa/php-nginx:' . $ddevConfig['php_version'] . '-fpm'; + + if (!empty($ddevConfig['nodejs_version'])) { + $tugboatConfig['nodejs_version'] = $ddevConfig['nodejs_version']; + } + if (!empty($ddevConfig['webserver_type']) && $ddevConfig['webserver_type'] === 'apache-fpm') { + $tugboatConfig['webserver_image'] = 'tugboatqa/php:' . $ddevConfig['php_version'] . '-apache'; } + } - // Add Elasticsearch service. - if (file_exists('./.ddev/docker-compose.elasticsearch.yaml')) { - $esConfig = Yaml::parseFile('.ddev/docker-compose.elasticsearch.yaml'); - $esImage = explode(':', $esConfig['services']['elasticsearch']['image']); - $tugboatConfig['search_type'] = 'elasticsearch'; - $tugboatConfig['search_version'] = array_pop($esImage); + // Filter out unsupported config overrides. + if (!empty($tugboatConfigOverride['php']) && is_array($tugboatConfigOverride['php'])) { + $tugboatConfigOverride['php'] = array_filter($tugboatConfigOverride['php'], + function($key) { + return in_array($key, + ['aliases', 'urls', 'visualdiff', 'screenshot']); + }, + ARRAY_FILTER_USE_KEY); + $overrideOutput = []; + foreach (explode(PHP_EOL, + Yaml::dump($tugboatConfigOverride['php'], 2, 2)) as $line) { + $overrideOutput[] = str_repeat(' ', 4) . $line; } + $tugboatConfig['overrides']['php'] = rtrim(implode("\n", + $overrideOutput)); + } - // Add commands to Task. - if (file_exists('Taskfile.yml')) { - // Get steps out of the Taskfile. - $taskfile = Yaml::parseFile('./Taskfile.yml'); - if (isset($taskfile['tasks']['sync:tugboat'])) { - $tugboatConfig['sync_command'] = 'sync:tugboat'; - } - if (isset($taskfile['tasks']['build:tugboat'])) { - $tugboatConfig['build_command'] = 'build:tugboat'; - } - if (isset($taskfile['tasks']['update'])) { - $tugboatConfig['update_command'] = 'update'; - } - if (isset($taskfile['tasks']['update:tugboat'])) { - $tugboatConfig['update_command'] = 'update:tugboat'; - } - if (isset($taskfile['tasks']['online:tugboat'])) { - $tugboatConfig['online_command'] = 'online:tugboat'; - } - if (isset($taskfile['tasks']['tugboat:php:init'])) { - $tugboatConfig['init']['php'] = true; - } - if (isset($taskfile['tasks']['tugboat:mysql:init'])) { - $tugboatConfig['init']['mysql'] = true; - } - if (isset($taskfile['tasks']['tugboat:redis:init'])) { - $tugboatConfig['init']['redis'] = true; - } + // Add Redis service. + if (file_exists('./.ddev/docker-compose.redis.yaml')) { + $redisConfig = Yaml::parseFile('.ddev/docker-compose.redis.yaml'); + $redisImage = explode(':', + $redisConfig['services']['redis']['image']); + $tugboatConfig['memory_cache_type'] = 'redis'; + $tugboatConfig['memory_cache_version'] = array_pop($redisImage); + } + + // Add Elasticsearch service. + if (file_exists('./.ddev/docker-compose.elasticsearch.yaml')) { + $esConfig = Yaml::parseFile('.ddev/docker-compose.elasticsearch.yaml'); + $esImage = explode(':', + $esConfig['services']['elasticsearch']['image']); + $tugboatConfig['search_type'] = 'elasticsearch'; + $tugboatConfig['search_version'] = array_pop($esImage); + } + + // Add commands to Task. + if (file_exists('Taskfile.yml')) { + // Get steps out of the Taskfile. + $taskfile = Yaml::parseFile('./Taskfile.yml'); + if (isset($taskfile['tasks']['sync:tugboat'])) { + $tugboatConfig['sync_command'] = 'sync:tugboat'; + } + if (isset($taskfile['tasks']['build:tugboat'])) { + $tugboatConfig['build_command'] = 'build:tugboat'; + } + if (isset($taskfile['tasks']['update'])) { + $tugboatConfig['update_command'] = 'update'; + } + if (isset($taskfile['tasks']['update:tugboat'])) { + $tugboatConfig['update_command'] = 'update:tugboat'; + } + if (isset($taskfile['tasks']['online:tugboat'])) { + $tugboatConfig['online_command'] = 'online:tugboat'; + } + if (isset($taskfile['tasks']['tugboat:php:init'])) { + $tugboatConfig['init']['php'] = TRUE; + } + if (isset($taskfile['tasks']['tugboat:mysql:init'])) { + $tugboatConfig['init']['mysql'] = TRUE; + } + if (isset($taskfile['tasks']['tugboat:redis:init'])) { + $tugboatConfig['init']['redis'] = TRUE; } + } - // Write the config.yml and settings.tugboat.php files. - if (count($tugboatConfig) > 0) { - $fs->ensureDirectoryExists('./.tugboat'); - $fs->ensureDirectoryExists('./.tugboat/steps'); - $loader = new FilesystemLoader(__DIR__ . '/../scaffold/tugboat'); - $twig = new Environment($loader); - // Reinstate the override file. - if (isset($tugboatConfigOverrideFile)) { - file_put_contents('./.tugboat/config.drainpipe-override.yml', $tugboatConfigOverrideFile); - } - file_put_contents('./.tugboat/config.yml', $twig->render('config.yml.twig', $tugboatConfig)); - file_put_contents('./.tugboat/steps/1-init.sh', $twig->render('steps/1-init.sh.twig', $tugboatConfig)); - file_put_contents('./.tugboat/steps/2-update.sh', $twig->render('steps/2-update.sh.twig', $tugboatConfig)); - file_put_contents('./.tugboat/steps/3-build.sh', $twig->render('steps/3-build.sh.twig', $tugboatConfig)); - chmod('./.tugboat/steps/1-init.sh', 0755); - chmod('./.tugboat/steps/2-update.sh', 0755); - chmod('./.tugboat/steps/3-build.sh', 0755); - if (!empty($tugboatConfig['online_command'])) { - file_put_contents('./.tugboat/steps/4-online.sh', $twig->render('steps/4-online.sh.twig', $tugboatConfig)); - chmod('./.tugboat/steps/4-online.sh', 0755); - } + // Write the config.yml and settings.tugboat.php files. + if (count($tugboatConfig) > 0) { + $fs->ensureDirectoryExists('./.tugboat'); + $fs->ensureDirectoryExists('./.tugboat/steps'); + $loader = new FilesystemLoader(__DIR__ . '/../scaffold/tugboat'); + $twig = new Environment($loader); + // Reinstate the override file. + if (isset($tugboatConfigOverrideFile)) { + file_put_contents('./.tugboat/config.drainpipe-override.yml', + $tugboatConfigOverrideFile); + } + file_put_contents('./.tugboat/config.yml', + $twig->render('config.yml.twig', $tugboatConfig)); + file_put_contents('./.tugboat/steps/1-init.sh', + $twig->render('steps/1-init.sh.twig', $tugboatConfig)); + file_put_contents('./.tugboat/steps/2-update.sh', + $twig->render('steps/2-update.sh.twig', $tugboatConfig)); + file_put_contents('./.tugboat/steps/3-build.sh', + $twig->render('steps/3-build.sh.twig', $tugboatConfig)); + chmod('./.tugboat/steps/1-init.sh', 0755); + chmod('./.tugboat/steps/2-update.sh', 0755); + chmod('./.tugboat/steps/3-build.sh', 0755); + if (!empty($tugboatConfig['online_command'])) { + file_put_contents('./.tugboat/steps/4-online.sh', + $twig->render('steps/4-online.sh.twig', + $tugboatConfig)); + chmod('./.tugboat/steps/4-online.sh', 0755); + } - if ($tugboatConfig['database_type'] === 'mysql') { - $fs->ensureDirectoryExists('./.tugboat/scripts'); - $fs->copy("$scaffoldPath/tugboat/scripts/install-mysql-client.sh", './.tugboat/scripts/install-mysql-client.sh'); - chmod('./.tugboat/scripts/install-mysql-client.sh', 0755); - } + if ($tugboatConfig['database_type'] === 'mysql') { + $fs->ensureDirectoryExists('./.tugboat/scripts'); + $fs->copy("$scaffoldPath/tugboat/scripts/install-mysql-client.sh", + './.tugboat/scripts/install-mysql-client.sh'); + chmod('./.tugboat/scripts/install-mysql-client.sh', 0755); + } - file_put_contents('./web/sites/default/settings.tugboat.php', $twig->render('settings.tugboat.php.twig', $tugboatConfig)); - if (file_exists('./web/sites/default/settings.php')) { - $settings = file_get_contents('./web/sites/default/settings.php'); - if (strpos($settings, 'settings.tugboat.php') === false) { - $include = <<<'EOT' + file_put_contents('./web/sites/default/settings.tugboat.php', + $twig->render('settings.tugboat.php.twig', $tugboatConfig)); + if (file_exists('./web/sites/default/settings.php')) { + $settings = file_get_contents('./web/sites/default/settings.php'); + if (strpos($settings, 'settings.tugboat.php') === FALSE) { + $include = <<<'EOT' include __DIR__ . "/settings.tugboat.php"; EOT; - file_put_contents('./web/sites/default/settings.php', $include . PHP_EOL, FILE_APPEND); - } + file_put_contents('./web/sites/default/settings.php', + $include . PHP_EOL, + FILE_APPEND); } } } } + } diff --git a/yarn.lock b/yarn.lock index fed9ee0f..eb78b1db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -32,163 +32,170 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/aix-ppc64@npm:0.21.5" +"@esbuild/aix-ppc64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/aix-ppc64@npm:0.23.0" conditions: os=aix & cpu=ppc64 languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/android-arm64@npm:0.21.5" +"@esbuild/android-arm64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/android-arm64@npm:0.23.0" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/android-arm@npm:0.21.5" +"@esbuild/android-arm@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/android-arm@npm:0.23.0" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/android-x64@npm:0.21.5" +"@esbuild/android-x64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/android-x64@npm:0.23.0" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/darwin-arm64@npm:0.21.5" +"@esbuild/darwin-arm64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/darwin-arm64@npm:0.23.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/darwin-x64@npm:0.21.5" +"@esbuild/darwin-x64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/darwin-x64@npm:0.23.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/freebsd-arm64@npm:0.21.5" +"@esbuild/freebsd-arm64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/freebsd-arm64@npm:0.23.0" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/freebsd-x64@npm:0.21.5" +"@esbuild/freebsd-x64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/freebsd-x64@npm:0.23.0" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-arm64@npm:0.21.5" +"@esbuild/linux-arm64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/linux-arm64@npm:0.23.0" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-arm@npm:0.21.5" +"@esbuild/linux-arm@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/linux-arm@npm:0.23.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-ia32@npm:0.21.5" +"@esbuild/linux-ia32@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/linux-ia32@npm:0.23.0" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-loong64@npm:0.21.5" +"@esbuild/linux-loong64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/linux-loong64@npm:0.23.0" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-mips64el@npm:0.21.5" +"@esbuild/linux-mips64el@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/linux-mips64el@npm:0.23.0" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-ppc64@npm:0.21.5" +"@esbuild/linux-ppc64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/linux-ppc64@npm:0.23.0" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-riscv64@npm:0.21.5" +"@esbuild/linux-riscv64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/linux-riscv64@npm:0.23.0" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-s390x@npm:0.21.5" +"@esbuild/linux-s390x@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/linux-s390x@npm:0.23.0" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/linux-x64@npm:0.21.5" +"@esbuild/linux-x64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/linux-x64@npm:0.23.0" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/netbsd-x64@npm:0.21.5" +"@esbuild/netbsd-x64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/netbsd-x64@npm:0.23.0" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/openbsd-x64@npm:0.21.5" +"@esbuild/openbsd-arm64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/openbsd-arm64@npm:0.23.0" + conditions: os=openbsd & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/openbsd-x64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/openbsd-x64@npm:0.23.0" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/sunos-x64@npm:0.21.5" +"@esbuild/sunos-x64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/sunos-x64@npm:0.23.0" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/win32-arm64@npm:0.21.5" +"@esbuild/win32-arm64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/win32-arm64@npm:0.23.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/win32-ia32@npm:0.21.5" +"@esbuild/win32-ia32@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/win32-ia32@npm:0.23.0" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.21.5": - version: 0.21.5 - resolution: "@esbuild/win32-x64@npm:0.21.5" +"@esbuild/win32-x64@npm:0.23.0": + version: 0.23.0 + resolution: "@esbuild/win32-x64@npm:0.23.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -276,9 +283,9 @@ __metadata: languageName: node linkType: hard -"@lerna/create@npm:8.1.6": - version: 8.1.6 - resolution: "@lerna/create@npm:8.1.6" +"@lerna/create@npm:8.1.7": + version: 8.1.7 + resolution: "@lerna/create@npm:8.1.7" dependencies: "@npmcli/arborist": "npm:7.5.3" "@npmcli/package-json": "npm:5.2.0" @@ -338,6 +345,7 @@ __metadata: slash: "npm:^3.0.0" ssri: "npm:^10.0.6" string-width: "npm:^4.2.3" + strip-ansi: "npm:^6.0.1" strong-log-transformer: "npm:2.1.0" tar: "npm:6.2.1" temp-dir: "npm:1.0.0" @@ -350,7 +358,7 @@ __metadata: write-pkg: "npm:4.0.0" yargs: "npm:17.7.2" yargs-parser: "npm:21.1.1" - checksum: 10c0/833920656c3254444db7d7ea3e22331773c87c635d899ef3cd785a599fe07e2a40ceec49ad46e1962d354d96877de341615ef49e12b50ed70011df6d9dda46e6 + checksum: 10c0/9f44f4bf7741b0b594b8bd10be60c7aed8aa5335fcc9ec75bcac40744fcf4cadad40ff37b8f85445c4b9d470388df6e0bbdfcd7d5de43b681e315dc288a2fc9d languageName: node linkType: hard @@ -360,7 +368,7 @@ __metadata: dependencies: "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.15" chokidar: "npm:^3.6.0" - esbuild: "npm:^0.21.5" + esbuild: "npm:^0.23.0" yargs: "npm:^17.7.2" bin: drainpipe-javascript: ./esbuild.js @@ -391,7 +399,7 @@ __metadata: version: 0.0.0-use.local resolution: "@lullabot/drainpipe@workspace:." dependencies: - lerna: "npm:^8.1.6" + lerna: "npm:^8.1.7" languageName: unknown linkType: soft @@ -2827,33 +2835,34 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.21.5": - version: 0.21.5 - resolution: "esbuild@npm:0.21.5" - dependencies: - "@esbuild/aix-ppc64": "npm:0.21.5" - "@esbuild/android-arm": "npm:0.21.5" - "@esbuild/android-arm64": "npm:0.21.5" - "@esbuild/android-x64": "npm:0.21.5" - "@esbuild/darwin-arm64": "npm:0.21.5" - "@esbuild/darwin-x64": "npm:0.21.5" - "@esbuild/freebsd-arm64": "npm:0.21.5" - "@esbuild/freebsd-x64": "npm:0.21.5" - "@esbuild/linux-arm": "npm:0.21.5" - "@esbuild/linux-arm64": "npm:0.21.5" - "@esbuild/linux-ia32": "npm:0.21.5" - "@esbuild/linux-loong64": "npm:0.21.5" - "@esbuild/linux-mips64el": "npm:0.21.5" - "@esbuild/linux-ppc64": "npm:0.21.5" - "@esbuild/linux-riscv64": "npm:0.21.5" - "@esbuild/linux-s390x": "npm:0.21.5" - "@esbuild/linux-x64": "npm:0.21.5" - "@esbuild/netbsd-x64": "npm:0.21.5" - "@esbuild/openbsd-x64": "npm:0.21.5" - "@esbuild/sunos-x64": "npm:0.21.5" - "@esbuild/win32-arm64": "npm:0.21.5" - "@esbuild/win32-ia32": "npm:0.21.5" - "@esbuild/win32-x64": "npm:0.21.5" +"esbuild@npm:^0.23.0": + version: 0.23.0 + resolution: "esbuild@npm:0.23.0" + dependencies: + "@esbuild/aix-ppc64": "npm:0.23.0" + "@esbuild/android-arm": "npm:0.23.0" + "@esbuild/android-arm64": "npm:0.23.0" + "@esbuild/android-x64": "npm:0.23.0" + "@esbuild/darwin-arm64": "npm:0.23.0" + "@esbuild/darwin-x64": "npm:0.23.0" + "@esbuild/freebsd-arm64": "npm:0.23.0" + "@esbuild/freebsd-x64": "npm:0.23.0" + "@esbuild/linux-arm": "npm:0.23.0" + "@esbuild/linux-arm64": "npm:0.23.0" + "@esbuild/linux-ia32": "npm:0.23.0" + "@esbuild/linux-loong64": "npm:0.23.0" + "@esbuild/linux-mips64el": "npm:0.23.0" + "@esbuild/linux-ppc64": "npm:0.23.0" + "@esbuild/linux-riscv64": "npm:0.23.0" + "@esbuild/linux-s390x": "npm:0.23.0" + "@esbuild/linux-x64": "npm:0.23.0" + "@esbuild/netbsd-x64": "npm:0.23.0" + "@esbuild/openbsd-arm64": "npm:0.23.0" + "@esbuild/openbsd-x64": "npm:0.23.0" + "@esbuild/sunos-x64": "npm:0.23.0" + "@esbuild/win32-arm64": "npm:0.23.0" + "@esbuild/win32-ia32": "npm:0.23.0" + "@esbuild/win32-x64": "npm:0.23.0" dependenciesMeta: "@esbuild/aix-ppc64": optional: true @@ -2891,6 +2900,8 @@ __metadata: optional: true "@esbuild/netbsd-x64": optional: true + "@esbuild/openbsd-arm64": + optional: true "@esbuild/openbsd-x64": optional: true "@esbuild/sunos-x64": @@ -2903,7 +2914,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 10c0/fa08508adf683c3f399e8a014a6382a6b65542213431e26206c0720e536b31c09b50798747c2a105a4bbba1d9767b8d3615a74c2f7bf1ddf6d836cd11eb672de + checksum: 10c0/08c148c067795165798c0467ce02d2d1ecedc096989bded5f0d795c61a1fcbec6c14d0a3c9f4ad6185cc29ec52087acaa335ed6d98be6ad57f7fa4264626bde0 languageName: node linkType: hard @@ -4516,11 +4527,11 @@ __metadata: languageName: node linkType: hard -"lerna@npm:^8.1.6": - version: 8.1.6 - resolution: "lerna@npm:8.1.6" +"lerna@npm:^8.1.7": + version: 8.1.7 + resolution: "lerna@npm:8.1.7" dependencies: - "@lerna/create": "npm:8.1.6" + "@lerna/create": "npm:8.1.7" "@npmcli/arborist": "npm:7.5.3" "@npmcli/package-json": "npm:5.2.0" "@npmcli/run-script": "npm:8.1.0" @@ -4587,6 +4598,7 @@ __metadata: slash: "npm:3.0.0" ssri: "npm:^10.0.6" string-width: "npm:^4.2.3" + strip-ansi: "npm:^6.0.1" strong-log-transformer: "npm:2.1.0" tar: "npm:6.2.1" temp-dir: "npm:1.0.0" @@ -4602,7 +4614,7 @@ __metadata: yargs-parser: "npm:21.1.1" bin: lerna: dist/cli.js - checksum: 10c0/282ec3b5fdc48a2b3ed6eeaac1575e6a35eeaf53c4fa4113ca6b4265d46a422bf5de99b701d7fb4c94e80ec22e0099f24cc5bcab0a4a0a47095538a88e953129 + checksum: 10c0/aa3f4fb12eadafedc4736c9832a2ca7557757254b2e62f6454b4ed71cd4a92b354ced6acd92b505a8701cd948473df8bb70753fc0dd7213f8bbf4349d0b1c4d5 languageName: node linkType: hard