diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 11120dab4..25c062720 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,14 +8,14 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 20 steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - uses: supabase/setup-cli@v1 with: version: latest - name: Setup Node.js 18.x - uses: actions/setup-node@master + uses: actions/setup-node@v3 with: node-version: 18.x @@ -52,7 +52,7 @@ jobs: # doesn't seem to cause significant speed up, probably because it still needs to install deps - name: cache playwright id: playwright-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.cache/ms-playwright key: pw3-${{ runner.os }}-${{ hashFiles('./package-lock.json') }} @@ -67,7 +67,7 @@ jobs: # key: lerna-${{ runner.os }}-${{ hashFiles('./package-lock.json') }} - name: Cache node modules - uses: actions/cache@v2 + uses: actions/cache@v3 env: cache-name: cache-node-modules with: @@ -143,7 +143,7 @@ jobs: - name: Run Playwright tests (against preview) run: npm run playwright:preview - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: always() with: name: playwright-report-editor diff --git a/package-lock.json b/package-lock.json index 3134f504c..9d6030a36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -443,21 +443,6 @@ "react": "^16.8.0" } }, - "node_modules/@atlaskit/lozenge": { - "version": "11.4.3", - "resolved": "https://registry.npmjs.org/@atlaskit/lozenge/-/lozenge-11.4.3.tgz", - "integrity": "sha512-BEqQAOOyL523Xqr9otMcGjvqGhGF2W6lXyDCQqTsen3D5EeCg5VZK7/ssZLt7LTz3oA32Fa2J/aLIoa3yI6L1Q==", - "dependencies": { - "@atlaskit/codemod-utils": "^4.2.0", - "@atlaskit/ds-explorations": "^2.2.0", - "@atlaskit/theme": "^12.5.0", - "@atlaskit/tokens": "^1.13.0", - "@babel/runtime": "^7.0.0" - }, - "peerDependencies": { - "react": "^16.8.0" - } - }, "node_modules/@atlaskit/menu": { "version": "1.9.8", "resolved": "https://registry.npmjs.org/@atlaskit/menu/-/menu-1.9.8.tgz", @@ -789,47 +774,6 @@ "react": "^16.8.0" } }, - "node_modules/@atlaskit/ufo": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@atlaskit/ufo/-/ufo-0.2.3.tgz", - "integrity": "sha512-X4gb51CBWrIaJVrRfrgcwycYjsrVKkK/VSuP1i/shYNiMKMUdSHSVAOR5UwfbR7D55LcnfOSF4gCQSZ48Kq3SA==", - "dependencies": { - "@babel/runtime": "^7.0.0", - "uuid": "^3.1.0" - }, - "peerDependencies": { - "react": "^16.8.0" - } - }, - "node_modules/@atlaskit/user-picker": { - "version": "10.5.1", - "resolved": "https://registry.npmjs.org/@atlaskit/user-picker/-/user-picker-10.5.1.tgz", - "integrity": "sha512-drkNju4JmQC0p+jftrO1rNCS83FuL0MleQ5b27djqL9QQZ73IrGcxNjVWFovc/jheU8f+CBtbjbnTRyZOER6tQ==", - "dependencies": { - "@atlaskit/analytics-next": "^9.1.0", - "@atlaskit/avatar": "^21.3.0", - "@atlaskit/icon": "^21.12.0", - "@atlaskit/logo": "^13.14.0", - "@atlaskit/lozenge": "^11.4.0", - "@atlaskit/popper": "^5.5.0", - "@atlaskit/select": "^16.5.0", - "@atlaskit/spinner": "^15.5.0", - "@atlaskit/theme": "^12.5.0", - "@atlaskit/tokens": "^1.14.0", - "@atlaskit/tooltip": "^17.8.0", - "@atlaskit/ufo": "^0.2.0", - "@babel/runtime": "^7.0.0", - "@emotion/react": "^11.7.1", - "lodash": "^4.17.21", - "memoize-one": "^6.0.0", - "uuid": "^3.1.0" - }, - "peerDependencies": { - "react": "^16.8.0", - "react-dom": "^16.8.0", - "react-intl-next": "npm:react-intl@^5.18.1" - } - }, "node_modules/@atlaskit/visually-hidden": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/@atlaskit/visually-hidden/-/visually-hidden-1.2.4.tgz", @@ -2940,14 +2884,6 @@ "yjs": "^13.6.1" } }, - "node_modules/@blocknote/core/node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/@blocknote/react": { "version": "0.9.2", "resolved": "https://registry.npmjs.org/@blocknote/react/-/react-0.9.2.tgz", @@ -3558,92 +3494,6 @@ "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz", "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==" }, - "node_modules/@formatjs/ecma402-abstract": { - "version": "1.11.4", - "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.4.tgz", - "integrity": "sha512-EBikYFp2JCdIfGEb5G9dyCkTGDmC57KSHhRQOC3aYxoPWVZvfWCDjZwkGYHN7Lis/fmuWl906bnNTJifDQ3sXw==", - "dependencies": { - "@formatjs/intl-localematcher": "0.2.25", - "tslib": "^2.1.0" - } - }, - "node_modules/@formatjs/fast-memoize": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz", - "integrity": "sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==", - "dependencies": { - "tslib": "^2.1.0" - } - }, - "node_modules/@formatjs/icu-messageformat-parser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz", - "integrity": "sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==", - "dependencies": { - "@formatjs/ecma402-abstract": "1.11.4", - "@formatjs/icu-skeleton-parser": "1.3.6", - "tslib": "^2.1.0" - } - }, - "node_modules/@formatjs/icu-skeleton-parser": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz", - "integrity": "sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==", - "dependencies": { - "@formatjs/ecma402-abstract": "1.11.4", - "tslib": "^2.1.0" - } - }, - "node_modules/@formatjs/intl": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.2.1.tgz", - "integrity": "sha512-vgvyUOOrzqVaOFYzTf2d3+ToSkH2JpR7x/4U1RyoHQLmvEaTQvXJ7A2qm1Iy3brGNXC/+/7bUlc3lpH+h/LOJA==", - "dependencies": { - "@formatjs/ecma402-abstract": "1.11.4", - "@formatjs/fast-memoize": "1.2.1", - "@formatjs/icu-messageformat-parser": "2.1.0", - "@formatjs/intl-displaynames": "5.4.3", - "@formatjs/intl-listformat": "6.5.3", - "intl-messageformat": "9.13.0", - "tslib": "^2.1.0" - }, - "peerDependencies": { - "typescript": "^4.5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@formatjs/intl-displaynames": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.4.3.tgz", - "integrity": "sha512-4r12A3mS5dp5hnSaQCWBuBNfi9Amgx2dzhU4lTFfhSxgb5DOAiAbMpg6+7gpWZgl4ahsj3l2r/iHIjdmdXOE2Q==", - "dependencies": { - "@formatjs/ecma402-abstract": "1.11.4", - "@formatjs/intl-localematcher": "0.2.25", - "tslib": "^2.1.0" - } - }, - "node_modules/@formatjs/intl-listformat": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.5.3.tgz", - "integrity": "sha512-ozpz515F/+3CU+HnLi5DYPsLa6JoCfBggBSSg/8nOB5LYSFW9+ZgNQJxJ8tdhKYeODT+4qVHX27EeJLoxLGLNg==", - "dependencies": { - "@formatjs/ecma402-abstract": "1.11.4", - "@formatjs/intl-localematcher": "0.2.25", - "tslib": "^2.1.0" - } - }, - "node_modules/@formatjs/intl-localematcher": { - "version": "0.2.25", - "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.2.25.tgz", - "integrity": "sha512-YmLcX70BxoSopLFdLr1Ds99NdlTI2oWoLbaUW2M406lxOIPzE1KQhRz2fPUkq34xVZQaihCoU29h0KK7An3bhA==", - "dependencies": { - "tslib": "^2.1.0" - } - }, "node_modules/@hocuspocus/common": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/@hocuspocus/common/-/common-2.4.0.tgz", @@ -4952,6 +4802,16 @@ "resolved": "https://registry.npmjs.org/@types/phoenix/-/phoenix-1.6.0.tgz", "integrity": "sha512-qwfpsHmFuhAS/dVd4uBIraMxRd56vwBUYQGZ6GpXnFuM2XMRFJbIyruFKKlW2daQliuYZwe0qfn/UjFCDKic5g==" }, + "node_modules/@types/prettier": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-3.0.0.tgz", + "integrity": "sha512-mFMBfMOz8QxhYVbuINtswBp9VL2b4Y0QqYHwqLz3YbgtfAcat2Dl6Y1o4e22S/OVE6Ebl9m7wWiMT2lSbAs1wA==", + "deprecated": "This is a stub types definition. prettier provides its own type definitions, so you do not need this installed.", + "dev": true, + "dependencies": { + "prettier": "*" + } + }, "node_modules/@types/prop-types": { "version": "15.7.5", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", @@ -5589,6 +5449,12 @@ "ieee754": "^1.1.13" } }, + "node_modules/abstract-leveldown/node_modules/immediate": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz", + "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==", + "optional": true + }, "node_modules/acorn": { "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", @@ -5923,6 +5789,12 @@ "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==", "dev": true }, + "node_modules/async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", + "optional": true + }, "node_modules/async-lock": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.4.0.tgz", @@ -7156,9 +7028,9 @@ "dev": true }, "node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, "node_modules/encoding-down": { @@ -7700,6 +7572,12 @@ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" } }, + "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true + }, "node_modules/eslint-plugin-react": { "version": "7.33.2", "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", @@ -9055,10 +8933,9 @@ } }, "node_modules/immediate": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz", - "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==", - "optional": true + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" }, "node_modules/import-fresh": { "version": "3.3.0", @@ -9125,17 +9002,6 @@ "node": ">= 0.4" } }, - "node_modules/intl-messageformat": { - "version": "9.13.0", - "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.13.0.tgz", - "integrity": "sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==", - "dependencies": { - "@formatjs/ecma402-abstract": "1.11.4", - "@formatjs/fast-memoize": "1.2.1", - "@formatjs/icu-messageformat-parser": "2.1.0", - "tslib": "^2.1.0" - } - }, "node_modules/is-arguments": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", @@ -10161,11 +10027,6 @@ "immediate": "~3.0.5" } }, - "node_modules/lie/node_modules/immediate": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" - }, "node_modules/lilconfig": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", @@ -11565,18 +11426,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node_modules/mocha/node_modules/nanoid": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", - "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", - "dev": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/mocha/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -11620,20 +11469,15 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nanoid": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz", - "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", + "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", + "dev": true, "bin": { - "nanoid": "bin/nanoid.js" + "nanoid": "bin/nanoid.cjs" }, "engines": { - "node": "^14 || ^16 || >=18" + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" } }, "node_modules/napi-macros": { @@ -12631,6 +12475,24 @@ "url": "https://github.com/chalk/ansi-regex?sponsor=1" } }, + "node_modules/playwright-test/node_modules/nanoid": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz", + "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.js" + }, + "engines": { + "node": "^14 || ^16 || >=18" + } + }, "node_modules/playwright-test/node_modules/playwright-core": { "version": "1.35.1", "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz", @@ -12744,6 +12606,20 @@ "node": ">=6" } }, + "node_modules/prettier": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.2.tgz", + "integrity": "sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/pretty-format": { "version": "29.6.2", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz", @@ -12932,9 +12808,9 @@ } }, "node_modules/prosemirror-menu": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/prosemirror-menu/-/prosemirror-menu-1.2.3.tgz", - "integrity": "sha512-13H9+XvdJiUt2vQVMqCveFbc7YfEKR3g70pUwuQdQLwuvNfVGTzMHr1y5dwdY5vOBQbzhmjgnWUnclKzMdnlJA==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/prosemirror-menu/-/prosemirror-menu-1.2.4.tgz", + "integrity": "sha512-S/bXlc0ODQup6aiBbWVsX/eM+xJgCTAfMq/nLqaO5ID/am4wS0tTCIkzwytmao7ypEtjj39i7YbJjAgO20mIqA==", "dependencies": { "crelt": "^1.0.0", "prosemirror-commands": "^1.0.0", @@ -13240,33 +13116,6 @@ "react": "^16.8.4 || ^17.0.0 || ^18.0.0" } }, - "node_modules/react-intl-next": { - "name": "react-intl", - "version": "5.25.1", - "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.25.1.tgz", - "integrity": "sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==", - "dependencies": { - "@formatjs/ecma402-abstract": "1.11.4", - "@formatjs/icu-messageformat-parser": "2.1.0", - "@formatjs/intl": "2.2.1", - "@formatjs/intl-displaynames": "5.4.3", - "@formatjs/intl-listformat": "6.5.3", - "@types/hoist-non-react-statics": "^3.3.1", - "@types/react": "16 || 17 || 18", - "hoist-non-react-statics": "^3.3.2", - "intl-messageformat": "9.13.0", - "tslib": "^2.1.0" - }, - "peerDependencies": { - "react": "^16.3.0 || 17 || 18", - "typescript": "^4.5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -14210,12 +14059,6 @@ "node": ">=8" } }, - "node_modules/string-width/node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, "node_modules/string.prototype.matchall": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz", @@ -14825,17 +14668,16 @@ } }, "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "devOptional": true, - "peer": true, + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", + "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=12.20" } }, "node_modules/ua-parser-js": { @@ -15259,12 +15101,11 @@ "devOptional": true }, "node_modules/uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "bin": { - "uuid": "bin/uuid" + "uuid": "dist/bin/uuid" } }, "node_modules/uvu": { @@ -15974,6 +15815,15 @@ "yjs": "^13.5.6" } }, + "node_modules/y-websocket/node_modules/ws": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz", + "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==", + "optional": true, + "dependencies": { + "async-limiter": "~1.0.0" + } + }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -16120,7 +15970,6 @@ "@atlaskit/textarea": "^4.7.4", "@atlaskit/textfield": "^5.6.3", "@atlaskit/tree": "^8.8.5", - "@atlaskit/user-picker": "^10.4.0", "@blocknote/core": "^0.9.2", "@emotion/react": "^11.4.0", "@hocuspocus/provider": "2.1.0", @@ -16147,10 +15996,8 @@ "react-dom": "^18.2.0", "react-error-overlay": "^6.0.9", "react-icons": "^4.6.0", - "react-intl-next": "npm:react-intl@^5.18.1", "react-router-dom": "^6.10.0", "speakingurl": "^14.0.1", - "tippy.js": "^6.3.1", "vscode-lib": "^0.1.2", "web-vitals": "^1.0.1", "y-indexeddb": "9.0.6", @@ -16295,19 +16142,6 @@ "node": ">=14" } }, - "packages/engine/node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=12.20" - } - }, "packages/engine/node_modules/whatwg-url": { "version": "12.0.1", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz", @@ -16391,16 +16225,6 @@ "vitest": "^0.33.0" } }, - "packages/frame/node_modules/@types/prettier": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-3.0.0.tgz", - "integrity": "sha512-mFMBfMOz8QxhYVbuINtswBp9VL2b4Y0QqYHwqLz3YbgtfAcat2Dl6Y1o4e22S/OVE6Ebl9m7wWiMT2lSbAs1wA==", - "deprecated": "This is a stub types definition. prettier provides its own type definitions, so you do not need this installed.", - "dev": true, - "dependencies": { - "prettier": "*" - } - }, "packages/frame/node_modules/cssstyle": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz", @@ -16469,20 +16293,6 @@ } } }, - "packages/frame/node_modules/prettier": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.2.tgz", - "integrity": "sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==", - "bin": { - "prettier": "bin/prettier.cjs" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "packages/frame/node_modules/tr46": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", @@ -16495,19 +16305,6 @@ "node": ">=14" } }, - "packages/frame/node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=12.20" - } - }, "packages/frame/node_modules/whatwg-url": { "version": "12.0.1", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz", @@ -16647,19 +16444,6 @@ "node": ">=14" } }, - "packages/parsers/node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=12.20" - } - }, "packages/parsers/node_modules/whatwg-url": { "version": "12.0.1", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz", @@ -16722,19 +16506,6 @@ "yjs": "^13.6.4" } }, - "packages/server/node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=12.20" - } - }, "packages/server/node_modules/ws": { "version": "8.13.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", @@ -16785,32 +16556,6 @@ "yjs": "^13.6.4" } }, - "packages/shared-test/node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=12.20" - } - }, - "packages/shared/node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=12.20" - } - }, "packages/util": { "name": "@typecell-org/util", "version": "0.0.3", @@ -16830,25 +16575,21 @@ "react": "17 || 18" } }, - "packages/util/node_modules/typescript": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", - "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==", - "dev": true, + "packages/util/node_modules/nanoid": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-4.0.2.tgz", + "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" + "nanoid": "bin/nanoid.js" }, "engines": { - "node": ">=12.20" - } - }, - "packages/util/node_modules/uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "bin": { - "uuid": "dist/bin/uuid" + "node": "^14 || ^16 || >=18" } } } diff --git a/packages/editor/package.json b/packages/editor/package.json index 3b4f3a536..ae763a1d3 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -24,7 +24,6 @@ "@atlaskit/textarea": "^4.7.4", "@atlaskit/textfield": "^5.6.3", "@atlaskit/tree": "^8.8.5", - "@atlaskit/user-picker": "^10.4.0", "@tiptap/core": "^2.0.4", "@blocknote/core": "^0.9.2", "@emotion/react": "^11.4.0", @@ -51,9 +50,7 @@ "react-dom": "^18.2.0", "react-error-overlay": "^6.0.9", "react-icons": "^4.6.0", - "react-intl-next": "npm:react-intl@^5.18.1", "react-router-dom": "^6.10.0", - "tippy.js": "^6.3.1", "vscode-lib": "^0.1.2", "web-vitals": "^1.0.1", "y-indexeddb": "9.0.6", diff --git a/packages/editor/src/app/supabase-auth/routes/permissions/PermissionsSettings.tsx b/packages/editor/src/app/supabase-auth/routes/permissions/PermissionsSettings.tsx index 210fa9228..19e91d188 100644 --- a/packages/editor/src/app/supabase-auth/routes/permissions/PermissionsSettings.tsx +++ b/packages/editor/src/app/supabase-auth/routes/permissions/PermissionsSettings.tsx @@ -31,6 +31,7 @@ const PermissionsSettings = observer( closeCallback: () => void; }) => { const [isSaving, setIsSaving] = useState(false); + const [userPickerKey, setUserPickerKey] = useState(() => Math.random()+""); // State for storing & updating the currently selected user from the user picker. const [newUser, setNewUser] = useState(); @@ -72,6 +73,8 @@ const PermissionsSettings = observer( doc: editingPermissionData.doc, users: editingPermissionData.users, }); + + setUserPickerKey(Math.random()+""); } function editUserPermission(userId: string, permission: DocPermission) { @@ -166,6 +169,7 @@ const PermissionsSettings = observer(
diff --git a/packages/editor/src/app/supabase-auth/routes/permissions/UserPicker.tsx b/packages/editor/src/app/supabase-auth/routes/permissions/UserPicker.tsx index a52b9b8df..6c7cad768 100644 --- a/packages/editor/src/app/supabase-auth/routes/permissions/UserPicker.tsx +++ b/packages/editor/src/app/supabase-auth/routes/permissions/UserPicker.tsx @@ -1,7 +1,10 @@ -import UserPicker, { OnChange } from "@atlaskit/user-picker"; -import { useCallback, useState } from "react"; -import { IntlProvider } from "react-intl-next"; - +import { + AsyncSelect, + LoadingIndicatorProps, + OptionType, +} from "@atlaskit/select"; +import Spinner from "@atlaskit/spinner"; +import { useCallback } from "react"; import { SupabaseClientType } from "../../SupabaseSessionStore"; import { User } from "./userUtils"; @@ -11,12 +14,11 @@ export function SupabaseUserPicker(props: { updateSelectedUser: (user: User | undefined) => void; }) { const updateSelectedUser = props.updateSelectedUser; - // State and function for storing & updating the users to display in the user picker. - const [displayedUsers, setDisplayedUsers] = useState([]); async function searchUsers(query = "") { if (query === "") { - setDisplayedUsers([]); + return []; + // setDisplayedUsers([]); } else { const ret = await props.supabase .from("workspaces") @@ -26,39 +28,50 @@ export function SupabaseUserPicker(props: { .order("name") .limit(10); - const results: User[] = + const results = ret.data?.map((result) => ({ - id: result.owner_user_id, - name: "@" + result.name, - nameWithoutAtSign: result.name, + label: "@" + result.name, + value: { + id: result.owner_user_id, + name: "@" + result.name, + nameWithoutAtSign: result.name, + }, + // id: result.owner_user_id, + // name: "@" + result.name, + // nameWithoutAtSign: result.name, })) || []; - - setDisplayedUsers(results); + return results; + // setDisplayedUsers(results); } } const onChange = useCallback( - (user: User | User[] | null | undefined) => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + (user: any) => { if (Array.isArray(user)) { throw new Error("unexpected"); } - updateSelectedUser(user || undefined); + updateSelectedUser(user?.value || undefined); }, [updateSelectedUser] ); + const LoadingIndicator = (props: LoadingIndicatorProps) => { + return ; + }; + return ( - - null} - onInputChange={searchUsers} - onChange={onChange as OnChange} - options={displayedUsers} - menuPosition="fixed" - /> - + ); } diff --git a/packages/editor/tests/end-to-end/collaboration/twoWay-private.spec.ts b/packages/editor/tests/end-to-end/collaboration/twoWay-private.spec.ts index 09f05afa3..6d9201e30 100644 --- a/packages/editor/tests/end-to-end/collaboration/twoWay-private.spec.ts +++ b/packages/editor/tests/end-to-end/collaboration/twoWay-private.spec.ts @@ -25,14 +25,12 @@ test.beforeAll(async ({ aliceContext, bobContext, bobUser }) => { await pageAlice.click('svg:has-text("Options")'); await pageAlice.click("text=Permissions"); - // await pageAlice.pause(); + // await pageAlice.click("text=Find a person..."); - await pageAlice.fill("#react-select-add-user-input", bobUser.username); + await pageAlice.fill("#react-select-3-input", bobUser.username); // Click #react-select-add-user-option-0 >> text=@bob-zvghe-0:localhost:8888 - await pageAlice.click( - `#react-select-add-user-option-0 >> text=@${bobUser.username}` - ); + await pageAlice.click(`#react-select-3-listbox >> text=@${bobUser.username}`); await pageAlice.click('button:has-text("Add")'); await pageAlice.click('button:has-text("Apply")'); diff --git a/packages/editor/vite.config.ts b/packages/editor/vite.config.ts index 9e1879501..a8c3da84b 100644 --- a/packages/editor/vite.config.ts +++ b/packages/editor/vite.config.ts @@ -67,11 +67,22 @@ export default defineConfig((conf) => ({ }, build: { rollupOptions: { + output: { + chunkFileNames: (chunkInfo) => { + if (chunkInfo.name.includes("y-websocket")) { + // because rollup uses the last source of the chunk as file name, we end + // up with a file named "y-websocket.xxx.js" which actually has a lot of node_modules + // (not just y-websocket). Rename to "chunk" + return "assets/chunk-[hash].js"; + } + return "assets/[name].[hash].js"; + }, + }, // Enable rollup polyfills plugin // used during production bundling plugins: [nodePolyfills()], }, - sourcemap: true + sourcemap: true, }, test: { exclude: [ diff --git a/patches/monaco-editor+0.35.0.patch b/patches/monaco-editor+0.35.0.patch index 1a5e791f3..71b720bef 100644 --- a/patches/monaco-editor+0.35.0.patch +++ b/patches/monaco-editor+0.35.0.patch @@ -1,3 +1,162 @@ +diff --git a/node_modules/monaco-editor/esm/vs/basic-languages/monaco.contribution.js b/node_modules/monaco-editor/esm/vs/basic-languages/monaco.contribution.js +index 6cd0b77..b6361df 100644 +--- a/node_modules/monaco-editor/esm/vs/basic-languages/monaco.contribution.js ++++ b/node_modules/monaco-editor/esm/vs/basic-languages/monaco.contribution.js +@@ -7,81 +7,81 @@ import '../editor/editor.api.js'; + *-----------------------------------------------------------------------------*/ + + // src/basic-languages/monaco.contribution.ts +-import "./abap/abap.contribution.js"; +-import "./apex/apex.contribution.js"; +-import "./azcli/azcli.contribution.js"; +-import "./bat/bat.contribution.js"; +-import "./bicep/bicep.contribution.js"; +-import "./cameligo/cameligo.contribution.js"; +-import "./clojure/clojure.contribution.js"; +-import "./coffee/coffee.contribution.js"; +-import "./cpp/cpp.contribution.js"; +-import "./csharp/csharp.contribution.js"; +-import "./csp/csp.contribution.js"; ++// import "./abap/abap.contribution.js"; ++// import "./apex/apex.contribution.js"; ++// import "./azcli/azcli.contribution.js"; ++// import "./bat/bat.contribution.js"; ++// import "./bicep/bicep.contribution.js"; ++// import "./cameligo/cameligo.contribution.js"; ++// import "./clojure/clojure.contribution.js"; ++// import "./coffee/coffee.contribution.js"; ++// import "./cpp/cpp.contribution.js"; ++// import "./csharp/csharp.contribution.js"; ++// import "./csp/csp.contribution.js"; + import "./css/css.contribution.js"; +-import "./cypher/cypher.contribution.js"; +-import "./dart/dart.contribution.js"; +-import "./dockerfile/dockerfile.contribution.js"; +-import "./ecl/ecl.contribution.js"; +-import "./elixir/elixir.contribution.js"; +-import "./flow9/flow9.contribution.js"; +-import "./fsharp/fsharp.contribution.js"; +-import "./freemarker2/freemarker2.contribution.js"; +-import "./go/go.contribution.js"; +-import "./graphql/graphql.contribution.js"; +-import "./handlebars/handlebars.contribution.js"; +-import "./hcl/hcl.contribution.js"; ++// import "./cypher/cypher.contribution.js"; ++// import "./dart/dart.contribution.js"; ++// import "./dockerfile/dockerfile.contribution.js"; ++// import "./ecl/ecl.contribution.js"; ++// import "./elixir/elixir.contribution.js"; ++// import "./flow9/flow9.contribution.js"; ++// import "./fsharp/fsharp.contribution.js"; ++// import "./freemarker2/freemarker2.contribution.js"; ++// import "./go/go.contribution.js"; ++// import "./graphql/graphql.contribution.js"; ++// import "./handlebars/handlebars.contribution.js"; ++// import "./hcl/hcl.contribution.js"; + import "./html/html.contribution.js"; +-import "./ini/ini.contribution.js"; +-import "./java/java.contribution.js"; ++// import "./ini/ini.contribution.js"; ++// import "./java/java.contribution.js"; + import "./javascript/javascript.contribution.js"; +-import "./julia/julia.contribution.js"; +-import "./kotlin/kotlin.contribution.js"; +-import "./less/less.contribution.js"; +-import "./lexon/lexon.contribution.js"; +-import "./lua/lua.contribution.js"; +-import "./liquid/liquid.contribution.js"; +-import "./m3/m3.contribution.js"; ++// import "./julia/julia.contribution.js"; ++// import "./kotlin/kotlin.contribution.js"; ++// import "./less/less.contribution.js"; ++// import "./lexon/lexon.contribution.js"; ++// import "./lua/lua.contribution.js"; ++// import "./liquid/liquid.contribution.js"; ++// import "./m3/m3.contribution.js"; + import "./markdown/markdown.contribution.js"; +-import "./mips/mips.contribution.js"; +-import "./msdax/msdax.contribution.js"; +-import "./mysql/mysql.contribution.js"; +-import "./objective-c/objective-c.contribution.js"; +-import "./pascal/pascal.contribution.js"; +-import "./pascaligo/pascaligo.contribution.js"; +-import "./perl/perl.contribution.js"; +-import "./pgsql/pgsql.contribution.js"; +-import "./php/php.contribution.js"; +-import "./pla/pla.contribution.js"; +-import "./postiats/postiats.contribution.js"; +-import "./powerquery/powerquery.contribution.js"; +-import "./powershell/powershell.contribution.js"; +-import "./protobuf/protobuf.contribution.js"; +-import "./pug/pug.contribution.js"; +-import "./python/python.contribution.js"; +-import "./qsharp/qsharp.contribution.js"; +-import "./r/r.contribution.js"; +-import "./razor/razor.contribution.js"; +-import "./redis/redis.contribution.js"; +-import "./redshift/redshift.contribution.js"; +-import "./restructuredtext/restructuredtext.contribution.js"; +-import "./ruby/ruby.contribution.js"; +-import "./rust/rust.contribution.js"; +-import "./sb/sb.contribution.js"; +-import "./scala/scala.contribution.js"; +-import "./scheme/scheme.contribution.js"; +-import "./scss/scss.contribution.js"; +-import "./shell/shell.contribution.js"; +-import "./solidity/solidity.contribution.js"; +-import "./sophia/sophia.contribution.js"; +-import "./sparql/sparql.contribution.js"; +-import "./sql/sql.contribution.js"; +-import "./st/st.contribution.js"; +-import "./swift/swift.contribution.js"; +-import "./systemverilog/systemverilog.contribution.js"; +-import "./tcl/tcl.contribution.js"; +-import "./twig/twig.contribution.js"; ++// import "./mips/mips.contribution.js"; ++// import "./msdax/msdax.contribution.js"; ++// import "./mysql/mysql.contribution.js"; ++// import "./objective-c/objective-c.contribution.js"; ++// import "./pascal/pascal.contribution.js"; ++// import "./pascaligo/pascaligo.contribution.js"; ++// import "./perl/perl.contribution.js"; ++// import "./pgsql/pgsql.contribution.js"; ++// import "./php/php.contribution.js"; ++// import "./pla/pla.contribution.js"; ++// import "./postiats/postiats.contribution.js"; ++// import "./powerquery/powerquery.contribution.js"; ++// import "./powershell/powershell.contribution.js"; ++// import "./protobuf/protobuf.contribution.js"; ++// import "./pug/pug.contribution.js"; ++// import "./python/python.contribution.js"; ++// import "./qsharp/qsharp.contribution.js"; ++// import "./r/r.contribution.js"; ++// import "./razor/razor.contribution.js"; ++// import "./redis/redis.contribution.js"; ++// import "./redshift/redshift.contribution.js"; ++// import "./restructuredtext/restructuredtext.contribution.js"; ++// import "./ruby/ruby.contribution.js"; ++// import "./rust/rust.contribution.js"; ++// import "./sb/sb.contribution.js"; ++// import "./scala/scala.contribution.js"; ++// import "./scheme/scheme.contribution.js"; ++// import "./scss/scss.contribution.js"; ++// import "./shell/shell.contribution.js"; ++// import "./solidity/solidity.contribution.js"; ++// import "./sophia/sophia.contribution.js"; ++// import "./sparql/sparql.contribution.js"; ++// import "./sql/sql.contribution.js"; ++// import "./st/st.contribution.js"; ++// import "./swift/swift.contribution.js"; ++// import "./systemverilog/systemverilog.contribution.js"; ++// import "./tcl/tcl.contribution.js"; ++// import "./twig/twig.contribution.js"; + import "./typescript/typescript.contribution.js"; +-import "./vb/vb.contribution.js"; +-import "./xml/xml.contribution.js"; +-import "./yaml/yaml.contribution.js"; ++// import "./vb/vb.contribution.js"; ++// import "./xml/xml.contribution.js"; ++// import "./yaml/yaml.contribution.js"; diff --git a/node_modules/monaco-editor/esm/vs/language/typescript/monaco.contribution.js b/node_modules/monaco-editor/esm/vs/language/typescript/monaco.contribution.js index 00dd322..c3eb512 100644 --- a/node_modules/monaco-editor/esm/vs/language/typescript/monaco.contribution.js