beta v4, relax whitespace comparisons on wait for text

toddtarsi · toddtarsi · commit 4ad0ce79a6e7 · 2024-03-27T15:02:35.000-05:00
diff --git a/packages/selenium-ide/package.json b/packages/selenium-ide/package.json
@@ -1,6 +1,6 @@
 {
   "name": "selenium-ide",
-  "version": "4.0.1-beta.3",
+  "version": "4.0.1-beta.4",
   "private": false,
   "description": "Selenium IDE electron app",
   "author": "Todd <tarsitodd@gmail.com>",
@@ -18,7 +18,7 @@
     "publish:electron:mac": "CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder -m --publish always",
     "publish:electron:windows": "electron-builder -w --publish always",
     "release": "electron-builder",
-    "watch": "webpack --watch"
+    "watch": "webpack serve"
   },
   "bin": {
     "selenium-ide": "bin.js"
@@ -114,6 +114,7 @@
     "@fontsource/roboto": "^5.0.8",
     "@mui/icons-material": "^5.15.13",
     "@mui/material": "^5.15.13",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
     "@seleniumhq/code-export-csharp-nunit": "^4.0.1",
     "@seleniumhq/code-export-csharp-xunit": "^4.0.1",
     "@seleniumhq/code-export-java-junit": "^4.0.1",
@@ -124,7 +125,7 @@
     "@seleniumhq/side-api": "^4.0.3",
     "@seleniumhq/side-commons": "^4.0.1",
     "@seleniumhq/side-model": "^4.0.1",
-    "@seleniumhq/side-runtime": "^4.0.1",
+    "@seleniumhq/side-runtime": "^4.0.2",
     "dnd-core": "^16.0.1",
     "electron-chromedriver": "^28.0.0",
     "electron-log": "^5.1.0",
@@ -163,6 +164,7 @@
     "html-webpack-plugin": "^5.5.3",
     "mini-css-extract-plugin": "^2.7.6",
     "npm-run-all": "^4.1.5",
+    "react-refresh-typescript": "^2.0.9",
     "run-script-os": "^1.1.6",
     "source-map-loader": "^4.0.1",
     "source-map-support": "^0.5.21",
@@ -171,6 +173,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2",
     "webpack": "^5.89.0",
-    "webpack-cli": "^5.1.4"
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^5.0.4"
   }
 }
diff --git a/packages/selenium-ide/webpack.config.ts b/packages/selenium-ide/webpack.config.ts
@@ -1,17 +1,23 @@
+import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin'
 import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'
 import fs from 'fs'
 import CopyWebpackPlugin from 'copy-webpack-plugin'
 import HtmlWebpackPlugin from 'html-webpack-plugin'
 import kebabCase from 'lodash/fp/kebabCase'
 import MiniCssExtractPlugin from 'mini-css-extract-plugin'
 import path from 'path'
+// eslint-disable-next-line node/no-unpublished-import
+import ReactRefreshTypeScript from 'react-refresh-typescript'
 import {
   Configuration,
   SourceMapDevToolPlugin,
   WebpackPluginInstance,
 } from 'webpack'
+// eslint-disable-next-line node/no-unpublished-import
+import type { Configuration as DevServerConfiguration } from 'webpack-dev-server'
 
 const isProduction = process.env.NODE_ENV === 'production'
