chore(PPDSC-1581): tidy plugins structure

newscorp-ghfb · Jan 9, 2023 · a4627db · a4627db
1 parent a0fbd60
commit a4627db
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 26 deletions.
diff --git a/cypress.components.config.ts b/cypress.components.config.ts
@@ -4,11 +4,6 @@ import {defineConfig} from 'cypress';
 
 export default defineConfig({
   e2e: {
-    setupNodeEvents(on, config) {
-      // eslint-disable-next-line global-require
-      return require(// eslint-disable-next-line import/extensions
-      './cypress/plugins/index.js')(on, config);
-    },
     baseUrl: 'http://localhost:8080',
     specPattern: 'cypress/components/**/*.cy.{js,jsx,ts,tsx}',
   },

diff --git a/cypress.docs.config.ts b/cypress.docs.config.ts
@@ -2,12 +2,16 @@
 
 import {defineConfig} from 'cypress';
 
+const {readAllFilesInDir} = require('./cypress/plugins/files');
+
 export default defineConfig({
   e2e: {
-    setupNodeEvents(on, config) {
-      // eslint-disable-next-line global-require
-      return require(// eslint-disable-next-line import/extensions
-      './cypress/plugins/index.js')(on, config);
+    setupNodeEvents(on) {
+      on('task', {
+        readAllFilesInDir(dir) {
+          return readAllFilesInDir(dir);
+        },
+      });
     },
     baseUrl: 'http://localhost:8081',
     specPattern: 'cypress/site/functional/**/*.cy.{js,jsx,ts,tsx}',

diff --git a/cypress.docs.percy.config.ts b/cypress.docs.percy.config.ts
@@ -4,11 +4,6 @@ import {defineConfig} from 'cypress';
 
 export default defineConfig({
   e2e: {
-    setupNodeEvents(on, config) {
-      // eslint-disable-next-line global-require
-      return require(// eslint-disable-next-line import/extensions
-      './cypress/plugins/index.js')(on, config);
-    },
     baseUrl: 'http://localhost:8081',
     specPattern: 'cypress/site/percy/**/*.cy.{js,jsx,ts,tsx}',
   },

diff --git a/cypress.docs.percy.skip.config.ts b/cypress.docs.percy.skip.config.ts
@@ -4,11 +4,6 @@ import {defineConfig} from 'cypress';
 
 export default defineConfig({
   e2e: {
-    setupNodeEvents(on, config) {
-      // eslint-disable-next-line global-require
-      return require(// eslint-disable-next-line import/extensions
-      './cypress/plugins/index.js')(on, config);
-    },
     baseUrl: null,
     specPattern: 'cypress/site/percy-skip/**/*.cy.{js,jsx,ts,tsx}',
   },

diff --git a/cypress/plugins/index.js → cypress/plugins/files.js b/cypress/plugins/index.js → cypress/plugins/files.js
@@ -39,10 +39,4 @@ async function readAllFilesInDir(dir) {
   return results;
 }
 
-module.exports = on => {
-  on('task', {
-    readAllFilesInDir(dir) {
-      return readAllFilesInDir(dir);
-    },
-  });
-};
+module.exports = {readAllFilesInDir};