diff --git a/.github/workflows/e2e-embed.yml b/.github/workflows/e2e-embed.yml index 51d75b40a7..1b4ca8e10f 100644 --- a/.github/workflows/e2e-embed.yml +++ b/.github/workflows/e2e-embed.yml @@ -89,9 +89,8 @@ jobs: - name: Install playwright deps # if: steps.playwright-cache.outputs.cache-hit != 'true' run: yarn playwright install --with-deps - - run: yarn embed-tests-prepare - - run: yarn workspace @calcom/embed-core embed-tests-update-snapshots:ci - - run: yarn workspace @calcom/embed-react embed-tests-update-snapshots:ci + - name: yarn embed-tests-prepare + run: yarn turbo run embed-tests-update-snapshots:ci --scope=@calcom/embed-react --concurrency=1 - name: Upload embed-core results if: ${{ always() }} diff --git a/apps/api b/apps/api index 8b87cde733..0830abf057 160000 --- a/apps/api +++ b/apps/api @@ -1 +1 @@ -Subproject commit 8b87cde733acef43660e7105e5f67eb4f2d86d20 +Subproject commit 0830abf057033642aaad19cac398bbe7dc2d5bd5 diff --git a/apps/console b/apps/console index 3fe93861ba..b6273cf095 160000 --- a/apps/console +++ b/apps/console @@ -1 +1 @@ -Subproject commit 3fe93861ba0567f75dcad8f949f46795e887194f +Subproject commit b6273cf095f10de1717dd958066a0b2f7197e522 diff --git a/apps/web/lib/telemetry.ts b/apps/web/lib/telemetry.ts index 76e7e8e8e1..4daa71f150 100644 --- a/apps/web/lib/telemetry.ts +++ b/apps/web/lib/telemetry.ts @@ -53,16 +53,16 @@ const reportUsage: EventHandler = async (event, { fetch }) => { export const nextCollectBasicSettings: EventSinkOpts = { drivers: [ - process.env.CALCOM_LICENSE_KEY && reportUsage, - process.env.CALCOM_TELEMETRY_DISABLED !== "1" - ? { + process.env.CALCOM_LICENSE_KEY && process.env.NEXT_PUBLIC_IS_E2E !== "1" ? reportUsage : undefined, + process.env.CALCOM_TELEMETRY_DISABLED === "1" || process.env.NEXT_PUBLIC_IS_E2E === "1" + ? undefined + : { type: "jitsu", opts: { key: "s2s.2pvs2bbpqq1zxna97wcml.esb6cikfrf7yn0qoh1nj1", server: "https://t.calendso.com", }, - } - : undefined, + }, process.env.TELEMETRY_DEBUG && { type: "echo", opts: { disableColor: true } }, ], eventTypes: [ diff --git a/apps/web/package.json b/apps/web/package.json index f04d2bcb28..4804d52886 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -7,22 +7,20 @@ "analyze:server": "BUNDLE_ANALYZE=server next build", "analyze:browser": "BUNDLE_ANALYZE=browser next build", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next", - "next:dev": "next dev", - "dev": "run-p app-store:watch next:dev", + "dev": "next dev", "dx": "yarn dev", - "test": "yarn app-store:generate && jest", + "test": "jest", "test-e2e": "cd ../.. && yarn playwright test --config=tests/config/playwright.config.ts --project=chromium", "playwright-report": "playwright show-report playwright/reports/playwright-html-report", "test-codegen": "yarn playwright codegen http://localhost:3000", - "type-check": "yarn app-store:generate && tsc --pretty --noEmit", - "build": "yarn app-store:generate && next build", + "type-check": "tsc --pretty --noEmit", + "build": "next build", "start": "next start", "lint": "next lint", "lint:report": "eslint . --format json --output-file ../../lint-results/web.json", "lint:fix": "next lint . --ext .ts,.js,.tsx,.jsx --fix", "check-changed-files": "ts-node scripts/ts-check-changed-files.ts", - "app-store:watch": "yarn workspace @calcom/app-store-cli watch --watch", - "app-store:generate": "yarn workspace @calcom/app-store-cli generate" + "app-store:watch": "yarn workspace @calcom/app-store-cli watch --watch" }, "engines": { "node": ">=14.x <17", @@ -31,6 +29,7 @@ "dependencies": { "@boxyhq/saml-jackson": "0.3.6", "@calcom/app-store": "*", + "@calcom/app-store-cli": "*", "@calcom/core": "*", "@calcom/ee": "*", "@calcom/embed-core": "*", @@ -149,7 +148,6 @@ "jest": "^26.0.0", "mockdate": "^3.0.5", "module-alias": "^2.2.2", - "npm-run-all": "^4.1.5", "postcss": "^8.4.13", "tailwindcss": "^3.1.3", "ts-jest": "^26.0.0", diff --git a/package.json b/package.json index 0379702a0f..480bf894f5 100644 --- a/package.json +++ b/package.json @@ -16,15 +16,15 @@ "db-studio": "yarn workspace @calcom/prisma db-studio", "deploy": "turbo run deploy", "dev": "turbo run dev --scope=\"@calcom/web\"", - "dev:all": "yarn predev && turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/website\" --scope=\"@calcom/console\"", - "dev:api": "yarn predev && turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/api\"", - "dev:console": "yarn predev && turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/console\"", - "dev:swagger": "yarn predev && turbo run dev --scope=\"@calcom/api\" --scope=\"@calcom/swagger\"", - "dev:website": "yarn predev && turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/website\"", - "docs-dev": "yarn predev && turbo run dev --scope=\"@calcom/docs\"", + "dev:all": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/website\" --scope=\"@calcom/console\"", + "dev:api": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/api\"", + "dev:console": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/console\"", + "dev:swagger": "turbo run dev --scope=\"@calcom/api\" --scope=\"@calcom/swagger\"", + "dev:website": "turbo run dev --scope=\"@calcom/web\" --scope=\"@calcom/website\"", + "docs-dev": "turbo run dev --scope=\"@calcom/docs\"", "docs-build": "turbo run build --scope=\"@calcom/docs\" --include-dependencies", "docs-start": "turbo run start --scope=\"@calcom/docs\"", - "dx": "yarn predev && (git submodule update || true) && turbo run dx", + "dx": "turbo run dx", "format": "prettier --write \"**/*.{ts,tsx,md}\"", "heroku-postbuild": "turbo run @calcom/web#build", "lint": "turbo run lint", @@ -33,16 +33,14 @@ "pre-commit": "lint-staged", "env-check:common": "dotenv-checker --schema .env.example --env .env", "env-check:app-store": "dotenv-checker --schema .env.appStore.example --env .env.appStore", - "predev": "yarn && yarn env-check:common && yarn env-check:app-store ", "prepare": "husky install", "start": "turbo run start --scope=\"@calcom/web\"", "test": "turbo run test", "test-playwright": "yarn playwright test --config=tests/config/playwright.config.ts", "embed-tests-quick": "turbo run embed-tests-quick", "embed-tests": "turbo run embed-tests", - "test-e2e": "turbo run test-e2e --concurrency=1", + "test-e2e": "turbo run test-e2e --scope=\"@calcom/web\" --concurrency=1", "type-check": "turbo run type-check", - "embed-tests-prepare": "yarn workspace @calcom/prisma db-reset && yarn build", "app-store": "yarn workspace @calcom/app-store-cli cli" }, "devDependencies": { @@ -52,7 +50,7 @@ "prettier": "^2.5.1" }, "dependencies": { - "turbo": "1.2.9" + "turbo": "1.2.16" }, "resolutions": { "@types/node": "16.9.1", diff --git a/packages/app-store-cli/package.json b/packages/app-store-cli/package.json index 6c5501e691..2d11e26f7e 100644 --- a/packages/app-store-cli/package.json +++ b/packages/app-store-cli/package.json @@ -6,6 +6,7 @@ "node": ">=10" }, "scripts": { + "build": "ts-node --transpile-only src/app-store.ts", "cli": "ts-node --transpile-only src/cli.tsx", "watch": "ts-node --transpile-only src/app-store.ts --watch", "generate": "ts-node --transpile-only src/app-store.ts" diff --git a/packages/embeds/embed-core/package.json b/packages/embeds/embed-core/package.json index 93263327b1..206e3428a5 100644 --- a/packages/embeds/embed-core/package.json +++ b/packages/embeds/embed-core/package.json @@ -43,6 +43,7 @@ "devDependencies": { "autoprefixer": "^10.4.7", "eslint": "^8.15.0", + "npm-run-all": "^4.1.5", "postcss": "^8.4.13", "typescript": "^4.6.4", "vite": "^2.9.9", diff --git a/packages/embeds/embed-react/package.json b/packages/embeds/embed-react/package.json index 6933692cb9..a1df57d140 100644 --- a/packages/embeds/embed-react/package.json +++ b/packages/embeds/embed-react/package.json @@ -43,11 +43,12 @@ "@types/react-dom": "18.0.4", "@vitejs/plugin-react": "^1.3.2", "eslint": "^8.15.0", + "npm-run-all": "^4.1.5", "typescript": "^4.6.4", "vite": "^2.9.9" }, "dependencies": { - "@calcom/embed-core": "^1.1.0", - "@calcom/embed-snippet": "^1.0.1" + "@calcom/embed-core": "*", + "@calcom/embed-snippet": "*" } } diff --git a/packages/embeds/embed-snippet/package.json b/packages/embeds/embed-snippet/package.json index aa43dfa982..ef164f0cb0 100644 --- a/packages/embeds/embed-snippet/package.json +++ b/packages/embeds/embed-snippet/package.json @@ -26,6 +26,6 @@ "typescript": "^4.6.4" }, "dependencies": { - "@calcom/embed-core": "^1.1.0" + "@calcom/embed-core": "*" } } diff --git a/packages/prisma/package.json b/packages/prisma/package.json index 9ed3342dea..4c260b3f15 100644 --- a/packages/prisma/package.json +++ b/packages/prisma/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "scripts": { - "build": "yarn prisma migrate deploy && yarn seed-app-store", + "build": "echo 'Prisma build done'", "clean": "rm -rf .turbo && rm -rf node_modules", "db-deploy": "yarn prisma migrate deploy", "db-migrate": "yarn prisma migrate dev", @@ -13,7 +13,7 @@ "db-setup": "run-s db-up db-deploy db-seed", "db-studio": "yarn prisma studio", "db-up": "docker-compose up -d", - "dx": "yarn db-setup", + "dx": "echo 'DB setup complete'", "generate-schemas": "prisma generate && prisma format", "post-install": "yarn generate-schemas", "seed-app-store": "ts-node --transpile-only ./seed-app-store.ts", diff --git a/packages/types/environment.d.ts b/packages/types/environment.d.ts index 790e05eab8..67f3cafdd5 100644 --- a/packages/types/environment.d.ts +++ b/packages/types/environment.d.ts @@ -59,6 +59,6 @@ declare namespace NodeJS { * This is used so we can bypass emails in auth flows for E2E testing. * Set it to "1" if you need to run E2E tests locally **/ - readonly NEXT_PUBLIC_IS_E2E: 1 | undefined; + readonly NEXT_PUBLIC_IS_E2E: "1" | undefined; } } diff --git a/turbo.json b/turbo.json index 48ffaff483..fefedd22fc 100644 --- a/turbo.json +++ b/turbo.json @@ -1,48 +1,34 @@ { "$schema": "https://turborepo.org/schema.json", "baseBranch": "origin/main", - "globalDependencies": [".env", "packages/prisma/.env"], "pipeline": { - "@calcom/prisma#post-install": { - "outputs": ["./node_modules/@prisma/client/**", "./packages/prisma/schema.prisma"] - }, "@calcom/prisma#build": { - "dependsOn": ["$DATABASE_URL"] + "dependsOn": ["post-install", "db-deploy"], + "outputs": [] }, - "@calcom/prisma#db-deploy": { + "@calcom/prisma#db-migrate": { "cache": false, - "dependsOn": ["$DATABASE_URL"] - }, - "@calcom/prisma#db-reset": { - "cache": false + "dependsOn": ["@calcom/prisma#db-up"], + "inputs": ["./schema.prisma", "./migrations/**/*.sql"], + "outputs": [] }, "@calcom/prisma#db-seed": { "cache": false, - "dependsOn": ["@calcom/prisma#db-deploy"] + "dependsOn": ["@calcom/prisma#db-migrate"], + "outputs": [] + }, + "@calcom/prisma#db-up": { + "cache": false, + "outputs": [] + }, + "@calcom/prisma#dx": { + "cache": false, + "dependsOn": ["@calcom/prisma#db-migrate"], + "outputs": [] }, "@calcom/web#build": { "dependsOn": [ "^build", - "@calcom/prisma#build", - "$CALENDSO_ENCRYPTION_KEY", - "$CALCOM_LICENSE_KEY", - "$CALCOM_TELEMETRY_DISABLED", - "$CRON_API_KEY", - "$DAILY_API_KEY", - "$DAILY_SCALE_PLAN", - "$DATABASE_URL", - "$EMAIL_FROM", - "$EMAIL_SERVER_HOST", - "$EMAIL_SERVER_PASSWORD", - "$EMAIL_SERVER_PORT", - "$EMAIL_SERVER_USER", - "$GOOGLE_API_CREDENTIALS", - "$GOOGLE_LOGIN_ENABLED", - "$NEXTAUTH_SECRET", - "$MS_GRAPH_CLIENT_ID", - "$MS_GRAPH_CLIENT_SECRET", - "$NEXT_PUBLIC_HELPSCOUT_KEY", - "$NEXT_PUBLIC_INTERCOM_APP_ID", "$NEXT_PUBLIC_IS_E2E", "$NEXT_PUBLIC_LICENSE_CONSENT", "$NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE", @@ -51,71 +37,42 @@ "$NEXT_PUBLIC_STRIPE_PRO_PLAN_PRODUCT", "$NEXT_PUBLIC_STRIPE_PUBLIC_KEY", "$NEXT_PUBLIC_WEBAPP_URL", - "$NEXT_PUBLIC_WEBSITE_URL", - "$NEXT_PUBLIC_ZENDESK_KEY", - "$NEXTAUTH_COOKIE_DOMAIN", - "$NEXTAUTH_URL", - "$NEXTAUTH_COOKIE_DOMAIN", - "$PAYMENT_FEE_FIXED", - "$PAYMENT_FEE_PERCENTAGE", - "$PGSSLMODE", - "$SAML_ADMINS", - "$SAML_DATABASE_URL", - "$STRIPE_CLIENT_ID", - "$STRIPE_PRIVATE_KEY", - "$STRIPE_WEBHOOK_SECRET", - "$TANDEM_BASE_URL", - "$TANDEM_CLIENT_ID", - "$TANDEM_CLIENT_SECRET", - "$ZOOM_CLIENT_ID", - "$ZOOM_CLIENT_SECRET" + "$NEXT_PUBLIC_WEBSITE_URL" ], "outputs": [".next/**"] }, "@calcom/web#dx": { - "dependsOn": ["@calcom/prisma#dx"] + "cache": false, + "dependsOn": ["@calcom/prisma#dx"], + "outputs": [] }, "@calcom/web#start": { - "dependsOn": ["@calcom/prisma#db-deploy"] - }, - "@calcom/embed-core#build": { - "cache": false - }, - "@calcom/embed-react#build": { "cache": false, - "dependsOn": ["@calcom/embed-snippet#build", "@calcom/embed-core#build"] - }, - "@calcom/embed-snippet#build": { - "cache": false + "dependsOn": ["@calcom/prisma#db-deploy"], + "outputs": [] }, "@calcom/website#build": { "dependsOn": [ - "$NEXT_PUBLIC_INTERCOM_APP_ID", "$NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE", "$NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE", "$NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE", "$NEXT_PUBLIC_STRIPE_PRO_PLAN_PRODUCT", "$NEXT_PUBLIC_STRIPE_PUBLIC_KEY", "$NEXT_PUBLIC_WEBAPP_URL", - "$NEXT_PUBLIC_WEBSITE_URL", - "$NEXTAUTH_COOKIE_DOMAIN", - "$SECRET", - "$STRIPE_PRIVATE_KEY", - "$STRIPE_WEBHOOK_SECRET" + "$NEXT_PUBLIC_WEBSITE_URL" ], "outputs": [".next/**"] }, "build": { - "dependsOn": [ - "^build", - "@calcom/embed-core#build", - "@calcom/embed-react#build", - "@calcom/embed-react#build" - ], + "dependsOn": ["^build"], "outputs": ["dist/**", ".next/**"] }, - "db-deploy": {}, - "db-seed": {}, + "db-deploy": { + "cache": false, + "inputs": ["./migrations/**/*.sql", "./prisma/migrations/**/*.sql"], + "outputs": [] + }, + "db-seed": { "outputs": [] }, "deploy": { "cache": false, "dependsOn": ["@calcom/web#build"], @@ -125,10 +82,13 @@ "cache": false }, "dev": { + "dependsOn": ["//#env-check:common", "//#env-check:app-store"], + "outputs": [], "cache": false }, "dx": { - "cache": false + "cache": false, + "outputs": [] }, "lint": { "cache": false, @@ -139,7 +99,8 @@ "outputs": ["lint-results"] }, "post-install": { - "cache": false + "outputs": ["../../node_modules/@prisma/client/**", "../../node_modules/@prisma/admin-client/**"], + "inputs": ["./schema.prisma", "./prisma/schema.prisma"] }, "start": {}, "embed-tests": { @@ -153,11 +114,30 @@ }, "test-e2e": { "cache": false, - "dependsOn": ["@calcom/prisma#db-reset", "@calcom/web#test", "@calcom/web#build"] + "dependsOn": ["@calcom/prisma#db-seed", "@calcom/web#test", "@calcom/web#build"] }, "type-check": { - "dependsOn": ["@calcom/embed-react#build", "@calcom/embed-core#build", "@calcom/embed-snippet#build"], + "cache": false, "outputs": [] + }, + "@calcom/embed-core#embed-tests-update-snapshots:ci": { + "dependsOn": ["@calcom/web#build"] + }, + "embed-tests-update-snapshots:ci": { + "dependsOn": ["^embed-tests-update-snapshots:ci"] + }, + "@calcom/app-store-cli#build": { + "cache": false, + "inputs": ["../../app-store/**/**"], + "outputs": ["../../app-store/apps.server.generated.ts", "../../app-store/apps.browser.generated.tsx"] + }, + "//#env-check:common": { + "inputs": ["./.env.example"], + "outputs": ["./.env"] + }, + "//#env-check:app-store": { + "inputs": ["./.env.appStore.example"], + "outputs": ["./.env.appStore"] } } } diff --git a/yarn.lock b/yarn.lock index b68ff01efc..afdb7ce326 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1153,11 +1153,6 @@ intl-messageformat "9.13.0" tslib "^2.1.0" -"@fullstory/browser@^1.5.1": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@fullstory/browser/-/browser-1.5.1.tgz#4b6ce95df3a91408a8b56bac06038f4d128f9ec8" - integrity sha512-eOTR0lc2BwwyGYn7ke7aJrJpl8Ae4+KdWyiibixVn+RUG3NaQgrP7hj/KmlMnndRSO9I4YqoqZCKYwtqDFo3rw== - "@glidejs/glide@^3.5.2": version "3.5.2" resolved "https://registry.yarnpkg.com/@glidejs/glide/-/glide-3.5.2.tgz#7012c5920ecf202bbda44d8526fc979984b6dd54" @@ -3560,16 +3555,11 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node@*", "@types/node@16.9.1", "@types/node@>=12.0.0", "@types/node@>=8.1.0": +"@types/node@*", "@types/node@16.9.1", "@types/node@>=12.0.0", "@types/node@>=8.1.0", "@types/node@^12.12.6": version "16.9.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708" integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g== -"@types/node@^12.12.6": - version "12.20.55" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" - integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== - "@types/nodemailer@^6.4.4": version "6.4.4" resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.4.tgz#c265f7e7a51df587597b3a49a023acaf0c741f4b" @@ -4020,7 +4010,7 @@ acorn-jsx@^5.0.0, acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-node@^1.6.1: +acorn-node@^1.6.1, acorn-node@^1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== @@ -4206,6 +4196,11 @@ arg@^5.0.1: resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA== +arg@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" + integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== + argparse@^1.0.10, argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -6247,6 +6242,15 @@ detective@^5.2.0: defined "^1.0.0" minimist "^1.1.1" +detective@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034" + integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw== + dependencies: + acorn-node "^1.8.2" + defined "^1.0.0" + minimist "^1.2.6" + didyoumean@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" @@ -9126,7 +9130,7 @@ is-core-module@^2.2.0, is-core-module@^2.8.1: dependencies: has "^1.0.3" -is-core-module@^2.5.0: +is-core-module@^2.5.0, is-core-module@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== @@ -10840,7 +10844,7 @@ load-bmfont@^1.3.1, load-bmfont@^1.4.0: load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" - integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= + integrity sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw== dependencies: graceful-fs "^4.1.2" parse-json "^4.0.0" @@ -11407,7 +11411,7 @@ memory-pager@^1.0.2: memorystream@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" - integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI= + integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw== meow@^9.0.0: version "9.0.0" @@ -12997,7 +13001,7 @@ parse-headers@^2.0.0: parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= + integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw== dependencies: error-ex "^1.3.1" json-parse-better-errors "^1.0.1" @@ -13306,6 +13310,15 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= +postcss-import@^14.1.0: + version "14.1.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0" + integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw== + dependencies: + postcss-value-parser "^4.0.0" + read-cache "^1.0.0" + resolve "^1.1.7" + postcss-js@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00" @@ -13336,7 +13349,7 @@ postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.6: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-value-parser@^4.2.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== @@ -13350,7 +13363,7 @@ postcss@8.4.5: picocolors "^1.0.0" source-map-js "^1.0.1" -postcss@^8.3.6, postcss@^8.4.13, postcss@^8.4.8: +postcss@^8.3.6, postcss@^8.4.13, postcss@^8.4.14, postcss@^8.4.8: version "8.4.14" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== @@ -14132,6 +14145,13 @@ react@^17.0.2: loose-envify "^1.1.0" object-assign "^4.1.1" +read-cache@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA== + dependencies: + pify "^2.3.0" + read-pkg-up@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" @@ -14144,7 +14164,7 @@ read-pkg-up@^7.0.1: read-pkg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= + integrity sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA== dependencies: load-json-file "^4.0.0" normalize-package-data "^2.3.2" @@ -14469,6 +14489,15 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== +resolve@^1.1.7: + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== + dependencies: + is-core-module "^2.9.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + resolve@^1.10.0, resolve@^1.12.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.22.0: version "1.22.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" @@ -15693,6 +15722,34 @@ tailwindcss@^3.0.24: quick-lru "^5.1.1" resolve "^1.22.0" +tailwindcss@^3.1.3: + version "3.1.4" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.4.tgz#64b09059805505902139fa805d97046080bd90b9" + integrity sha512-NrxbFV4tYsga/hpWbRyUfIaBrNMXDxx5BsHgBS4v5tlyjf+sDsgBg5m9OxjrXIqAS/uR9kicxLKP+bEHI7BSeQ== + dependencies: + arg "^5.0.2" + chokidar "^3.5.3" + color-name "^1.1.4" + detective "^5.2.1" + didyoumean "^1.2.2" + dlv "^1.1.3" + fast-glob "^3.2.11" + glob-parent "^6.0.2" + is-glob "^4.0.3" + lilconfig "^2.0.5" + normalize-path "^3.0.0" + object-hash "^3.0.0" + picocolors "^1.0.0" + postcss "^8.4.14" + postcss-import "^14.1.0" + postcss-js "^4.0.0" + postcss-load-config "^3.1.4" + postcss-nested "5.0.6" + postcss-selector-parser "^6.0.10" + postcss-value-parser "^4.2.0" + quick-lru "^5.1.1" + resolve "^1.22.0" + tapable@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" @@ -16103,89 +16160,89 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -turbo-darwin-64@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.2.9.tgz#001159794757f77c4b016fc56d045c5e7bfc9510" - integrity sha512-rVwDQpi6p0GwTiqSsvtA1b3RvKl8l2y+ElZ3EKGiIIJYZt1D6wBMJoADaZ9uZ/LWkT+WKfAWNtKdwRmuBAOS6g== +turbo-darwin-64@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-darwin-64/-/turbo-darwin-64-1.2.16.tgz#1586fd6e52ffb5ad5e1e3ec8afe1c873f7fd98d9" + integrity sha512-dyitLQJdH3uLVdlH9jAkP4LqEO/K+wOXjUqOzjTciRLjQPzmsNY60/bmFHODADK4eBBl1nxbtn7tmmoT4vS1qA== -turbo-darwin-arm64@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.2.9.tgz#fb19615984d1780fdcdd9e54a607efb46a700e72" - integrity sha512-j7NgQHkQWWODw1I/saiqmjjD54uGAEq0qTTtLI3RoLaA+yI+awXmHwsiHRqsvGSyGJlBoKBcbxXkekLf21q3GA== +turbo-darwin-arm64@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-darwin-arm64/-/turbo-darwin-arm64-1.2.16.tgz#3faf9c657fa5feb16465316ac8d47c4a2790c2f1" + integrity sha512-Ex6uM4HU7rGXdhvJMpzNpp6qxglJ98nWeIi5qR/lBXHLjK3UCvSW8BEALArUJYJTXS9FZBq1a5LowFqXYsfDcA== -turbo-freebsd-64@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-freebsd-64/-/turbo-freebsd-64-1.2.9.tgz#edb2ee840ba80c257068e339d10ac460c1f9fb10" - integrity sha512-+tLb3iCOrIeGrcOJZYey5mD9qgNgKYuwRRg6FeX/6TDITvZXcCS50A2uRbaD/PQzQKs1lHcshiCe/DRtbvJ63g== +turbo-freebsd-64@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-freebsd-64/-/turbo-freebsd-64-1.2.16.tgz#2674c2078eaa79200a3b91639e530b287a735cb4" + integrity sha512-onRGKMvog8B3XDssSBIAg+FrEq9pcBoAybP7bpi/uYIH1L/WQ7YMmLn88X9JX19ehYuVOVZrjap4jWH2GIkU8A== -turbo-freebsd-arm64@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-freebsd-arm64/-/turbo-freebsd-arm64-1.2.9.tgz#aebfb5b07a2dd6e9211fb6d9827c2f2288e2ca73" - integrity sha512-gwI8jocTf036kc9GI1BebzftxrkT5pewHPA2iqvAXAJpX01G1x1iGcl8/uIbkbL5hp038nu+l2Kb+lRI96sJuA== +turbo-freebsd-arm64@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-freebsd-arm64/-/turbo-freebsd-arm64-1.2.16.tgz#88cc25733b19880b4a14a9d4f34770da9e898a92" + integrity sha512-S0EqPqxwnJuVNNXRgcHB0r8ai8LSrpHdihVJKRM7WYmIR7isccBEf/G9agrt73sCXwjvenxFs4HDR7cSvGt14Q== -turbo-linux-32@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-linux-32/-/turbo-linux-32-1.2.9.tgz#1462e45776d3ce93c57f2014745e7edb60910a44" - integrity sha512-Rm47bIsCHIae/DkXJ58YrWvdh8o4Ug9U4VnTDb9byXrz2B7624ol9XdfpXv429z7LXkQR1+WnwCMwFB4K6DyuQ== +turbo-linux-32@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-linux-32/-/turbo-linux-32-1.2.16.tgz#7c60a19acd32862085566da0f9389d2db36a7aee" + integrity sha512-ecbqmGOxgTWePGrowtwyvZGfvwaLxFWmPK21cU0PS+fzoZBaVmzYmniTdd/2EkGCw7TOPhtiT22v96fWcnRycA== -turbo-linux-64@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.2.9.tgz#0eef4a6f6f267b773ea58c4bda86922092eda3eb" - integrity sha512-8Gqi+TzEdmOmxxAukU0NO0JlIqdm98C97u9qEsxWrXTFL/xL21gKCixqsBTEO7JOISC4M8VjArxjSsITRbkD5g== +turbo-linux-64@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-linux-64/-/turbo-linux-64-1.2.16.tgz#d589bf73bbfa38fa73ad8ec786c0b89b678e7af8" + integrity sha512-q6gtdMWCzM0Sktkd73zcaQjNoeM1MjtrbwQBctWN/Sgj0eiPBPnzpIvokvx98x7RLf4qyI99/mlme0Dn5fx21A== -turbo-linux-arm64@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.2.9.tgz#57777d356bf74ef2cc284998ef86fe19c77b92c2" - integrity sha512-FVIeM7koUtyu1cNAJhPYjb90kL/ICdWoJr4PoZZYnqty5sxLsBg75bVErEDQeDzKQvwXLlcax2lEzHvaSyn/wg== +turbo-linux-arm64@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-linux-arm64/-/turbo-linux-arm64-1.2.16.tgz#9eaaee4094f71a266553248dfaadc59756696242" + integrity sha512-gUf67tYJ/N09WAZTTmtUWYrqm381tZxiulnRGAIM+iRsaTrweyUKZaYXwJvlPpI/cQOw25wCG9/IyvxLeagL8A== -turbo-linux-arm@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-linux-arm/-/turbo-linux-arm-1.2.9.tgz#2424016fb926143682f9029bd86a8d455979e075" - integrity sha512-OS+XCWiGFbuM7UNBVQdVbIJqxhVu9Sr2WxQgDcGZpCYn32yLLPlWDDGL0Cl/EG006J9k+VS1e4OzyM6kfMxS9Q== +turbo-linux-arm@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-linux-arm/-/turbo-linux-arm-1.2.16.tgz#54774c7e6e4f91ebdb211fa48b1b2a46b1e3c61c" + integrity sha512-du7uvExELNb89V3g7iM0XP21fR1Yl3EoHRcOfQz32oUqnS7idCKvbEowM9LtiluQl1dKcOIJjn1nlvvsqzkhOg== -turbo-linux-mips64le@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-linux-mips64le/-/turbo-linux-mips64le-1.2.9.tgz#e3bb35f53cb84ff836cf42fc576b6197c92a5e8a" - integrity sha512-2zVBnOVivWGpl51qO/lycfw7euM4b04AXYUmhsWkUN3FygIwyNgjuiMU8rxQOlu9VGX8X+WXkX2gfbgTovTeFw== +turbo-linux-mips64le@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-linux-mips64le/-/turbo-linux-mips64le-1.2.16.tgz#fa49b858f8ed399b44cdce285a0feb67c30ee99b" + integrity sha512-U5BM+Ql3z13uRtwMmKH/8eL+9DdTgyijC2gaX4xP0RTlcN7WfAstg8Fg/Tn2Vw9vtpVDdxwpw7dvX4kw2ghhpA== -turbo-linux-ppc64le@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-linux-ppc64le/-/turbo-linux-ppc64le-1.2.9.tgz#130041711579a1b6b3fe774d85c394425d45c0ac" - integrity sha512-EGgKyzf8IhodOF32BvE3Zlgbr/dSGuUbemC9RGSuhF1F1PMnP1nYS/t3JWN5QKZU4O2uWiIyLdC/0ZjtcGAcZQ== +turbo-linux-ppc64le@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-linux-ppc64le/-/turbo-linux-ppc64le-1.2.16.tgz#0a419310b938ef5eace46cb6c53b18099caae60c" + integrity sha512-HQWSCmVZyc5chw7Ie2ZcfZPfmM06mbEEu0Wl11Y5QWh1ZzhPNQHs/TsF4I9r146wHi62XgcrKFjkw4ARZiWsLA== -turbo-windows-32@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-windows-32/-/turbo-windows-32-1.2.9.tgz#89a0d8463dffba01627d69998bfe6ea5fa975511" - integrity sha512-XrMJMUtewlfksBUB0R7Tyw16IoqshVl6f/3R2ccMccddEMcvak0oW03FK9n+Y4F+wyIoJ22AVhu8jMv+HgEehA== +turbo-windows-32@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-windows-32/-/turbo-windows-32-1.2.16.tgz#8307dea3fab91be4e3e46aa37d76ce8e7ce3fdcb" + integrity sha512-0ZtPz5FK2qZjznMG4vvRyaabrhO8BgbN+tBx1wjXSuoICTAjYi5TwRVVRh59c3x7qQmR21Cv33CrhLBPRfeAlg== -turbo-windows-64@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.2.9.tgz#a55e3f32996ce4a8a538f9667748e7a1129ed10e" - integrity sha512-ewhj4MrqcMpW/keag4xG7YRLTJ7PzcqBc6Kc96OGD2qfK/uJV/r7H3Xt09WuYHRWwPgGEeNn8utpqdqbYfCVDw== +turbo-windows-64@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-windows-64/-/turbo-windows-64-1.2.16.tgz#9f5f725d6ab829d3cf7944ba92714e9e5bdd09d0" + integrity sha512-j8iAIixq/rGfBpHNbYOosxMasZrGuMzLILEuQGDxZgKNpYgobJ15QFHQlGR9sit1b8qPU5zZX4CtByRtkgH1Bw== -turbo-windows-arm64@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.2.9.tgz#3dc635c0031a0998be0322f9a258553f7cb4eb6e" - integrity sha512-B8BoNb/yZWAyKwQUbs2+UFzLmOu/WGv/+ADT6SQfI8jOaTenS7Od4bbMsGJT0iXcqv+v8TcWKX83KmQ6gxBQpg== +turbo-windows-arm64@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo-windows-arm64/-/turbo-windows-arm64-1.2.16.tgz#75894186e9f1d6340a30c436d563c34999e5b87c" + integrity sha512-4GpcJG3B8R9WDhwfT8fu6ZmOOfseCg6Q1cy/G8/zpJQk769yYcSnD8MgQhYgHB58aVFxZcMxBvLL6UA0UrpgWA== -turbo@1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.2.9.tgz#61257149a2a29966c9941a16e0b5ad88b07b4e79" - integrity sha512-aPGzZqmUHE9yx9TS7wcAJnDmXiuQSNXDwU5b1KrgNlFuID18TL443wna79p7k4awmf4Yuhu1cSZIvO+se72iVQ== +turbo@1.2.16: + version "1.2.16" + resolved "https://registry.yarnpkg.com/turbo/-/turbo-1.2.16.tgz#324c2d586f6fa77aa9173274f3b9d9efbe0735e4" + integrity sha512-PPUa2COKgFkyb6N3uF9AnIY3l9FZkF15QQ3U1K2wpI01D3gyGKQO0Q3DUQ4ipmciP0teBfL7H+l/QTrUA9IVvQ== optionalDependencies: - turbo-darwin-64 "1.2.9" - turbo-darwin-arm64 "1.2.9" - turbo-freebsd-64 "1.2.9" - turbo-freebsd-arm64 "1.2.9" - turbo-linux-32 "1.2.9" - turbo-linux-64 "1.2.9" - turbo-linux-arm "1.2.9" - turbo-linux-arm64 "1.2.9" - turbo-linux-mips64le "1.2.9" - turbo-linux-ppc64le "1.2.9" - turbo-windows-32 "1.2.9" - turbo-windows-64 "1.2.9" - turbo-windows-arm64 "1.2.9" + turbo-darwin-64 "1.2.16" + turbo-darwin-arm64 "1.2.16" + turbo-freebsd-64 "1.2.16" + turbo-freebsd-arm64 "1.2.16" + turbo-linux-32 "1.2.16" + turbo-linux-64 "1.2.16" + turbo-linux-arm "1.2.16" + turbo-linux-arm64 "1.2.16" + turbo-linux-mips64le "1.2.16" + turbo-linux-ppc64le "1.2.16" + turbo-windows-32 "1.2.16" + turbo-windows-64 "1.2.16" + turbo-windows-arm64 "1.2.16" tween-functions@^1.2.0: version "1.2.0"