Merge branch 'dev' into fix/formula-xlookup

common/shared/bin/index.ts

@@ -18,6 +18,9 @@ if (command === 'build') {
     if (args.includes('--cleanup')) {
         options.cleanup = true;
     }
+    if (args.includes('--nodeFirst')) {
+        options.nodeFirst = true;
+    }
 
     build(options);
 }

common/shared/vite/index.ts

@@ -143,6 +143,12 @@ export interface IBuildOptions {
      * @default false
      */
     cleanup?: boolean;
+
+    /**
+     * Condition to build node first
+     * @default false
+     */
+    nodeFirst?: boolean;
 }
 
 export function remove() {
@@ -159,7 +165,7 @@ export function remove() {
 }
 
 export async function build(options?: IBuildOptions) {
-    const { skipUMD = false, cleanup = false } = options ?? {};
+    const { skipUMD = false, cleanup = false, nodeFirst = false } = options ?? {};
 
     if (cleanup) {
         remove();
@@ -195,6 +201,9 @@ export async function build(options?: IBuildOptions) {
         build: {
             target: 'chrome70',
         },
+        resolve: {
+            conditions: nodeFirst ? ['node', 'default'] : undefined,
+        },
         define: {
             'process.env.NODE_ENV': JSON.stringify('production'),
             'process.env.BUILD_TIMESTAMP': JSON.stringify(Math.floor(Date.now() / 1000)),

e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts

@@ -33,7 +33,7 @@ test('diff default sheet toolbar', async () => {
     await page.waitForTimeout(2000);
 
     await page.evaluate(() => window.E2EControllerAPI.loadDefaultSheet());
-    await page.waitForTimeout(8000);
+    await page.waitForTimeout(2000);
 
     const filename = generateSnapshotName('default-sheet-fullpage');
     const screenshot = await page.screenshot({
@@ -75,7 +75,6 @@ test('diff demo sheet content', async ({ page }) => {
     const filename = generateSnapshotName('demo-sheet');
     const screenshot = await page.locator(SHEET_MAIN_CANVAS_ID).screenshot();
     await expect(screenshot).toMatchSnapshot(filename, { maxDiffPixels: 5 });
-    await page.waitForTimeout(2000);
     expect(errored).toBeFalsy();
 });
 
@@ -100,9 +99,6 @@ test('diff merged cells rendering', async () => {
     const filename = generateSnapshotName('mergedCellsRendering');
     const screenshot = await page.locator(SHEET_MAIN_CANVAS_ID).screenshot();
     await expect(screenshot).toMatchSnapshot(filename, { maxDiffPixels: 5 });
-
-    await page.waitForTimeout(2000);
-    await browser.close();
 });
 test('diff merged cells rendering after scrolling', async () => {
     const browser = await chromium.launch({
@@ -164,9 +160,6 @@ test('diff merged cells rendering after scrolling', async () => {
     const filename = generateSnapshotName('mergedCellsRenderingScrolling');
     const screenshot = await page.locator(SHEET_MAIN_CANVAS_ID).screenshot();
     await expect(screenshot).toMatchSnapshot(filename, { maxDiffPixels: 5 });
-
-    await page.waitForTimeout(2000);
-    await browser.close();
 });
 
 /**
@@ -190,9 +183,6 @@ test('diff sheet default style rendering', async () => {
     const filename = generateSnapshotName('defaultstyle');
     const screenshot = await page.locator(SHEET_MAIN_CANVAS_ID).screenshot();
     await expect(screenshot).toMatchSnapshot(filename, { maxDiffPixels: 5 });
-
-    await page.waitForTimeout(2000);
-    await browser.close();
 });
 
 test('diff facade sheet hooks', async () => {
@@ -226,7 +216,4 @@ test('diff facade sheet hooks', async () => {
     const filename = generateSnapshotName('facade-sheet-hooks');
     const screenshot = await page.locator(SHEET_MAIN_CANVAS_ID).screenshot();
     await expect(screenshot).toMatchSnapshot(filename, { maxDiffPixels: 5 });
-
-    await page.waitForTimeout(2000);
-    await browser.close();
 });