Merge pull request #159 from zhuje/ou872-modal-pr

OU-872: Use modal id when using the modal from the dynamic plugin SDK

Author: openshift-merge-bot[bot]

Makefile

@@ -45,6 +45,9 @@ build-backend:
 start-backend:
 	go run ./cmd/plugin-backend.go -port='9002' -config-path='./web/dist' -static-path='./web/dist' -plugin-config-path='ct.yaml'
 
+.PHONY: install
+install: install-frontend install-backend
+
 .PHONY: build-image
 build-image: test-frontend
 	./scripts/build-image.sh

web/integration-tests/cypress.config.js

@@ -1,6 +1,7 @@
-const { defineConfig } = require('cypress');
+import { defineConfig } from 'cypress';
+import plugin from './plugins/index';
 
-module.exports = defineConfig({
+export default defineConfig({
   viewportWidth: 1920,
   viewportHeight: 1080,
   screenshotsFolder: './screenshots',
@@ -18,7 +19,7 @@ module.exports = defineConfig({
   },
   e2e: {
     setupNodeEvents(on, config) {
-      return require('./plugins/index.ts')(on, config);
+      return plugin(on, config);
     },
     specPattern: 'tests/**/*.cy.{js,jsx,ts,tsx}',
     supportFile: false,

web/integration-tests/plugins/index.ts

@@ -1,4 +1,4 @@
-import * as wp from '@cypress/webpack-preprocessor';
+import wp from '@cypress/webpack-preprocessor';
 
 module.exports = (on, config) => {
   const options = {