diff --git a/core b/core index 600f699b..903c81d3 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 600f699b81b210f9c5b2fbe8b0a9ec360206fbc3 +Subproject commit 903c81d34898e54cdc04877ac4cd660565e3728a diff --git a/ext/app/electron/main.ts b/ext/app/electron/main.ts index 6bc9ea83..777c06a1 100644 --- a/ext/app/electron/main.ts +++ b/ext/app/electron/main.ts @@ -26,6 +26,7 @@ setDefaultEnv('GRIST_SERVE_SAME_ORIGIN', 'true'); setDefaultEnv('GRIST_DEFAULT_PRODUCT', 'Free'); setDefaultEnv('GRIST_ORG_IN_PATH', 'true'); setDefaultEnv('APP_UNTRUSTED_URL', 'http://plugins.invalid'); +setDefaultEnv('GRIST_HIDE_UI_ELEMENTS', 'helpCenter,billing,templates,multiSite,multiAccounts'); setDefaultEnv('GRIST_ELECTRON_AUTH', 'strict'); if (process.env.GRIST_ELECTRON_AUTH !== 'mixed') { setDefaultEnv('GRIST_FORCE_LOGIN', 'true'); @@ -215,7 +216,7 @@ class GristApp { } const link = path.join(docsRoot, `${docId}.grist`); if (!await fse.pathExists(link)) { - await fse.symlink(target, link); + await fse.symlink(target, link, 'junction'); } this.openWindowForPath(docId, openWith); } diff --git a/package.json b/package.json index a7accf5c..a73406b0 100644 --- a/package.json +++ b/package.json @@ -59,6 +59,7 @@ }, "afterSign": "scripts/notarize.js", "asarUnpack": [ + "core/plugins", "core/python", "core/sandbox_venv3", "core/sandbox", @@ -73,6 +74,7 @@ "core/sandbox/**/*", "core/sandbox_venv3/**/*", "core/sandbox_venv3", + "core/plugins/**/*", "core/python/**/*", "core/node_modules/**/*", "node_modules/**/*", diff --git a/yarn.lock b/yarn.lock index d5fab2cc..56e235c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -817,6 +817,13 @@ resolved "https://registry.npmjs.org/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz" integrity sha512-bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A== +"@types/dompurify@2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.4.0.tgz#fd9706392a88e0e0e6d367f3588482d817df0ab9" + integrity sha512-IDBwO5IZhrKvHFUl+clZxgf3hn2b/lU6H1KaBShPkQyGJUQ0xwebezIPSuiyGwfz1UzJWQl4M7BDxtHtCCPlTg== + dependencies: + "@types/trusted-types" "*" + "@types/double-ended-queue@2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/@types/double-ended-queue/-/double-ended-queue-2.1.0.tgz" @@ -976,6 +983,11 @@ resolved "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz" integrity sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw== +"@types/marked@4.0.8": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955" + integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw== + "@types/mime-types@2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz" @@ -1152,6 +1164,11 @@ resolved "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz" integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== +"@types/trusted-types@*": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.3.tgz#a136f83b0758698df454e328759dbd3d44555311" + integrity sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g== + "@types/tunnel@^0.0.3": version "0.0.3" resolved "https://registry.yarnpkg.com/@types/tunnel/-/tunnel-0.0.3.tgz#f109e730b072b3136347561fc558c9358bb8c6e9" @@ -3569,6 +3586,11 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" +dompurify@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.0.tgz#6adc6f918376d93419ed1ee35811850680027cba" + integrity sha512-0g/yr2IJn4nTbxwL785YxS7/AvvgGFJw6LLWP+BzWzB1+BYOqPUT9Hy0rXrZh5HLdHnxH72aDdzvC9SdTjsuaA== + dot-prop@^5.2.0: version "5.2.0" resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz" @@ -6459,6 +6481,11 @@ make-fetch-happen@^9.1.0: socks-proxy-agent "^6.0.0" ssri "^8.0.0" +marked@4.2.12: + version "4.2.12" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5" + integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw== + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca"