@luomus/laji-form-builder 1.0.29 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luomus/laji-form-builder",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "UI for building laji.fi forms",
   "main": "lib/client/app.js",
   "scripts": {
@@ -8,20 +8,23 @@
     "start:dev": "nodemon src/server/start-dev.ts --ignore test --ignore src/client",
     "start:prod": "node build/main.js",
     "test": "npm run test:server && npm run test:client",
-    "test:client": "HOST=localhost PORT=8082 protractor protractor.conf.js",
-    "test:client:ci": "webdriver-manager update --gecko false && HOST=localhost PORT=8082 STANDALONE=true protractor protractor.conf.js",
-    "test:client:debug": "HEADLESS=false HOST=localhost PORT=8082 node --inspect-brk node_modules/protractor/bin/protractor protractor.conf.js",
+    "test:client": "npx playwright test",
+    "test:client:lightweight": "npx playwright test --project chromium",
+    "test:client:docker": "npm run test:client:docker:build && npm run test:client:docker:run",
+    "test:client:docker:build": "docker build -t laji-form-builder-client-test -f client-test.Dockerfile .",
+    "test:client:docker:run": "docker run laji-form-builder-client-test:latest",
     "test:server": "ts-node node_modules/jasmine-xml-reporter/bin/jasmine.js --conf=jasmine.json \"test/server/*-spec.ts\"",
     "test:server:ci": "npm run test:server -- --junitreport --output=test-results/server",
-    "test:ci": "npm run test:server:ci && npm run test:client:ci",
+    "test:ci": "npm run test:server:ci",
     "lint": "eslint -c .eslintrc.prod.json src",
-    "build:client": "rimraf lib && NODE_ENV=production tsc -p tsconfig.client.json && node-sass src/client/styles.scss lib/client/styles.css",
+    "build:client": "rimraf lib && NODE_ENV=production tsc -p tsconfig.client.json && sass src/client/styles.scss lib/client/styles.css",
     "build:dist": "rimraf dist && NODE_ENV=production webpack --config webpack.config.dist.js && rimraf dist/styles.js",
     "build:build": "rimraf build && NODE_ENV=production webpack --config webpack.config.build.js",
     "build:static": "rimraf static && NODE_ENV=production webpack --config webpack.config.static.js",
     "build:server": "npm run build:static && npm run build:build",
-    "preversion": "npm run lint && npm test",
-    "postversion": "npm run build:client && npm publish && git push"
+    "preversion": "npm run lint && npm run test:client:lightweight",
+    "postversion": "npm publish",
+    "prepublishOnly": "npm run build:client && git push && git push --tags"
   },
   "keywords": [
     "laji-form",
@@ -31,7 +34,7 @@
     "react-jsonschema-form"
   ],
   "dependencies": {
-    "@luomus/laji-form": "^14.3.6",
+    "@luomus/laji-form": "^15.1.8",
     "@luomus/parse-prop-types": "^0.3.0",
     "@types/deep-diff": "^1.0.2",
     "@types/memoizee": "^0.4.3",
@@ -51,6 +54,7 @@
     "react-spinner": "^0.2.7"
   },
   "devDependencies": {
+    "@playwright/test": "^1.40.1",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/cron": "^2.0.0",
     "@types/express": "^4.17.13",
@@ -65,21 +69,20 @@
     "cron": "^2.2.0",
     "css-loader": "^6.7.1",
     "eslint": "^7.32.0",
-    "eslint-plugin-protractor": "^2.1.1",
     "eslint-plugin-react": "^7.25.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "express": "^5.0.0-beta.1",
     "html-webpack-plugin": "^5.5.0",
     "ignore-loader": "^0.1.2",
+    "jasmine": "2.8",
     "jasmine-reporters": "^2.5.0",
     "jasmine-spec-reporter": "^7.0.0",
     "jasmine-xml-reporter": "^1.2.1",
     "mini-css-extract-plugin": "^2.6.0",
-    "node-sass": "^6.0.1",
     "nodemon": "^2.0.15",
     "notus": "^0.3.2",
-    "protractor": "^7.0.0",
-    "protractor-console-plugin": "^0.1.1",
+    "rimraf": "^5.0.5",
+    "sass": "^1.69.5",
     "sass-loader": "^12.6.0",
     "source-map-loader": "^3.0.1",
     "style-loader": "^3.3.1",
@@ -109,6 +112,6 @@
     "access": "public"
   },
   "volta": {
-    "node": "14.21.3"
+    "node": "20.10.0"
   }
 }

package/playwright.config.ts

@@ -0,0 +1,76 @@
+import { defineConfig, devices } from '@playwright/test';
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: './test/client',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: (process.env.CI || process.env.DOCKER_TEST_RUN) ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+	reporter: 'line',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+		baseURL: 'http://localhost:8082',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] },
+    },
+
+    {
+      name: 'firefox',
+      use: { ...devices['Desktop Firefox'] },
+    },
+    {
+      name: 'webkit',
+      use: { ...devices['Desktop Safari'] },
+    },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  webServer: {
+    command: 'npm run start',
+    url: 'http://localhost:8082',
+    reuseExistingServer: !process.env.CI,
+  },
+});