diff --git a/.pnp.cjs b/.pnp.cjs index 04928e84e..12d49af67 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -72,6 +72,213 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ + ["@esbuild/aix-ppc64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-aix-ppc64-npm-0.20.2-6758338455/node_modules/@esbuild/aix-ppc64/",\ + "packageDependencies": [\ + ["@esbuild/aix-ppc64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/android-arm", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-android-arm-npm-0.20.2-cf548691ef/node_modules/@esbuild/android-arm/",\ + "packageDependencies": [\ + ["@esbuild/android-arm", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/android-arm64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-android-arm64-npm-0.20.2-c9aa40053b/node_modules/@esbuild/android-arm64/",\ + "packageDependencies": [\ + ["@esbuild/android-arm64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/android-x64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-android-x64-npm-0.20.2-3408e36d60/node_modules/@esbuild/android-x64/",\ + "packageDependencies": [\ + ["@esbuild/android-x64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/darwin-arm64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-darwin-arm64-npm-0.20.2-e287d70c91/node_modules/@esbuild/darwin-arm64/",\ + "packageDependencies": [\ + ["@esbuild/darwin-arm64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/darwin-x64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-darwin-x64-npm-0.20.2-f4f3a851d1/node_modules/@esbuild/darwin-x64/",\ + "packageDependencies": [\ + ["@esbuild/darwin-x64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/freebsd-arm64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-arm64-npm-0.20.2-ffc7880c5c/node_modules/@esbuild/freebsd-arm64/",\ + "packageDependencies": [\ + ["@esbuild/freebsd-arm64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/freebsd-x64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-freebsd-x64-npm-0.20.2-af00041232/node_modules/@esbuild/freebsd-x64/",\ + "packageDependencies": [\ + ["@esbuild/freebsd-x64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/linux-arm", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm-npm-0.20.2-4be18d870a/node_modules/@esbuild/linux-arm/",\ + "packageDependencies": [\ + ["@esbuild/linux-arm", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/linux-arm64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-arm64-npm-0.20.2-3a02a82580/node_modules/@esbuild/linux-arm64/",\ + "packageDependencies": [\ + ["@esbuild/linux-arm64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/linux-ia32", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-ia32-npm-0.20.2-e6bff6f093/node_modules/@esbuild/linux-ia32/",\ + "packageDependencies": [\ + ["@esbuild/linux-ia32", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/linux-loong64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-loong64-npm-0.20.2-945891c867/node_modules/@esbuild/linux-loong64/",\ + "packageDependencies": [\ + ["@esbuild/linux-loong64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/linux-mips64el", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-mips64el-npm-0.20.2-fec713d6f3/node_modules/@esbuild/linux-mips64el/",\ + "packageDependencies": [\ + ["@esbuild/linux-mips64el", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/linux-ppc64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-ppc64-npm-0.20.2-8b00b086b3/node_modules/@esbuild/linux-ppc64/",\ + "packageDependencies": [\ + ["@esbuild/linux-ppc64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/linux-riscv64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-riscv64-npm-0.20.2-9d96c604cb/node_modules/@esbuild/linux-riscv64/",\ + "packageDependencies": [\ + ["@esbuild/linux-riscv64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/linux-s390x", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-s390x-npm-0.20.2-51b15f4503/node_modules/@esbuild/linux-s390x/",\ + "packageDependencies": [\ + ["@esbuild/linux-s390x", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/linux-x64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-linux-x64-npm-0.20.2-54b0127370/node_modules/@esbuild/linux-x64/",\ + "packageDependencies": [\ + ["@esbuild/linux-x64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/netbsd-x64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-netbsd-x64-npm-0.20.2-c145af577f/node_modules/@esbuild/netbsd-x64/",\ + "packageDependencies": [\ + ["@esbuild/netbsd-x64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/openbsd-x64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-openbsd-x64-npm-0.20.2-046f912f74/node_modules/@esbuild/openbsd-x64/",\ + "packageDependencies": [\ + ["@esbuild/openbsd-x64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/sunos-x64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-sunos-x64-npm-0.20.2-474c636cb6/node_modules/@esbuild/sunos-x64/",\ + "packageDependencies": [\ + ["@esbuild/sunos-x64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/win32-arm64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-win32-arm64-npm-0.20.2-f2a0280705/node_modules/@esbuild/win32-arm64/",\ + "packageDependencies": [\ + ["@esbuild/win32-arm64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/win32-ia32", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-win32-ia32-npm-0.20.2-938717adbd/node_modules/@esbuild/win32-ia32/",\ + "packageDependencies": [\ + ["@esbuild/win32-ia32", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ + ["@esbuild/win32-x64", [\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/@esbuild-win32-x64-npm-0.20.2-4f45bbb49b/node_modules/@esbuild/win32-x64/",\ + "packageDependencies": [\ + ["@esbuild/win32-x64", "npm:0.20.2"]\ + ],\ + "linkType": "HARD"\ + }]\ + ]],\ ["@gar/promisify", [\ ["npm:1.1.2", {\ "packageLocation": "../../../../cache/others/berry/cache/@gar-promisify-npm-1.1.2-2343f94380-10c0.zip/node_modules/@gar/promisify/",\ @@ -1001,7 +1208,7 @@ const RAW_RUNTIME_STATE = ["@lullabot/drainpipe-javascript", "workspace:metapackages/javascript"],\ ["@yarnpkg/esbuild-plugin-pnp", "virtual:695acef4d4cde78b2c2255f1357379f47db3b8b1a9d58f9ea5012120207ebd42b4a754f5df7aeabf13834dd937f06dbbd452125dd55378f1b0ab87c078370032#npm:3.0.0-rc.2"],\ ["chokidar", "npm:3.6.0"],\ - ["esbuild", "npm:0.14.36"],\ + ["esbuild", "npm:0.20.2"],\ ["yargs", "npm:17.7.2"]\ ],\ "linkType": "SOFT"\ @@ -1403,7 +1610,7 @@ const RAW_RUNTIME_STATE = "packageDependencies": [\ ["@yarnpkg/esbuild-plugin-pnp", "virtual:695acef4d4cde78b2c2255f1357379f47db3b8b1a9d58f9ea5012120207ebd42b4a754f5df7aeabf13834dd937f06dbbd452125dd55378f1b0ab87c078370032#npm:3.0.0-rc.2"],\ ["@types/esbuild", null],\ - ["esbuild", "npm:0.14.36"],\ + ["esbuild", "npm:0.20.2"],\ ["tslib", "npm:1.14.1"]\ ],\ "packagePeers": [\ @@ -3334,210 +3541,33 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["esbuild", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-npm-0.14.36-388815ffc7/node_modules/esbuild/",\ - "packageDependencies": [\ - ["esbuild", "npm:0.14.36"],\ - ["esbuild-android-64", "npm:0.14.36"],\ - ["esbuild-android-arm64", "npm:0.14.36"],\ - ["esbuild-darwin-64", "npm:0.14.36"],\ - ["esbuild-darwin-arm64", "npm:0.14.36"],\ - ["esbuild-freebsd-64", "npm:0.14.36"],\ - ["esbuild-freebsd-arm64", "npm:0.14.36"],\ - ["esbuild-linux-32", "npm:0.14.36"],\ - ["esbuild-linux-64", "npm:0.14.36"],\ - ["esbuild-linux-arm", "npm:0.14.36"],\ - ["esbuild-linux-arm64", "npm:0.14.36"],\ - ["esbuild-linux-mips64le", "npm:0.14.36"],\ - ["esbuild-linux-ppc64le", "npm:0.14.36"],\ - ["esbuild-linux-riscv64", "npm:0.14.36"],\ - ["esbuild-linux-s390x", "npm:0.14.36"],\ - ["esbuild-netbsd-64", "npm:0.14.36"],\ - ["esbuild-openbsd-64", "npm:0.14.36"],\ - ["esbuild-sunos-64", "npm:0.14.36"],\ - ["esbuild-windows-32", "npm:0.14.36"],\ - ["esbuild-windows-64", "npm:0.14.36"],\ - ["esbuild-windows-arm64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-android-64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-android-64-npm-0.14.36-72c34e859b/node_modules/esbuild-android-64/",\ - "packageDependencies": [\ - ["esbuild-android-64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-android-arm64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-android-arm64-npm-0.14.36-940c7f747e/node_modules/esbuild-android-arm64/",\ - "packageDependencies": [\ - ["esbuild-android-arm64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-darwin-64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-darwin-64-npm-0.14.36-08ed271bb2/node_modules/esbuild-darwin-64/",\ - "packageDependencies": [\ - ["esbuild-darwin-64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-darwin-arm64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-darwin-arm64-npm-0.14.36-58ec86b673/node_modules/esbuild-darwin-arm64/",\ - "packageDependencies": [\ - ["esbuild-darwin-arm64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-freebsd-64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-freebsd-64-npm-0.14.36-13d1a32287/node_modules/esbuild-freebsd-64/",\ - "packageDependencies": [\ - ["esbuild-freebsd-64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-freebsd-arm64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-freebsd-arm64-npm-0.14.36-d182d2a640/node_modules/esbuild-freebsd-arm64/",\ - "packageDependencies": [\ - ["esbuild-freebsd-arm64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-linux-32", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-linux-32-npm-0.14.36-148dd99a55/node_modules/esbuild-linux-32/",\ - "packageDependencies": [\ - ["esbuild-linux-32", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-linux-64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-linux-64-npm-0.14.36-817f0689e0/node_modules/esbuild-linux-64/",\ - "packageDependencies": [\ - ["esbuild-linux-64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-linux-arm", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-linux-arm-npm-0.14.36-bad5fe4dde/node_modules/esbuild-linux-arm/",\ - "packageDependencies": [\ - ["esbuild-linux-arm", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-linux-arm64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-linux-arm64-npm-0.14.36-655d8e004a/node_modules/esbuild-linux-arm64/",\ - "packageDependencies": [\ - ["esbuild-linux-arm64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-linux-mips64le", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-linux-mips64le-npm-0.14.36-4a723210fa/node_modules/esbuild-linux-mips64le/",\ - "packageDependencies": [\ - ["esbuild-linux-mips64le", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-linux-ppc64le", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-linux-ppc64le-npm-0.14.36-42205b33a6/node_modules/esbuild-linux-ppc64le/",\ - "packageDependencies": [\ - ["esbuild-linux-ppc64le", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-linux-riscv64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-linux-riscv64-npm-0.14.36-be7aa04917/node_modules/esbuild-linux-riscv64/",\ - "packageDependencies": [\ - ["esbuild-linux-riscv64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-linux-s390x", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-linux-s390x-npm-0.14.36-770e65d871/node_modules/esbuild-linux-s390x/",\ - "packageDependencies": [\ - ["esbuild-linux-s390x", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-netbsd-64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-netbsd-64-npm-0.14.36-e520ec872c/node_modules/esbuild-netbsd-64/",\ - "packageDependencies": [\ - ["esbuild-netbsd-64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-openbsd-64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-openbsd-64-npm-0.14.36-99db8dac97/node_modules/esbuild-openbsd-64/",\ - "packageDependencies": [\ - ["esbuild-openbsd-64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-sunos-64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-sunos-64-npm-0.14.36-997a830314/node_modules/esbuild-sunos-64/",\ - "packageDependencies": [\ - ["esbuild-sunos-64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-windows-32", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-windows-32-npm-0.14.36-de983721c4/node_modules/esbuild-windows-32/",\ - "packageDependencies": [\ - ["esbuild-windows-32", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-windows-64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-windows-64-npm-0.14.36-0ff900b59d/node_modules/esbuild-windows-64/",\ - "packageDependencies": [\ - ["esbuild-windows-64", "npm:0.14.36"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["esbuild-windows-arm64", [\ - ["npm:0.14.36", {\ - "packageLocation": "./.yarn/unplugged/esbuild-windows-arm64-npm-0.14.36-e0e8034c5e/node_modules/esbuild-windows-arm64/",\ - "packageDependencies": [\ - ["esbuild-windows-arm64", "npm:0.14.36"]\ + ["npm:0.20.2", {\ + "packageLocation": "./.yarn/unplugged/esbuild-npm-0.20.2-1923187a7f/node_modules/esbuild/",\ + "packageDependencies": [\ + ["esbuild", "npm:0.20.2"],\ + ["@esbuild/aix-ppc64", "npm:0.20.2"],\ + ["@esbuild/android-arm", "npm:0.20.2"],\ + ["@esbuild/android-arm64", "npm:0.20.2"],\ + ["@esbuild/android-x64", "npm:0.20.2"],\ + ["@esbuild/darwin-arm64", "npm:0.20.2"],\ + ["@esbuild/darwin-x64", "npm:0.20.2"],\ + ["@esbuild/freebsd-arm64", "npm:0.20.2"],\ + ["@esbuild/freebsd-x64", "npm:0.20.2"],\ + ["@esbuild/linux-arm", "npm:0.20.2"],\ + ["@esbuild/linux-arm64", "npm:0.20.2"],\ + ["@esbuild/linux-ia32", "npm:0.20.2"],\ + ["@esbuild/linux-loong64", "npm:0.20.2"],\ + ["@esbuild/linux-mips64el", "npm:0.20.2"],\ + ["@esbuild/linux-ppc64", "npm:0.20.2"],\ + ["@esbuild/linux-riscv64", "npm:0.20.2"],\ + ["@esbuild/linux-s390x", "npm:0.20.2"],\ + ["@esbuild/linux-x64", "npm:0.20.2"],\ + ["@esbuild/netbsd-x64", "npm:0.20.2"],\ + ["@esbuild/openbsd-x64", "npm:0.20.2"],\ + ["@esbuild/sunos-x64", "npm:0.20.2"],\ + ["@esbuild/win32-arm64", "npm:0.20.2"],\ + ["@esbuild/win32-ia32", "npm:0.20.2"],\ + ["@esbuild/win32-x64", "npm:0.20.2"]\ ],\ "linkType": "HARD"\ }]\ diff --git a/docs/metapackages.md b/docs/metapackages.md new file mode 100644 index 000000000..ac63fb290 --- /dev/null +++ b/docs/metapackages.md @@ -0,0 +1,21 @@ +# Metapackages + +Drainpipe comes with packages that are published to npm: +- https://www.npmjs.com/package/@lullabot/drainpipe-javascript +- https://www.npmjs.com/package/@lullabot/drainpipe-sass + +## Testing Changes + +- Setup the [test site](./test-script.md) which will install the metapackages + from your local checkout +- Copy the contents of `tests/fixtures/metapackages` to the site: + ``` + ❯ pwd + /home/justafish/repos/drainpipe-test + ❯ cp -R ../drainpipe/tests/fixtures/metapackages/* . + ``` +- Install focal trap (used by `js/mobile-nav.js`) + ``` + ddev yarn add focus-trap + ``` +- Run commands from `Taskfile.yml` e.g. `ddev task javascript`, `ddev task sass` diff --git a/docs/test-script.md b/docs/test-script.md new file mode 100644 index 000000000..ae1e0b363 --- /dev/null +++ b/docs/test-script.md @@ -0,0 +1,28 @@ +# Test Script + +A test script is available in `tests/local-test.sh` to setup a Drupal site +with Drainpipe packages installed from your local checkout. + +Go to the directory above `drainpipe` and run the `tests/local-hest.sh` script +to setup a new test site e.g. +``` +❯ pwd +/home/justafish/repos/drainpipe + +❯ cd ../ +``` + +If you previously created a test site, remove it: +``` +❯ cd drainpipe-test +❯ ddev stop --remove-data --omit-snapshot +❯ cd ../ +``` + +Run the test script: +``` +❯ pwd +/home/justafish/repos +❯ ./drainpipe/tests/local-test.sh +cd drainpipe-test +``` diff --git a/metapackages/javascript/esbuild.js b/metapackages/javascript/esbuild.js index 4141e5438..2e60742f8 100644 --- a/metapackages/javascript/esbuild.js +++ b/metapackages/javascript/esbuild.js @@ -12,7 +12,7 @@ catch (error) { const yargs = require('yargs'); const { hideBin } = require('yargs/helpers') const argv = yargs(hideBin(process.argv)).argv -const { build } = require('esbuild'); +const { build, context } = require('esbuild'); const chokidar = require('chokidar'); const scripts = argv.files.split(' '); @@ -61,7 +61,7 @@ if (uniqueFileExtension.length !== 1) { const { pnpPlugin } = require('@yarnpkg/esbuild-plugin-pnp'); plugins = [pnpPlugin()] } - let builder = await build({ + let config = { plugins, entryPoints: scripts.map(script => script.split(':')[0]), outdir: uniqueBaseDir[0], @@ -70,9 +70,10 @@ if (uniqueFileExtension.length !== 1) { bundle: true, sourcemap: true, minify: !!argv.minify, - incremental: !!argv.watch, logLevel: 'info', - }); + }; + let builder = await context(config); + await build(config); if (!!argv.watch) { let ready = false; @@ -99,6 +100,9 @@ if (uniqueFileExtension.length !== 1) { } }); } + else { + process.exit(0); + } } catch (err) { console.error(err); process.exit(1); diff --git a/metapackages/javascript/package.json b/metapackages/javascript/package.json index a51113fa0..ba5de064e 100644 --- a/metapackages/javascript/package.json +++ b/metapackages/javascript/package.json @@ -5,7 +5,7 @@ "dependencies": { "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.2", "chokidar": "^3.6.0", - "esbuild": "^0.14.36", + "esbuild": "^0.20.2", "yargs": "^17.7.2" }, "repository": { diff --git a/tasks/javascript.yml b/tasks/javascript.yml index 1a95d0008..c36d3e482 100644 --- a/tasks/javascript.yml +++ b/tasks/javascript.yml @@ -34,7 +34,7 @@ tasks: COMMAND="yarn drainpipe-javascript" fi echo "$COMMAND drainpipe-javascript --files=\"$FILES\" $ARGS" - $COMMAND drainpipe-javascript --files="$FILES" $ARGS + $COMMAND --files="$FILES" $ARGS watch: desc: As compile, but continues running and watching for changes deps: diff --git a/tests/local-test.sh b/tests/local-test.sh index 2be72c535..3fe77356b 100755 --- a/tests/local-test.sh +++ b/tests/local-test.sh @@ -7,7 +7,7 @@ cd drainpipe-test cp -R ../drainpipe . ddev config --auto -ddev config --nodejs-version "18" +ddev config --nodejs-version "21" ddev start ddev composer config extra.drupal-scaffold.gitignore true ddev composer config --json extra.drupal-scaffold.allowed-packages '["lullabot/drainpipe-dev", "lullabot/drainpipe"]' @@ -28,7 +28,6 @@ echo " - exec: mysql -uroot -proot -hdb -e \"CREATE DATABASE IF NOT EXISTS fi echo " - exec: mysql -uroot -proot -hdb -e \"CREATE DATABASE IF NOT EXISTS chrome; GRANT ALL ON chrome.* TO 'db'@'%';\"" >> .ddev/config.yaml ddev config --web-environment="NIGHTWATCH_DRUPAL_URL_FIREFOX=https://drupal_firefox,NIGHTWATCH_DRUPAL_URL_CHROME=https://drupal_chrome" ddev config --additional-hostnames="*.drainpipe" -ddev config --nodejs-version=21 ddev restart ddev yarn set version berry @@ -39,9 +38,12 @@ echo ' "nightwatch@*":' >> .yarnrc.yml echo ' dependencies:' >> .yarnrc.yml echo ' ws: "*"' >> .yarnrc.yml ddev yarn add nightwatch nightwatch-axe-verbose @lullabot/nightwatch-drupal-commands --dev -yarn ddev drush --yes site:install ddev drush --uri=https://drupal_firefox --yes site:install ddev drush --uri=https://drupal_chrome --yes site:install ddev drush config:export --yes + +cp -R ../drainpipe/metapackages . +ddev yarn add drainpipe-javascript@file:./metapackages/javascript/ +ddev yarn add drainpipe-sass@file:./metapackages/sass/ diff --git a/yarn.lock b/yarn.lock index 7443421fb..e144c8cdf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -32,6 +32,167 @@ __metadata: languageName: node linkType: hard +"@esbuild/aix-ppc64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/aix-ppc64@npm:0.20.2" + conditions: os=aix & cpu=ppc64 + languageName: node + linkType: hard + +"@esbuild/android-arm64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/android-arm64@npm:0.20.2" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/android-arm@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/android-arm@npm:0.20.2" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@esbuild/android-x64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/android-x64@npm:0.20.2" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/darwin-arm64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/darwin-arm64@npm:0.20.2" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/darwin-x64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/darwin-x64@npm:0.20.2" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/freebsd-arm64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/freebsd-arm64@npm:0.20.2" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/freebsd-x64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/freebsd-x64@npm:0.20.2" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/linux-arm64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/linux-arm64@npm:0.20.2" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/linux-arm@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/linux-arm@npm:0.20.2" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"@esbuild/linux-ia32@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/linux-ia32@npm:0.20.2" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + +"@esbuild/linux-loong64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/linux-loong64@npm:0.20.2" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + +"@esbuild/linux-mips64el@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/linux-mips64el@npm:0.20.2" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + +"@esbuild/linux-ppc64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/linux-ppc64@npm:0.20.2" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + +"@esbuild/linux-riscv64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/linux-riscv64@npm:0.20.2" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + +"@esbuild/linux-s390x@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/linux-s390x@npm:0.20.2" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + +"@esbuild/linux-x64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/linux-x64@npm:0.20.2" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/netbsd-x64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/netbsd-x64@npm:0.20.2" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/openbsd-x64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/openbsd-x64@npm:0.20.2" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/sunos-x64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/sunos-x64@npm:0.20.2" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + +"@esbuild/win32-arm64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/win32-arm64@npm:0.20.2" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"@esbuild/win32-ia32@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/win32-ia32@npm:0.20.2" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"@esbuild/win32-x64@npm:0.20.2": + version: 0.20.2 + resolution: "@esbuild/win32-x64@npm:0.20.2" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@gar/promisify@npm:^1.0.1": version: 1.1.2 resolution: "@gar/promisify@npm:1.1.2" @@ -880,7 +1041,7 @@ __metadata: dependencies: "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.2" chokidar: "npm:^3.6.0" - esbuild: "npm:^0.14.36" + esbuild: "npm:^0.20.2" yargs: "npm:^17.7.2" bin: drainpipe-javascript: ./esbuild.js @@ -2867,214 +3028,83 @@ __metadata: languageName: node linkType: hard -"esbuild-android-64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-android-64@npm:0.14.36" - conditions: os=android & cpu=x64 - languageName: node - linkType: hard - -"esbuild-android-arm64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-android-arm64@npm:0.14.36" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-darwin-64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-darwin-64@npm:0.14.36" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"esbuild-darwin-arm64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-darwin-arm64@npm:0.14.36" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-freebsd-64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-freebsd-64@npm:0.14.36" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - -"esbuild-freebsd-arm64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-freebsd-arm64@npm:0.14.36" - conditions: os=freebsd & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-linux-32@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-linux-32@npm:0.14.36" - conditions: os=linux & cpu=ia32 - languageName: node - linkType: hard - -"esbuild-linux-64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-linux-64@npm:0.14.36" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"esbuild-linux-arm64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-linux-arm64@npm:0.14.36" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-linux-arm@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-linux-arm@npm:0.14.36" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"esbuild-linux-mips64le@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-linux-mips64le@npm:0.14.36" - conditions: os=linux & cpu=mips64el - languageName: node - linkType: hard - -"esbuild-linux-ppc64le@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-linux-ppc64le@npm:0.14.36" - conditions: os=linux & cpu=ppc64 - languageName: node - linkType: hard - -"esbuild-linux-riscv64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-linux-riscv64@npm:0.14.36" - conditions: os=linux & cpu=riscv64 - languageName: node - linkType: hard - -"esbuild-linux-s390x@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-linux-s390x@npm:0.14.36" - conditions: os=linux & cpu=s390x - languageName: node - linkType: hard - -"esbuild-netbsd-64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-netbsd-64@npm:0.14.36" - conditions: os=netbsd & cpu=x64 - languageName: node - linkType: hard - -"esbuild-openbsd-64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-openbsd-64@npm:0.14.36" - conditions: os=openbsd & cpu=x64 - languageName: node - linkType: hard - -"esbuild-sunos-64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-sunos-64@npm:0.14.36" - conditions: os=sunos & cpu=x64 - languageName: node - linkType: hard - -"esbuild-windows-32@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-windows-32@npm:0.14.36" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - -"esbuild-windows-64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-windows-64@npm:0.14.36" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - -"esbuild-windows-arm64@npm:0.14.36": - version: 0.14.36 - resolution: "esbuild-windows-arm64@npm:0.14.36" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - -"esbuild@npm:^0.14.36": - version: 0.14.36 - resolution: "esbuild@npm:0.14.36" - dependencies: - esbuild-android-64: "npm:0.14.36" - esbuild-android-arm64: "npm:0.14.36" - esbuild-darwin-64: "npm:0.14.36" - esbuild-darwin-arm64: "npm:0.14.36" - esbuild-freebsd-64: "npm:0.14.36" - esbuild-freebsd-arm64: "npm:0.14.36" - esbuild-linux-32: "npm:0.14.36" - esbuild-linux-64: "npm:0.14.36" - esbuild-linux-arm: "npm:0.14.36" - esbuild-linux-arm64: "npm:0.14.36" - esbuild-linux-mips64le: "npm:0.14.36" - esbuild-linux-ppc64le: "npm:0.14.36" - esbuild-linux-riscv64: "npm:0.14.36" - esbuild-linux-s390x: "npm:0.14.36" - esbuild-netbsd-64: "npm:0.14.36" - esbuild-openbsd-64: "npm:0.14.36" - esbuild-sunos-64: "npm:0.14.36" - esbuild-windows-32: "npm:0.14.36" - esbuild-windows-64: "npm:0.14.36" - esbuild-windows-arm64: "npm:0.14.36" +"esbuild@npm:^0.20.2": + version: 0.20.2 + resolution: "esbuild@npm:0.20.2" + dependencies: + "@esbuild/aix-ppc64": "npm:0.20.2" + "@esbuild/android-arm": "npm:0.20.2" + "@esbuild/android-arm64": "npm:0.20.2" + "@esbuild/android-x64": "npm:0.20.2" + "@esbuild/darwin-arm64": "npm:0.20.2" + "@esbuild/darwin-x64": "npm:0.20.2" + "@esbuild/freebsd-arm64": "npm:0.20.2" + "@esbuild/freebsd-x64": "npm:0.20.2" + "@esbuild/linux-arm": "npm:0.20.2" + "@esbuild/linux-arm64": "npm:0.20.2" + "@esbuild/linux-ia32": "npm:0.20.2" + "@esbuild/linux-loong64": "npm:0.20.2" + "@esbuild/linux-mips64el": "npm:0.20.2" + "@esbuild/linux-ppc64": "npm:0.20.2" + "@esbuild/linux-riscv64": "npm:0.20.2" + "@esbuild/linux-s390x": "npm:0.20.2" + "@esbuild/linux-x64": "npm:0.20.2" + "@esbuild/netbsd-x64": "npm:0.20.2" + "@esbuild/openbsd-x64": "npm:0.20.2" + "@esbuild/sunos-x64": "npm:0.20.2" + "@esbuild/win32-arm64": "npm:0.20.2" + "@esbuild/win32-ia32": "npm:0.20.2" + "@esbuild/win32-x64": "npm:0.20.2" dependenciesMeta: - esbuild-android-64: + "@esbuild/aix-ppc64": + optional: true + "@esbuild/android-arm": + optional: true + "@esbuild/android-arm64": + optional: true + "@esbuild/android-x64": optional: true - esbuild-android-arm64: + "@esbuild/darwin-arm64": optional: true - esbuild-darwin-64: + "@esbuild/darwin-x64": optional: true - esbuild-darwin-arm64: + "@esbuild/freebsd-arm64": optional: true - esbuild-freebsd-64: + "@esbuild/freebsd-x64": optional: true - esbuild-freebsd-arm64: + "@esbuild/linux-arm": optional: true - esbuild-linux-32: + "@esbuild/linux-arm64": optional: true - esbuild-linux-64: + "@esbuild/linux-ia32": optional: true - esbuild-linux-arm: + "@esbuild/linux-loong64": optional: true - esbuild-linux-arm64: + "@esbuild/linux-mips64el": optional: true - esbuild-linux-mips64le: + "@esbuild/linux-ppc64": optional: true - esbuild-linux-ppc64le: + "@esbuild/linux-riscv64": optional: true - esbuild-linux-riscv64: + "@esbuild/linux-s390x": optional: true - esbuild-linux-s390x: + "@esbuild/linux-x64": optional: true - esbuild-netbsd-64: + "@esbuild/netbsd-x64": optional: true - esbuild-openbsd-64: + "@esbuild/openbsd-x64": optional: true - esbuild-sunos-64: + "@esbuild/sunos-x64": optional: true - esbuild-windows-32: + "@esbuild/win32-arm64": optional: true - esbuild-windows-64: + "@esbuild/win32-ia32": optional: true - esbuild-windows-arm64: + "@esbuild/win32-x64": optional: true bin: esbuild: bin/esbuild - checksum: cd25d0a2f774a542f187fed4616a5c199d843c4af06080226471e2365ca889d39d01554e9afdd110e5dfefa84d548ed58a4b60cd848f124441fa4116ade4c626 + checksum: 66398f9fb2c65e456a3e649747b39af8a001e47963b25e86d9c09d2a48d61aa641b27da0ce5cad63df95ad246105e1d83e7fee0e1e22a0663def73b1c5101112 languageName: node linkType: hard