From 467eab4ddf37ba18383dd565cb2b47096682b1f3 Mon Sep 17 00:00:00 2001
From: Alex Yang <himself65@outlook.com>
Date: Mon, 3 Jul 2023 14:17:13 +0800
Subject: [PATCH] build: update build config (#2967)

---
 .github/workflows/nx.yml     | 8 ++++++++
 apps/web/preset.config.mjs   | 7 +------
 nx.json                      | 2 +-
 packages/env/src/global.ts   | 1 -
 tests/fixtures/tsconfig.json | 3 ++-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/nx.yml b/.github/workflows/nx.yml
index 7f3326aac2..c6a7f3b44d 100644
--- a/.github/workflows/nx.yml
+++ b/.github/workflows/nx.yml
@@ -30,17 +30,25 @@ jobs:
     name: Nx Cloud - Main Job
     uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0
     with:
+      runs-on: macos-latest
       main-branch-name: master
       number-of-agents: 5
       init-commands: |
         yarn exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
+      environment-variables: |
+        BUILD_TYPE=canary
       parallel-commands: |
         yarn exec nx-cloud record -- yarn exec nx format:check
       parallel-commands-on-agents: |
         yarn exec nx affected --target=build --parallel=5
+      timeout: 60
 
   agents:
     name: Nx Cloud - Agents
     uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0
     with:
+      runs-on: macos-latest
       number-of-agents: 5
+      environment-variables: |
+        BUILD_TYPE=canary
+      timeout: 60
diff --git a/apps/web/preset.config.mjs b/apps/web/preset.config.mjs
index 46e47685c8..546aad224a 100644
--- a/apps/web/preset.config.mjs
+++ b/apps/web/preset.config.mjs
@@ -19,7 +19,6 @@ export const blockSuiteFeatureFlags = {
  */
 const buildPreset = {
   stable: {
-    enableAllPageSaving: false,
     enablePlugin: false,
     enableTestProperties: false,
     enableBroadcastChannelProvider: true,
@@ -36,7 +35,6 @@ const buildPreset = {
   internal: {},
   // canary will be aggressive and enable all features
   canary: {
-    enableAllPageSaving: true,
     enablePlugin: true,
     enableTestProperties: true,
     enableBroadcastChannelProvider: true,
@@ -58,7 +56,7 @@ buildPreset.internal = buildPreset.stable;
 const currentBuild = process.env.BUILD_TYPE || 'stable';
 
 if (process.env.CI && !process.env.BUILD_TYPE) {
-  throw new Error('BUILD_ENV is required in CI');
+  throw new Error('BUILD_TYPE is required in CI');
 }
 
 const currentBuildPreset = buildPreset[currentBuild];
@@ -67,9 +65,6 @@ const environmentPreset = {
   enablePlugin: process.env.ENABLE_PLUGIN
     ? process.env.ENABLE_PLUGIN === 'true'
     : currentBuildPreset.enablePlugin,
-  enableAllPageSaving: process.env.ENABLE_ALL_PAGE_SAVING
-    ? process.env.ENABLE_ALL_PAGE_FILTER === 'true'
-    : currentBuildPreset.enableAllPageSaving,
   enableTestProperties: process.env.ENABLE_TEST_PROPERTIES
     ? process.env.ENABLE_TEST_PROPERTIES === 'true'
     : currentBuildPreset.enableTestProperties,
diff --git a/nx.json b/nx.json
index 2257ec396f..cdd6b69220 100644
--- a/nx.json
+++ b/nx.json
@@ -40,7 +40,7 @@
           "runtime": "node -v"
         },
         {
-          "env": "BUILD_ENV"
+          "env": "BUILD_TYPE"
         },
         {
           "env": "ENABLE_BOOKMARK_OPERATION"
diff --git a/packages/env/src/global.ts b/packages/env/src/global.ts
index 225a37a325..248da8c26d 100644
--- a/packages/env/src/global.ts
+++ b/packages/env/src/global.ts
@@ -52,7 +52,6 @@ declare global {
 }
 
 export const buildFlagsSchema = z.object({
-  enableAllPageSaving: z.boolean(),
   enablePlugin: z.boolean(),
   enableTestProperties: z.boolean(),
   enableBroadcastChannelProvider: z.boolean(),
diff --git a/tests/fixtures/tsconfig.json b/tests/fixtures/tsconfig.json
index 3e3c325947..ae68bb7122 100644
--- a/tests/fixtures/tsconfig.json
+++ b/tests/fixtures/tsconfig.json
@@ -4,7 +4,8 @@
     "composite": true,
     "noEmit": false,
     "outDir": "lib",
-    "moduleResolution": "nodenext",
+    "moduleResolution": "NodeNext",
+    "module": "NodeNext",
     "resolveJsonModule": true
   },
   "include": [".", "./*.json"]