Merge remote-tracking branch 'origin' into feature/INT-3355

Author: tiny-ben-tran

Jenkinsfile

@@ -1,16 +1,14 @@
 #!groovy
 @Library('waluigi@release/7') _
 
-beehiveFlowBuild(
-  container: [
-    tag: '18',
-    resourceRequestMemory: '3Gi',
-    resourceLimitCpu: '4',
-    resourceLimitMemory: '3Gi'
+mixedBeehiveFlow(
+  container: [ resourceRequestMemory: '3Gi', resourceLimitMemory: '3Gi' ],
+  testPrefix: 'Tiny-jQuery',
+  platforms: [
+    [ browser: 'chrome', headless: true ],
+    [ browser: 'firefox', provider: 'aws', buckets: 1 ],
+    [ browser: 'safari', provider: 'lambdatest', os: 'macOS Sonoma', buckets: 1 ]
   ],
-  test: {
-    bedrockBrowsers(testDirs: [ "src/test/ts/browser" ])
-  },
   customSteps: {
     stage("update storybook") {
       def status = beehiveFlowStatus()
@@ -22,5 +20,9 @@ beehiveFlowBuild(
         echo "Skipping as is not latest release"
       }
     }
+  },
+  preparePublish:{
+    yarnInstall()
+    sh "yarn build"
   }
 )

package.json

@@ -29,8 +29,8 @@
   "devDependencies": {
     "@babel/core": "^7.21.3",
     "@ephox/agar": "^7.4.1",
-    "@ephox/bedrock-client": "^13.0.0",
-    "@ephox/bedrock-server": "^13.3.0",
+    "@ephox/bedrock-client": "^15.0.0",
+    "@ephox/bedrock-server": "^15.0.2",
     "@ephox/katamari": "^9.1.5",
     "@ephox/mcagar": "^8.3.2",
     "@ephox/sand": "^6.0.9",
@@ -60,5 +60,8 @@
     "typescript": "~4.8.3",
     "webpack": "^5.9.0"
   },
-  "dependencies": {}
+  "dependencies": {},
+  "resolutions": {
+    "@types/node": "^16"
+  }
 }