+const isDevelopment = !isProduction
 
 const commonPlugins: WebpackPluginInstance[] = [
   new ForkTsCheckerWebpackPlugin(),
@@ -22,11 +28,20 @@ const commonPlugins: WebpackPluginInstance[] = [
 if (isProduction) {
   commonPlugins.push(new MiniCssExtractPlugin())
 }
+if (isDevelopment) {
+  commonPlugins.push(new ReactRefreshWebpackPlugin())
+}
 
 const commonConfig: Pick<
   Configuration,
   'devtool' | 'externals' | 'mode' | 'module' | 'resolve' | 'output'
-> = {
+> & {
+  devServer?: DevServerConfiguration
+} = {
+  devServer: {
+    hot: isDevelopment,
+    port: 8081,
+  },
   devtool: 'source-map',
   externals: ['utf-8-validate', 'bufferutil'],
   mode: isProduction ? 'production' : 'development',
@@ -39,9 +54,13 @@ const commonConfig: Pick<
       },
       {
         test: /\.tsx?$/,
-        loader: 'ts-loader',
         exclude: /node_modules/,
+        // eslint-disable-next-line node/no-unpublished-require
+        loader: require.resolve('ts-loader'),
         options: {
+          getCustomTransformers: () => ({
+            before: [isDevelopment && ReactRefreshTypeScript()].filter(Boolean),
+          }),
           transpileOnly: true,
         },
       },
@@ -96,6 +115,10 @@ const preloadEntries = windowData
 
 const preloadConfig: Configuration = {
   ...commonConfig,
+  devServer: {
+    ...commonConfig.devServer,
+    port: 8083,
+  },
   entry: Object.fromEntries(preloadEntries),
   plugins: commonPlugins,
   target: 'electron-preload',
@@ -111,6 +134,10 @@ const rendererEntries = windowData
 
 const rendererConfig: Configuration = {
   ...commonConfig,
+  devServer: {
+    ...commonConfig.devServer,
+    port: 8084,
+  },
   entry: Object.fromEntries(rendererEntries),
   plugins: commonPlugins.concat(
     Object.values(rendererEntries).map(
@@ -123,6 +150,10 @@ const rendererConfig: Configuration = {
 
 const playbackPreloadBidiConfig: Configuration = {
   ...commonConfig,
+  devServer: {
+    ...commonConfig.devServer,
+    port: 8085,
+  },
   entry: {
     'playback-window-bidi-preload': path.join(
       __dirname,
@@ -139,6 +170,10 @@ const playbackPreloadBidiConfig: Configuration = {
 
 const playbackRendererBidiConfig: Configuration = {
   ...commonConfig,
+  devServer: {
+    ...commonConfig.devServer,
+    port: 8086,
+  },
   entry: {
     'playback-window-bidi-renderer': path.join(
       __dirname,
@@ -149,23 +184,31 @@ const playbackRendererBidiConfig: Configuration = {
       'renderer.tsx'
     ),
   },
-  plugins: commonPlugins.concat(
-    getBrowserPlugin('playback-window-bidi') as unknown as WebpackPluginInstance
-  ).concat(
-    new CopyWebpackPlugin({
-      patterns: [
-        {
-          from: 'src/browser/*.css',
-          to: '[name].css',
-        },
-      ],
-    })
-  ),
+  plugins: commonPlugins
+    .concat(
+      getBrowserPlugin(
+        'playback-window-bidi'
+      ) as unknown as WebpackPluginInstance
+    )
+    .concat(
+      new CopyWebpackPlugin({
+        patterns: [
+          {
+            from: 'src/browser/*.css',
+            to: '[name].css',
+          },
+        ],
+      })
+    ),
   target: 'web',
 }
 
 const mainConfig: Configuration = {
   ...commonConfig,
+  devServer: {
+    ...commonConfig.devServer,
+    port: 8087,
+  },
   entry: {
     main: path.join(__dirname, 'src', 'main', 'index.ts'),
   },
diff --git a/packages/side-api/package.json b/packages/side-api/package.json
@@ -23,7 +23,7 @@
     "@seleniumhq/browser-info": "^4.0.1",
     "@seleniumhq/get-driver": "^4.0.1",
     "@seleniumhq/side-model": "^4.0.1",
-    "@seleniumhq/side-runtime": "^4.0.1",
+    "@seleniumhq/side-runtime": "^4.0.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git a/packages/side-code-export/package.json b/packages/side-code-export/package.json
@@ -21,7 +21,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@seleniumhq/side-model": "^4.0.1",
-    "@seleniumhq/side-runtime": "^4.0.1",
+    "@seleniumhq/side-runtime": "^4.0.2",
     "commander": "^9.4.0"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
diff --git a/packages/side-runner/package.json b/packages/side-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "selenium-side-runner",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "private": false,
   "description": "Run Selenium IDE projects in cli",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -24,7 +24,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@seleniumhq/side-model": "^4.0.1",
-    "@seleniumhq/side-runtime": "^4.0.1",
+    "@seleniumhq/side-runtime": "^4.0.2",
     "commander": "^11.0.0",
     "glob": "^10.3.1",
     "jest": "^29.6.0",
diff --git a/packages/side-runtime/package.json b/packages/side-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-runtime",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "private": false,
   "description": "Selenium IDE playback and execution",
   "author": "Tomer <tomer@corevo.io>",
diff --git a/packages/side-runtime/src/webdriver.ts b/packages/side-runtime/src/webdriver.ts
@@ -1521,8 +1521,8 @@ export default class WebDriverExecutor {
       this.withCancel(async () => {
         const el = await this.elementIsLocated(locator, fallback)
         if (!el) return null
-        const elText = await el.getText()
-        return elText === text
+        const elText = (await el.getText()).replace(/\u00A0/g, ' ').trim()
+        return elText === text.replace(/\u00A0/g, ' ').trim()
       })
     )
     await this.driver.wait<boolean>(textCondition, timeout)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@seleniumhq/side-runtime",`
`3`		`- "version": "4.0.1",`
	`3`	`+ "version": "4.0.2",`
`4`	`4`	`"private": false,`
`5`	`5`	`"description": "Selenium IDE playback and execution",`
`6`	`6`	`"author": "Tomer <[email protected]>",`