chore(build): fix build (#18)

dream-num · Nov 30, 2024 · 08021a4 · 08021a4
1 parent 8d5d74d
commit 08021a4
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 34 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,3 +27,8 @@ jobs:
 
             - name: 🩺 Run build
               run: pnpm build
+
+            - name: 🩺 Run build:demo
+              run: |
+                  pnpm build:demo
+                  pnpm build:node-demo
diff --git a/.gitignore b/.gitignore
@@ -136,3 +136,7 @@ dist
 
 packages/**/src/locales
 packages/**/lib
+
+
+# tsx
+**/tsx-0
diff --git a/examples-node/esbuild.config.mjs b/examples-node/esbuild.config.mjs
@@ -11,7 +11,7 @@ const define = {
 
 if (!args.watch) {
     const gitCommitHash = execSync('git rev-parse --short HEAD').toString().trim();
-    const gitRefName = execSync('git symbolic-ref -q --short HEAD || git describe --tags --exact-match').toString().trim();
+    const gitRefName = execSync('git symbolic-ref -q --short HEAD || git describe --tags --exact-match || echo "unknown"').toString().trim();
 
     define['process.env.GIT_COMMIT_HASH'] = `"${gitCommitHash}"`;
     define['process.env.GIT_REF_NAME'] = `"${gitRefName}"`;

diff --git a/examples/esbuild.config.mjs b/examples/esbuild.config.mjs
@@ -46,7 +46,7 @@ const define = {
 
 if (!args.watch) {
     const gitCommitHash = execSync('git rev-parse --short HEAD').toString().trim();
-    const gitRefName = execSync('git symbolic-ref -q --short HEAD || git describe --tags --exact-match').toString().trim();
+    const gitRefName = execSync('git symbolic-ref -q --short HEAD || git describe --tags --exact-match || echo "unknown"').toString().trim();
 
     define['process.env.GIT_COMMIT_HASH'] = `"${gitCommitHash}"`;
     define['process.env.GIT_REF_NAME'] = `"${gitRefName}"`;

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "scripts": {
         "prepare": "simple-git-hooks",
         "dev": "pnpm --filter examples dev:demo",
-        "build": "turbo build --concurrency=2",
+        "build": "turbo build:preset --concurrency=2 && pnpm --filter @univerjs/presets build",
         "build:demo": "pnpm --filter examples build:demo",
         "build:node-demo": "pnpm --filter examples-node build:demo",
         "lint": "eslint .",

diff --git a/packages/preset-docs-collaboration/package.json b/packages/preset-docs-collaboration/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-docs-core/package.json b/packages/preset-docs-core/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-docs-drawing/package.json b/packages/preset-docs-drawing/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-docs-hyper-link/package.json b/packages/preset-docs-hyper-link/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-docs-thread-comment/package.json b/packages/preset-docs-thread-comment/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-advanced/package.json b/packages/preset-sheets-advanced/package.json
@@ -63,7 +63,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-collaboration/package.json b/packages/preset-sheets-collaboration/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-conditional-formatting/package.json b/packages/preset-sheets-conditional-formatting/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-core/package.json b/packages/preset-sheets-core/package.json
@@ -63,7 +63,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-data-validation/package.json b/packages/preset-sheets-data-validation/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-drawing/package.json b/packages/preset-sheets-drawing/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-filter/package.json b/packages/preset-sheets-filter/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-find-replace/package.json b/packages/preset-sheets-find-replace/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-hyper-link/package.json b/packages/preset-sheets-hyper-link/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-node-core/package.json b/packages/preset-sheets-node-core/package.json
@@ -58,7 +58,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-sort/package.json b/packages/preset-sheets-sort/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/preset-sheets-thread-comment/package.json b/packages/preset-sheets-thread-comment/package.json
@@ -57,7 +57,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build:preset": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/packages/presets/package.json b/packages/presets/package.json
@@ -255,7 +255,7 @@
         "lib"
     ],
     "scripts": {
-        "prebuild": "tsx prepare.ts",
+        "prepare": "tsx prepare.ts",
         "build": "tsx build.ts"
     },
     "peerDependencies": {

diff --git a/turbo.json b/turbo.json
@@ -4,20 +4,8 @@
         "//"
     ],
     "tasks": {
-        "prebuild": {
-            "cache": false
-        },
         "build:preset": {
-            "cache": false,
-            "dependsOn": [
-                "prebuild"
-            ]
-        },
-        "build": {
-            "cache": false,
-            "dependsOn": [
-                "build:preset"
-            ]
+            "cache": false
         }
     }
 }