Skip to content

Commit

Permalink
[Release] Hotfix 2.23.0 => 2.23.1 (patch) (#10916)
Browse files Browse the repository at this point in the history
* chore: bump version to 2.23.1

* fix: incorrect navigate (#10924)

* refactor: remove ssr (#10931)

* refactor: remove ssr

* fix: type error

* fix: crash (#10941)

* chore: lock file

* refactor: code style

* fix: internal wallet connected status (#10942)

* fix: internal wallet connected status

* chore: i18n

* Revert "fix: internal wallet connected status (#10942)"

This reverts commit 34eb13f.

* chore: update texture

* fix: typo

---------

Co-authored-by: nuanyang233 <[email protected]>
Co-authored-by: Jack Works <[email protected]>
  • Loading branch information
3 people authored Oct 12, 2023
1 parent 448c35c commit 0a479ad
Show file tree
Hide file tree
Showing 91 changed files with 550 additions and 3,363 deletions.
15 changes: 5 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"yarn": ">=999.0.0",
"npm": ">=999.0.0"
},
"version": "2.23.0",
"version": "2.23.1",
"private": true,
"license": "AGPL-3.0-or-later",
"scripts": {
Expand All @@ -30,12 +30,10 @@
},
"dependencies": {
"@dimensiondev/holoflows-kit": "0.9.0-20230307045856-46252fb",
"@emotion/cache": "11.10.3",
"@emotion/react": "11.10.4",
"@emotion/serialize": "1.1.0",
"@emotion/server": "11.10.0",
"@emotion/styled": "11.10.4",
"@emotion/utils": "1.2.0",
"@emotion/cache": "11.11.0",
"@emotion/react": "11.11.1",
"@emotion/serialize": "1.1.2",
"@emotion/styled": "11.11.0",
"@masknet/kit": "0.1.2",
"@mui/base": "5.0.0-alpha.100",
"@mui/icons-material": "5.10.6",
Expand Down Expand Up @@ -131,9 +129,6 @@
"@uniswap/[email protected]": "patches/@[email protected]",
"@ceramicnetwork/[email protected]": "patches/@[email protected]",
"[email protected]": "patches/[email protected]",
"@emotion/[email protected]": "patches/@[email protected]",
"@emotion/[email protected]": "patches/@[email protected]",
"@emotion/[email protected]": "patches/@[email protected]",
"@mui/[email protected]": "patches/@[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
Expand Down
6 changes: 5 additions & 1 deletion packages/app/src/pages/ApplicationPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ export interface ApplicationsPageProps {}
export default function ApplicationsPage(props: ApplicationsPageProps) {
return (
<PageContainer title="Applications">
<ApplicationBoardForm allPersonas={[]} personaPerSiteConnectStatusLoading={false} />
<ApplicationBoardForm
queryOwnedPersonaInformation={async () => []}
allPersonas={[]}
personaPerSiteConnectStatusLoading={false}
/>
</PageContainer>
)
}
4 changes: 0 additions & 4 deletions packages/icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,5 @@
"./icon-generated-as-url.d.ts"
]
}
},
"scripts": {},
"dependencies": {
"@emotion/server": "^11.10.0"
}
}
4 changes: 1 addition & 3 deletions packages/mask/.webpack/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,17 +302,15 @@ export async function createConfiguration(_inputFlags: BuildFlags): Promise<webp

const entries: Record<string, EntryDescription> = (baseConfig.entry = {
dashboard: withReactDevTools(join(__dirname, '../src/extension/dashboard/index.ts')),
popups: withReactDevTools(join(__dirname, '../src/extension/popups/SSR-client.ts')),
popups: withReactDevTools(join(__dirname, '../src/extension/popups/entry.ts')),
contentScript: withReactDevTools(join(__dirname, '../src/content-script.ts')),
debug: withReactDevTools(join(__dirname, '../src/extension/debug-page/index.tsx')),
background: normalizeEntryDescription(join(__dirname, '../background/mv2-entry.ts')),
backgroundWorker: normalizeEntryDescription(join(__dirname, '../background/mv3-entry.ts')),
})
baseConfig.plugins!.push(
await addHTMLEntry({ chunks: ['dashboard'], filename: 'dashboard.html' }),
await addHTMLEntry({ chunks: ['popups'], filename: 'popups.html' }),
await addHTMLEntry({ chunks: ['contentScript'], filename: 'generated__content__script.html' }),
await addHTMLEntry({ chunks: ['debug'], filename: 'debug.html' }),
await addHTMLEntry({ chunks: ['background'], filename: 'background.html', gun: true }),
)
if (flags.devtools) {
Expand Down
2 changes: 1 addition & 1 deletion packages/mask/.webpack/manifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function editManifest(manifest: ManifestV2 | ManifestV3, flags: ModifyAcceptFlag

if (manifest.manifest_version === 2) {
if (String(computedFlags.sourceMapKind).includes('eval')) {
manifest.content_security_policy = `script-src 'self' 'unsafe-eval'; object-src 'self'; require-trusted-types-for 'script'; trusted-types default dompurify webpack mask ssr`
manifest.content_security_policy = `script-src 'self' 'unsafe-eval'; object-src 'self'; require-trusted-types-for 'script'; trusted-types default dompurify webpack mask`
}

if (flags.hmr) {
Expand Down
2 changes: 1 addition & 1 deletion packages/mask/.webpack/manifest/manifest-mv3.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}
],
"content_security_policy": {
"extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; trusted-types default dompurify mask ssr;"
"extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; trusted-types default dompurify mask;"
},
"minimum_chrome_version": "102"
}
2 changes: 1 addition & 1 deletion packages/mask/.webpack/manifest/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
"homepage_url": "https://mask.io",
"description": "The portal to the new & open Internet. Send encrypted message and decentralized Apps right on top of social networks.",
"web_accessible_resources": ["js/*", "*.svg", "*.png", "*.jpg", "*.css", "build-info.json"],
"content_security_policy": "script-src 'self' 'wasm-eval'; object-src 'self'; trusted-types default dompurify mask ssr;"
"content_security_policy": "script-src 'self' 'wasm-eval'; object-src 'self'; trusted-types default dompurify mask;"
}
74 changes: 0 additions & 74 deletions packages/mask/background/tasks/Cancellable/PopupSSR/cache.ts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions packages/mask/background/tasks/Cancellable/PopupSSR/loader.js

This file was deleted.

14 changes: 0 additions & 14 deletions packages/mask/background/tasks/Cancellable/PopupSSR/type.ts

This file was deleted.

11 changes: 0 additions & 11 deletions packages/mask/background/tasks/Cancellable/PopupSSR/worker.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion packages/mask/background/tasks/NotCancellable/OnInstall.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// ALL IMPORTS MUST BE DEFERRED
import { PersistentStorages, type DashboardRoutes } from '@masknet/shared-base'
import * as connect /* webpackDefer: true */ from '../../services/site-adaptors/connect.js'

type DashboardRoutes_Welcome = DashboardRoutes.Welcome extends `${infer T}` ? T : never
function openWelcome() {
Expand All @@ -14,6 +13,7 @@ browser.runtime.onInstalled.addListener(async (detail) => {
if (detail.reason === 'install') {
openWelcome()
} else if (detail.reason === 'update') {
const connect = await import('../../services/site-adaptors/connect.js')
const groups = await connect.getOriginsWithoutPermission()
if (groups.length) openWelcome()
if ((globalThis as any).localStorage) {
Expand Down
2 changes: 0 additions & 2 deletions packages/mask/background/tasks/setup.hmr.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import './Cancellable/InjectContentScripts_imperative.js'
import './Cancellable/InjectContentScripts_declarative.js'
import './Cancellable/CleanProfileAndAvatar.js'
import './Cancellable/PopupSSR/index_hasWorker.js'
import './Cancellable/PopupSSR/index_noWorker.js'
import './Cancellable/SettingsListener.js'
import './Cancellable/StartPluginHost.js'
import './Cancellable/StartSandboxedPluginHost.js'
Expand Down
Loading

0 comments on commit 0a479ad

Please sign in to comment.