Merge branch 'canary' into stable

This commit is contained in:
李华桥
2024-01-25 13:46:21 +08:00
42 changed files with 41 additions and 53 deletions
+1 -1
View File
@@ -3,4 +3,4 @@ name: affine
description: AFFiNE cloud chart
type: application
version: 0.0.0
appVersion: "0.11.0"
appVersion: "0.12.0"
@@ -3,7 +3,7 @@ name: graphql
description: AFFiNE GraphQL server
type: application
version: 0.0.0
appVersion: "0.11.0"
appVersion: "0.12.0"
dependencies:
- name: gcloud-sql-proxy
version: 0.0.0
+1 -1
View File
@@ -3,7 +3,7 @@ name: sync
description: AFFiNE Sync Server
type: application
version: 0.0.0
appVersion: "0.11.0"
appVersion: "0.12.0"
dependencies:
- name: gcloud-sql-proxy
version: 0.0.0
+1 -1
View File
@@ -19,5 +19,5 @@
],
"ext": "ts,md,json"
},
"version": "0.10.3-canary.2"
"version": "0.12.0"
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@affine/monorepo",
"version": "0.11.0",
"version": "0.12.0",
"private": true,
"author": "toeverything",
"license": "MIT",
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@affine/server",
"private": true,
"version": "0.11.0",
"version": "0.12.0",
"description": "Affine Node.js server",
"type": "module",
"bin": {
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@affine/storage",
"version": "0.11.0",
"version": "0.12.0",
"engines": {
"node": ">= 10.16.0 < 11 || >= 11.8.0"
},
+1 -1
View File
@@ -9,5 +9,5 @@
"@types/debug": "^4.1.9",
"vitest": "1.1.3"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -26,5 +26,5 @@
"lit": "^3.0.2",
"zod": "^3.22.4"
},
"version": "0.11.0"
"version": "0.12.0"
}
-1
View File
@@ -30,7 +30,6 @@ export const runtimeFlagsSchema = z.object({
enableEnhanceShareMode: z.boolean(),
enablePayment: z.boolean(),
enablePageHistory: z.boolean(),
enableJournal: z.boolean(),
// this is for the electron app
serverUrlPrefix: z.string(),
enableMoveDatabase: z.boolean(),
+1 -1
View File
@@ -63,5 +63,5 @@
"optional": true
}
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -20,5 +20,5 @@
"devDependencies": {
"vitest": "1.1.3"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@toeverything/y-indexeddb",
"type": "module",
"version": "0.11.0",
"version": "0.12.0",
"description": "IndexedDB database adapter for Yjs",
"repository": "toeverything/AFFiNE",
"author": "toeverything",
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "y-provider",
"type": "module",
"version": "0.11.0",
"version": "0.12.0",
"description": "Yjs provider protocol for multi document support",
"exports": {
".": "./src/index.ts"
+1 -1
View File
@@ -107,5 +107,5 @@
"vitest": "1.1.3",
"yjs": "^13.6.10"
},
"version": "0.11.0"
"version": "0.12.0"
}
@@ -31,7 +31,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
enableEnhanceShareMode: false,
enablePayment: true,
enablePageHistory: true,
enableJournal: false,
serverUrlPrefix: 'https://app.affine.pro',
editorFlags,
appVersion: packageJson.version,
@@ -42,7 +41,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
return {
...this.stable,
enablePageHistory: true,
enableJournal: false,
serverUrlPrefix: 'https://insider.affine.pro',
appBuildType: 'beta' as const,
};
@@ -74,7 +72,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
enableEnhanceShareMode: false,
enablePayment: true,
enablePageHistory: true,
enableJournal: true,
serverUrlPrefix: 'https://affine.fail',
editorFlags,
appVersion: packageJson.version,
@@ -138,11 +135,6 @@ export function getRuntimeConfig(buildFlags: BuildFlags): RuntimeConfig {
: buildFlags.mode === 'development'
? true
: currentBuildPreset.enablePageHistory,
enableJournal: process.env.ENABLE_JOURNAL
? process.env.ENABLE_JOURNAL === 'true'
: buildFlags.mode === 'development'
? true
: currentBuildPreset.enableJournal,
};
if (buildFlags.mode === 'development') {
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "@affine/core",
"type": "module",
"private": true,
"version": "0.11.0",
"version": "0.12.0",
"scripts": {
"build": "yarn -T run build-core",
"dev": "yarn -T run dev-core",
@@ -255,11 +255,9 @@ export const RootAppSidebar = ({
{t['com.affine.workspaceSubPath.all']()}
</span>
</RouteMenuLinkItem>
{runtimeConfig.enableJournal ? (
<AppSidebarJournalButton
workspace={currentWorkspace.blockSuiteWorkspace}
/>
) : null}
<AppSidebarJournalButton
workspace={currentWorkspace.blockSuiteWorkspace}
/>
{runtimeConfig.enableNewSettingModal ? (
<MenuItem
data-testid="slider-bar-workspace-setting-button"
@@ -12,7 +12,6 @@ type MaybeDate = Date | string | number;
export const JOURNAL_DATE_FORMAT = 'YYYY-MM-DD';
function isJournalString(j?: string | false) {
if (!runtimeConfig.enableJournal) return false;
return j ? !!j?.match(/^\d{4}-\d{2}-\d{2}$/) : false;
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@affine/electron-api",
"version": "0.10.3-canary.2",
"version": "0.12.0",
"type": "module",
"private": true,
"main": "./src/index.ts",
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@affine/electron",
"private": true,
"version": "0.11.0",
"version": "0.12.0",
"author": "toeverything",
"repository": {
"url": "https://github.com/toeverything/AFFiNE",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@affine/graphql",
"version": "0.11.0",
"version": "0.12.0",
"description": "Autogenerated GraphQL client for affine.pro",
"license": "MIT",
"type": "module",
+1 -1
View File
@@ -36,5 +36,5 @@
"ts-node": "^10.9.1",
"typescript": "^5.2.2"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -58,5 +58,5 @@
"test": "ava",
"version": "napi version"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "@affine/templates",
"private": true,
"sideEffect": false,
"version": "0.11.0",
"version": "0.12.0",
"scripts": {
"postinstall": "node ./build.mjs"
},
@@ -32,5 +32,5 @@
"vitest": "1.1.3",
"ws": "^8.14.2"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -9,5 +9,5 @@
"@affine-test/kit": "workspace:*",
"@playwright/test": "^1.41.0"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -11,5 +11,5 @@
"@types/fs-extra": "^11.0.2",
"fs-extra": "^11.1.1"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -13,5 +13,5 @@
"fs-extra": "^11.1.1",
"playwright": "^1.41.0"
},
"version": "0.11.0"
"version": "0.12.0"
}
@@ -18,5 +18,5 @@
"http-proxy-middleware": "^3.0.0-beta.1",
"serve": "^14.2.1"
},
"version": "0.11.0"
"version": "0.12.0"
}
@@ -18,5 +18,5 @@
"http-proxy-middleware": "^3.0.0-beta.1",
"serve": "^14.2.1"
},
"version": "0.11.0"
"version": "0.12.0"
}
@@ -18,5 +18,5 @@
"http-proxy-middleware": "^3.0.0-beta.1",
"serve": "^14.2.1"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -18,5 +18,5 @@
"http-proxy-middleware": "^3.0.0-beta.1",
"serve": "^14.2.1"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -9,5 +9,5 @@
"@affine-test/kit": "workspace:*",
"@playwright/test": "^1.41.0"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -13,5 +13,5 @@
"@blocksuite/store": "0.12.0-nightly-202401240410-02f373e",
"@playwright/test": "^1.41.0"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -3,5 +3,5 @@
"exports": {
"./*": "./*"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "@affine-test/kit",
"private": true,
"type": "module",
"version": "0.11.0",
"version": "0.12.0",
"exports": {
"./electron": "./electron.ts",
"./playwright": "./playwright.ts",
+1 -1
View File
@@ -59,5 +59,5 @@
"@blocksuite/presets": "*",
"@blocksuite/store": "*"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -6,5 +6,5 @@
"dependencies": {
"@affine/env": "workspace:*"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -22,5 +22,5 @@
"peerDependencies": {
"ts-node": "*"
},
"version": "0.11.0"
"version": "0.12.0"
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@affine/commitlint-config",
"version": "0.11.0",
"version": "0.12.0",
"private": true,
"devDependencies": {
"@commitlint/cli": "^18.4.3",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@affine/workers",
"version": "0.11.0",
"version": "0.12.0",
"private": true,
"scripts": {
"dev": "wrangler dev"