Merged in feature/tests-and-docs (pull request #9)

Improve testing flow and docs

* update snapshots

* update snapshots

* update snapshots

* Add docker run instructions

* Hide image snapshot execution behind an env flag

* Simplify package.json scripts and improve docs

* Merge 'origin/develop' into feature/tests-and-docs

* Update snapshots

* Add wait to container test

* Update snapshot


Approved-by: Paulo Veiga

.dockerignore

@@ -0,0 +1,4 @@
+**/.dockerignore
+docker-compose.yml
+docker-compose.*.yml
+yarn.lock

CONTRIBUTING.md

@@ -0,0 +1,19 @@
+Thanks for your interest in contributing to wisemapping!
+
+Hopefully this document will be improved over time and get to be a [complete CONTRIBUTING document](https://mozillascience.github.io/working-open-workshop/contributing/).
+
+# Sending a Pull Request
+
+1. Create a new branch from `develop`. Convention for branch names is `feature/*` or `bugfix/*`. Eg. `feature/add-contributing-docs`.
+2. Make your changes and test them.
+3. Run quality checks:
+    - `yarn build`
+    - `yarn lint`
+    - `yarn test`
+4. Push your changes, and check that the pipeline result is OK.
+    - If the pipeline failed, spot the issue and fix it.
+    - If the failure is while running the tests and some snapshot is not matching:
+        - you can check the difference by downloading the artifacts from the pipeline
+        - Please check out [README.md](./README.md#Image-Snapshot-Testing) section on Image Snapshot Testing
+        - update snapshots with `docker-compose -f docker-compose.snapshots.update.yml up` and then push any image changes
+5. Create the pull request

README.md

@@ -1,10 +1,70 @@
 # wisemapping-frontend
 
-This monorepo uses lerna and contains all the packages that compose the wisemapping frontend.
-
 This is a WIP migration from [legacy wisemapping](https://bitbucket.org/wisemapping/wisemapping-open-source/) into a modern web development project with multiple improvements.
 
-`nvm use`
+This monorepo uses lerna and contains all the packages that compose the wisemapping frontend.
-`yarn install`
+
-`yarn bootstrap`
+## Getting started
-`yarn run build`
+
+Make sure you have NodeJs installed (version compatible with `package.json` engine), and yarn installed (`npm i -g yarn`).
+
+```
+nvm use
+yarn install
+yarn bootstrap
+```
+
+Please refer to each package's Readme.md for anything specific to the package.
+
+If you want to contribute, please check out [CONTRIBUTING.md](./CONTRIBUTING.md).
+
+## Scripts
+
+Each package might provide the following scripts.  
+You can run these for all packages by running it from the root folder. Alternatively you can run it for a specific package from inside the package folder you want to.
+
+### build
+
+> Production build
+
+`yarn build`
+
+## lint
+
+> run eslint
+
+`yarn lint`
+
+## playground
+
+> start a devServer with some browsable examples
+
+`yarn playground`
+
+## test
+
+> run all the tests
+
+`yarn test`
+
+> run only integration tests
+
+`yarn test:integration`
+
+> run only unit tests
+
+`yarn test:unit`
+
+## Image Snapshot Testing
+
+We use [cypress-image-snapshot](https://www.npmjs.com/package/cypress-image-snapshot) for snapshot testing. This is a relatively cheap way of identifying behavior changes based on page screenshots. See [visual testing docs](https://docs.cypress.io/guides/tooling/visual-testing) for more information.
+
+When a test that contains a `matchImageSnapshot` call is run, it compares the snapshot to the corresponding one in the `snapshots` directory. If Any change is detected, the test will fail, and the diff can be found in the `cypress/snapshots/*/__diff_output__` folder. If the change is intentional, we should "accept" those changes by updating the snapshot and include it in the commit.
+
+There is a [caveat](https://github.com/jaredpalmer/cypress-image-snapshot/issues/98) where colors, fonts or ui may differ depending on the host machine running the tests.
+
+A workaround for this is to run the tests using docker. Make sure you have docker and docker-compose installed.
+
+Run snapshot tests: `docker-compose -f docker-compose.snapshots.yml up`  
+If anything changed, and the change was intentional, update the snapshots and then commit the new images to source control.  
+Update snapshots: `docker-compose -f docker-compose.snapshots.update.yml up`

bitbucket-pipelines.yml

@@ -4,7 +4,7 @@
 #  The workflow allows running tests and code linting on the default branch.
 
 # Node LTS
-image: cypress/base:16.13.0
+image: cypress/included:8.4.1
 
 pipelines:
   default:
@@ -16,9 +16,14 @@ pipelines:
               - npm
               - cypress
             script:
+              - export CYPRESS_imageSnaphots="true"
               - yarn install
+              - yarn bootstrap
               - yarn build
-              - yarn --cwd packages/mindplot test:jest
+              - yarn lint
+              - yarn test
+            artifacts:
+              - packages/**/cypress/snapshots/**/__diff_output__/*.diff.png
 definitions:
   caches:
     npm: $HOME/.npm

docker-compose.snapshots.update.yml

@@ -0,0 +1,29 @@
+version: '3'
+services:
+    e2e:
+        image: cypress/included:8.4.1
+        container_name: wisemapping-integration-tests
+        entrypoint: '/bin/sh -c "yarn install && yarn bootstrap && yarn test:integration"'
+        working_dir: /e2e
+        environment:
+            - CYPRESS_imageSnaphots=true
+            - CYPRESS_updateSnapshots=true
+        volumes:
+            - .:/e2e
+            - node-modules:/e2e/node_modules
+            - node-modules-core-js:/e2e/packages/core-js/node_modules
+            - node-modules-editor:/e2e/packages/editor/node_modules
+            - node-modules-mindplot:/e2e/packages/mindplot/node_modules
+            - node-modules-web2d:/e2e/packages/web2d/node_modules
+            - node-modules-webapp:/e2e/packages/webapp/node_modules
+            - node-modules-webcomponent:/e2e/packages/webcomponent/node_modules
+            - cypress-binary-cache:/root/.cache/Cypress
+volumes:
+    node-modules: {}
+    node-modules-core-js: {}
+    node-modules-editor: {}
+    node-modules-mindplot: {}
+    node-modules-web2d: {}
+    node-modules-webapp: {}
+    node-modules-webcomponent: {}
+    cypress-binary-cache: {}

docker-compose.snapshots.yml

@@ -0,0 +1,28 @@
+version: '3'
+services:
+    e2e:
+        image: cypress/included:8.4.1
+        container_name: wisemapping-integration-tests
+        entrypoint: '/bin/sh -c "yarn install && yarn bootstrap && yarn test:integration"'
+        working_dir: /e2e
+        environment:
+            - CYPRESS_imageSnaphots=true
+        volumes:
+            - .:/e2e
+            - node-modules:/e2e/node_modules
+            - node-modules-core-js:/e2e/packages/core-js/node_modules
+            - node-modules-editor:/e2e/packages/editor/node_modules
+            - node-modules-mindplot:/e2e/packages/mindplot/node_modules
+            - node-modules-web2d:/e2e/packages/web2d/node_modules
+            - node-modules-webapp:/e2e/packages/webapp/node_modules
+            - node-modules-webcomponent:/e2e/packages/webcomponent/node_modules
+            - cypress-binary-cache:/root/.cache/Cypress
+volumes:
+    node-modules: {}
+    node-modules-core-js: {}
+    node-modules-editor: {}
+    node-modules-mindplot: {}
+    node-modules-web2d: {}
+    node-modules-webapp: {}
+    node-modules-webcomponent: {}
+    cypress-binary-cache: {}

package.json

@@ -6,10 +6,12 @@
         "clean": "lerna clean && rm -rf node_modules",
         "lint": "lerna run lint --stream",
         "test": "lerna run test --stream",
-        "test:snapshots": "lerna run test:snapshots --stream"
+        "test:unit": "lerna run test:unit --stream",
+        "test:integration": "lerna run test:integration --stream"
     },
     "private": true,
     "devDependencies": {
+        "cypress": "^8.4.1",
         "husky": "4",
         "lerna": "^3.16.4",
         "lint-staged": "^10.5.4"
@@ -25,7 +27,7 @@
         "Ezequiel Bergamaschi"
     ],
     "engines": {
-        "node": ">=16.0.0"
+        "node": ">=14.0.0"
     },
     "browserslist": {
         "production": [

packages/core-js/README.md

@@ -1,16 +1,3 @@
 # `core-js`
 
-Core-JS defines custom functions for the **Wisemapping** ecosystem.
+> Core-JS defines custom functions for the **Wisemapping** ecosystem.
-
-## Production
-
-To build up the package core-js and use in production, you have to use command `yarn build`
-
-## Usage
-
-To start using core-js it has to be required as a module and then intanciarce as a function
-
-```
-import coreJs from 'core-js';
-coreJs();
-```

packages/editor/package.json

@@ -2,9 +2,7 @@
   "name": "@wisemapping/editor",
   "version": "1.0.0",
   "main": "src/index.tsx",
-  "scripts": {
+  "scripts": {},
-    "lint": "eslint src"
-  },
   "repository": "http://www.wisemapping.com",
   "author": "Paulo Veiga <pveiga@gmail.com>, Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>",
   "license": "MIT",

packages/mindplot/README.md

@@ -1,43 +1,7 @@
 # `Mindplot`
 
-The Mindplot is manager all **Wisemapping**. In it is implemented the packages of `core-js` and `web2d`.
+> Mindplot is the mindmap designer core
-
-## Quick Start
-
-1. Clone repository with the next command:
-
-```
-git clone https://[username]@bitbucket.org/wisemapping/wisemapping-frontend.git
-```
-
-where the variable _username_ is you username of Bitbucket.
-
-_Note:The project is configured to use the yarn dependency manager_
-
-2. Move to folder mindplot
-
-```
-cd packages/mindplot
-```
-
-3. Now you need install all dependence, this is done with command `yarn install`
-
-4. To start the development enviroment you have to use command `yarn start`.
-
-## Production
-
-To build up the package mindplot and use in production, you have to use command `yarn build`
-
-## Playground
-
-For the testings of mindplot you need use command `yarn playground` for run this enviroment.
-once this is done, it will open the explorer where you can see a menu with the tests carried out.
 
 ## Usage
 
-To start using mindplot it has to be required as a module and then intanciarce as a function
+Check out the examples located in `test/playground/map-render/js` for some hints on high level usage. You can browse them by running `yarn playground`.
-
-```
-import mindplot from '@wisemapping/mindplot';
-mindplot();
-```

packages/mindplot/cypress.json

@@ -1,4 +1,5 @@
 {
     "video": false,
-    "videoUploadOnPasses": false
+    "videoUploadOnPasses": false,
+    "baseUrl": "http://localhost:8081"
 }

packages/mindplot/cypress/integration/playground.test.js

@@ -1,5 +1,3 @@
-const BASE_URL = 'http://localhost:8081';
-
 context('Playground', () => {
   it('the playground layout page should match its snapshot', () => {
     // TODO: check why this error is happening, and remove this handling
@@ -7,20 +5,22 @@ context('Playground', () => {
       expect(err.message).to.include('Prediction is incorrectly positioned');
       return false;
     });
-    cy.visit(`${BASE_URL}/layout.html`);
+    cy.visit('/layout.html');
     cy.matchImageSnapshot('layout');
   });
   it('the playground viewmode.html page should match its snapshot', () => {
-    cy.visit(`${BASE_URL}/viewmode.html`);
+    cy.visit('/viewmode.html');
     cy.matchImageSnapshot('viewmode');
   });
   it('the playground container.html page should match its snapshot', () => {
-    cy.visit(`${BASE_URL}/container.html`);
+    cy.visit('/container.html');
+    // TODO: wait for mind map to load instead of an arbitrary number of ms
+    cy.wait(5000);
     cy.matchImageSnapshot('container');
   });
   it('the playground editor.html page should match its snapshot', () => {
-    cy.visit(`${BASE_URL}/editor.html`);
+    cy.visit('/editor.html');
-    // TODO: wait for #load modal to hide instead of arbitrary wait time
+    // TODO: wait for mind map to load instead of an arbitrary number of ms
     cy.wait(5000);
     // TODO: why is the editor appearing twice in the snapshot?
     cy.matchImageSnapshot('editor');

packages/mindplot/cypress/support/commands.js

@@ -1,29 +1,15 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-
 import { addMatchImageSnapshotCommand } from 'cypress-image-snapshot/command';
 
-addMatchImageSnapshotCommand();
+// make matchImageSnapshot() call the real implementation only if CYPRESS_imageSnaphots is set
+// otherwise it calls a noop
+if (Cypress.env('imageSnaphots')) {
+  addMatchImageSnapshotCommand();
+} else {
+  Cypress.Commands.add(
+    'matchImageSnapshot',
+    {
+      prevSubject: ['optional', 'element', 'window', 'document'],
+    },
+    () => Promise.resolve(),
+  );
+}

packages/mindplot/package.json

@@ -25,10 +25,9 @@
         "lint": "eslint src",
         "playground": "webpack serve --config webpack.playground.js",
         "cy:run": "cypress run",
-        "cy:run:update": "cypress run --env updateSnapshots=true",
+        "test:unit": "jest ./test/unit/*.js",
-        "test:jest": "jest ./test/unit/*.js",
+        "test:integration": "start-server-and-test playground http-get://localhost:8081 cy:run",
-        "test:snapshots": "start-server-and-test playground http-get://localhost:8081 cy:run",
+        "test": "yarn test:unit && yarn test:integration"
-        "test:snapshots:update": "start-server-and-test playground http-get://localhost:8081 cy:run:update"
     },
     "dependencies": {
         "@wisemapping/core-js": "^0.0.1",
@@ -46,7 +45,7 @@
         "clean-webpack-plugin": "^4.0.0-alpha.0",
         "copy-webpack-plugin": "^10.0.0",
         "core-js": "^3.15.2",
-        "cypress": "^8.6.0",
+        "cypress": "^8.4.1",
         "cypress-image-snapshot": "^4.0.1",
         "eslint": "^5.16.0",
         "eslint-config-airbnb-base": "^14.2.1",

packages/mindplot/test/playground/layout/TestSuite.js

@@ -160,7 +160,7 @@ class TestSuite extends ChildrenSorterStrategy {
     manager.connectNode(0, 2, 1);
     manager.connectNode(1, 3, 0);
 
-    const events = [];
+    let events = [];
     manager.addEvent('change', (event) => {
       console.log(
         `\tUpdated nodes: {id:${event.getId()
@@ -175,12 +175,12 @@ class TestSuite extends ChildrenSorterStrategy {
     manager.plot('testEvents1', { width: 800, height: 200 });
 
     console.log('\t--- Layout without changes should not affect the tree  ---');
-    events.empty();
+    events = [];
     manager.layout(true);
     manager.plot('testEvents2', { width: 800, height: 200 });
 
     // Check no events where fired
-    $assert(events.length == 0, 'Unnecessary tree updated.');
+    $assert(events.length === 0, 'Unnecessary tree updated.');
 
     console.log('OK!\n\n');
   }
@@ -202,7 +202,7 @@ class TestSuite extends ChildrenSorterStrategy {
     manager.connectNode(3, 4, 0);
     manager.connectNode(3, 5, 1);
 
-    const events = [];
+    let events = [];
     manager.addEvent('change', (event) => {
       console.log(
         `\tUpdated nodes: {id:${event.getId()
@@ -219,7 +219,7 @@ class TestSuite extends ChildrenSorterStrategy {
 
     console.log('\t--- Connect a new node  ---');
 
-    events.empty();
+    events = [];
     manager.connectNode(3, 6, 2);
     manager.layout(true);
     manager.plot('testEventsComplex2', { width: 800, height: 200 });
@@ -253,7 +253,7 @@ class TestSuite extends ChildrenSorterStrategy {
     manager.connectNode(5, 6, 0);
     manager.connectNode(5, 7, 1);
 
-    const events = [];
+    let events = [];
     manager.addEvent('change', (event) => {
       const pos = event.getPosition();
       const posStr = pos ? `,position: {${pos.x}${pos.y}` : '';
@@ -270,7 +270,7 @@ class TestSuite extends ChildrenSorterStrategy {
     manager.plot('testDisconnect1', { width: 1200, height: 400 });
 
     console.log('--- Disconnect node 2 ---');
-    events.empty();
+    events = [];
     manager.disconnectNode(2);
     manager.layout(true);
     manager.plot('testDisconnect2', { width: 1200, height: 400 });

packages/web2d/README.md

@@ -1,43 +1,7 @@
 # `Web2D`
 
-Web2d create the custom charts for the **Wisemapping** ecosystem.
+> Web2d is the JavaScript 2D SVG abstraction library used by the mind map editor
-
-## Quick Start
-
-1. Clone repository with the next command:
-
-```
-git clone https://[username]@bitbucket.org/wisemapping/wisemapping-frontend.git
-```
-
-where the variable _username_ is you username of Bitbucket.
-
-_Note:The project is configured to use the yarn dependency manager_
-
-2. Move to folder web2d
-
-```
-cd packages/web2d
-```
-
-3. Now you need install all dependence, this is done with command `yarn install`
-
-4. To start the development enviroment you have to use command `yarn start`.
-
-## Production
-
-To build up the package web2d and use in production, you have to use command `yarn build`
-
-## Playground
-
-For the testings of web2d you need use command `yarn playground` for run this enviroment.
-once this is done, it will open the explorer where you can see a menu with the tests carried out.
 
 ## Usage
 
-To start using web2d it has to be required as a module and then intanciarce as a function
+Check out the examples located in `test/playground` for some hints on high level usage. You can browse them by running `yarn playground`.
-
-```
-import Web2d from 'web2d';
-Web2d();
-```

packages/web2d/cypress.json

@@ -1,4 +1,5 @@
 {
     "video": false,
-    "videoUploadOnPasses": false
+    "videoUploadOnPasses": false,
+    "baseUrl": "http://localhost:8080"
 }

packages/web2d/cypress/integration/playground.test.js

@@ -1,12 +1,52 @@
-const BASE_URL = 'http://localhost:8080';
-
 context('Playground', () => {
-  it('every test page should match its snapshot', () => {
+  describe('snapshots', () => {
-    cy.visit(BASE_URL);
+    it('Arrow', () => {
-    cy.get('a').forEach(($el) => {
+      cy.visit('/arrow.html');
-      const url = `${BASE_URL}${$el.attr('href')}`;
+      cy.matchImageSnapshot('Arrow');
-      cy.visit(url);
+    });
-      cy.matchImageSnapshot($el.text());
+    it('Curved Line', () => {
+      cy.visit('/curvedLine.html');
+      cy.matchImageSnapshot('Curved Line');
+    });
+    it('Events', () => {
+      cy.visit('/events.html');
+      cy.matchImageSnapshot('Events');
+    });
+    it('Font', () => {
+      cy.visit('/font.html');
+      cy.matchImageSnapshot('Font');
+    });
+    it('Group', () => {
+      cy.visit('/group.html');
+      cy.matchImageSnapshot('Group');
+    });
+    it('Line', () => {
+      cy.visit('/line.html');
+      cy.matchImageSnapshot('Line');
+    });
+    it('Poly Line', () => {
+      cy.visit('/polyLine.html');
+      cy.matchImageSnapshot('Poly Line');
+    });
+    it('Prototype', () => {
+      cy.visit('/prototype.html');
+      cy.matchImageSnapshot('Prototype');
+    });
+    it('Rect', () => {
+      cy.visit('/rect.html');
+      cy.matchImageSnapshot('Rect');
+    });
+    it('Shapes', () => {
+      cy.visit('/shapes.html');
+      cy.matchImageSnapshot('Shapes');
+    });
+    it('Text', () => {
+      cy.visit('/text.html');
+      cy.matchImageSnapshot('Text');
+    });
+    it('Workspace', () => {
+      cy.visit('/workspace.html');
+      cy.matchImageSnapshot('Workspace');
     });
   });
 });

packages/web2d/cypress/support/commands.js

@@ -1,29 +1,15 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-
 import { addMatchImageSnapshotCommand } from 'cypress-image-snapshot/command';
 
-addMatchImageSnapshotCommand();
+// make matchImageSnapshot() call the real implementation only if CYPRESS_imageSnaphots is set
+// otherwise it calls a noop
+if (Cypress.env('imageSnaphots')) {
+  addMatchImageSnapshotCommand();
+} else {
+  Cypress.Commands.add(
+    'matchImageSnapshot',
+    {
+      prevSubject: ['optional', 'element', 'window', 'document'],
+    },
+    () => Promise.resolve(),
+  );
+}

packages/web2d/package.json

@@ -25,9 +25,8 @@
         "lint": "eslint src",
         "playground": "webpack serve --config webpack.playground.js",
         "cy:run": "cypress run",
-        "cy:run:update": "cypress run --env updateSnapshots=true",
+        "test:integration": "start-server-and-test playground http-get://localhost:8080 cy:run",
-        "test:snapshots": "start-server-and-test playground http-get://localhost:8080 cy:run",
+        "test": "yarn test:integration"
-        "test:snapshots:update": "start-server-and-test playground http-get://localhost:8080 cy:run:update"
     },
     "devDependencies": {
         "@babel/core": "^7.14.6",

packages/webapp/cypress.json

@@ -1,4 +1,5 @@
 {
     "video": false,
-    "videoUploadOnPasses": false
+    "videoUploadOnPasses": false,
+    "baseUrl": "http://localhost:3000"
 }

packages/webapp/cypress/README.md

@@ -24,11 +24,3 @@ We leverage the [Page Object Pattern](https://martinfowler.com/bliki/PageObject.
 Finally any common functionality such as for example `login` should be abstracted into a command. CY Commands can be added into the `cypress/support` folder. Feel free to group similar commands into files (You only need to make sure those get imported into the `cypress/support/index.ts` file) 
 
 Happy testing!!!
-
-## snapshot testing
-
-We use [cypress-image-snapshot](https://www.npmjs.com/package/cypress-image-snapshot) for snapshot testing (`yarn run test:snapshots`). This is a relatively cheap way of identifying changes based on page screenshots.
-
-When a test that contains a `matchImageSnapshot` call is run, it compares the snapshot to the corresponding one in the `snapshots` directory. If Any change is detected, the test will fail, and the diff can be found in the `snapshots/*/__diff_output__` folder. If the change is intentional, we should "accept" those changes by updating the snapshot and include it in the commit. To update the snapshots run `yarn run test:snapshots:update`
-
-Is is not yet included in CI because there is an [existing issue](https://github.com/jaredpalmer/cypress-image-snapshot/issues/98) where colors differ depending on the host machine running the tests.

packages/webapp/cypress/integration/maps.test.ts

@@ -2,7 +2,7 @@ import MapsPage from '../pageObject/MapsPage';
 
 context('Maps Page', () => {
     beforeEach(() => {
-        cy.visit('http://localhost:3000/c/maps');
+        cy.visit('/c/maps');
     });
 
     it('should load the maps page', () => {

packages/webapp/cypress/support/commands.ts

@@ -2,3 +2,17 @@ import { addMatchImageSnapshotCommand } from 'cypress-image-snapshot/command';
 import '@testing-library/cypress/add-commands';
 
 addMatchImageSnapshotCommand();
+
+// make matchImageSnapshot() call the real implementation only if CYPRESS_imageSnaphots is set
+// otherwise it calls a noop
+if (Cypress.env('imageSnaphots')) {
+    addMatchImageSnapshotCommand();
+} else {
+    Cypress.Commands.add(
+        'matchImageSnapshot',
+        {
+            prevSubject: ['optional', 'element', 'window', 'document'],
+        },
+        () => Promise.resolve()
+    );
+}

packages/webapp/package.json

@@ -7,12 +7,11 @@
         "build": "webpack --config webpack.prod.js",
         "build-dev": "webpack --config webpack.dev.js",
         "lint": "eslint src",
-        "cy:run": "cross-env ELECTRON_EXTRA_LAUNCH_ARGS=--disable-color-correct-rendering cypress run",
+        "cy:run": "cypress run",
-        "cy:run:update": "yarn run cy:run --env updateSnapshots=true",
+        "test:integration": "start-server-and-test start http-get://localhost:3000 cy:run",
-        "test:snapshots": "start-server-and-test start http-get://localhost:3000 cy:run",
-        "test:snapshots:update": "start-server-and-test start http-get://localhost:3000 cy:run:update",
         "extract": "for lang in {'es','en','fr','de'};do formatjs extract 'src/**/*.ts*' --ignore 'src/@types/**/*' --out-file lang/${lang}.json;done",
-        "compile": "formatjs compile"
+        "compile": "formatjs compile",
+        "test": "yarn test:integration"
     },
     "repository": "http://www.wisemapping.com",
     "author": "Paulo Veiga <pveiga@gmail.com>, Ezequiel Bergamaschi <ezequielbergamaschi@gmail.com>",
@@ -30,7 +29,7 @@
         "copy-webpack-plugin": "^7.0.0",
         "cross-env": "^7.0.3",
         "css-loader": "^5.0.1",
-        "cypress": "^6.5.0",
+        "cypress": "^8.4.1",
         "cypress-image-snapshot": "^4.0.1",
         "eslint": "^7.14.0",
         "eslint-config-prettier": "^8.0.0",

yarn.lock

@@ -928,17 +928,7 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@cypress/listr-verbose-renderer@^0.4.1":
+"@cypress/request@^2.88.10", "@cypress/request@^2.88.6":
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz#a77492f4b11dcc7c446a34b3e28721afd33c642a"
-  integrity sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo=
-  dependencies:
-    chalk "^1.1.3"
-    cli-cursor "^1.0.2"
-    date-fns "^1.27.2"
-    figures "^1.7.0"
-
-"@cypress/request@^2.88.10", "@cypress/request@^2.88.5", "@cypress/request@^2.88.6":
   version "2.88.10"
   resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
   integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
@@ -2313,13 +2303,6 @@
     redux-thunk "^2.3.0"
     reselect "^4.0.0"
 
-"@samverschueren/stream-to-observable@^0.3.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz#a21117b19ee9be70c379ec1877537ef2e1c63301"
-  integrity sha512-c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==
-  dependencies:
-    any-observable "^0.3.0"
-
 "@sideway/address@^4.1.3":
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.3.tgz#d93cce5d45c5daec92ad76db492cc2ee3c64ab27"
@@ -2543,11 +2526,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.12.tgz#ac7fb693ac587ee182c3780c26eb65546a1a3c10"
   integrity sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==
 
-"@types/node@12.12.50":
-  version "12.12.50"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.50.tgz#e9b2e85fafc15f2a8aa8fdd41091b983da5fd6ee"
-  integrity sha512-5ImO01Fb8YsEOYpV+aeyGYztcYcjGsBvN4D7G5r1ef2cuQOpymjWNQi5V0rKHE6PC2ru3HkoUr/Br2/8GUA84w==
-
 "@types/node@14", "@types/node@^14.14.31":
   version "14.18.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz#98df2397f6936bfbff4f089e40e06fa5dd88d32a"
@@ -2611,7 +2589,7 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
   integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
 
-"@types/sinonjs__fake-timers@^6.0.1", "@types/sinonjs__fake-timers@^6.0.2":
+"@types/sinonjs__fake-timers@^6.0.2":
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz#0ecc1b9259b76598ef01942f547904ce61a6a77d"
   integrity sha512-IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A==
@@ -3163,7 +3141,7 @@ ansi-colors@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
@@ -3224,11 +3202,6 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-any-observable@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
-  integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==
-
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f"
@@ -3267,7 +3240,7 @@ aproba@^2.0.0:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-arch@^2.1.2, arch@^2.2.0:
+arch@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
@@ -3695,7 +3668,7 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-blob-util@2.0.2, blob-util@^2.0.2:
+blob-util@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
   integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
@@ -4056,7 +4029,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^1.0.0, chalk@^1.1.3:
+chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -4224,14 +4197,7 @@ cli-boxes@^2.2.1:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
   integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
 
-cli-cursor@^1.0.2:
+cli-cursor@^2.1.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
   integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
@@ -4255,14 +4221,6 @@ cli-table3@~0.6.0:
   optionalDependencies:
     colors "^1.1.2"
 
-cli-truncate@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=
-  dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
-
 cli-truncate@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
@@ -4487,7 +4445,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.2:
+concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -4955,53 +4913,7 @@ cypress@*:
     url "^0.11.0"
     yauzl "^2.10.0"
 
-cypress@^6.5.0:
+cypress@^8.4.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.9.1.tgz#ce1106bfdc47f8d76381dba63f943447883f864c"
-  integrity sha512-/RVx6sOhsyTR9sd9v0BHI4tnDZAhsH9rNat7CIKCUEr5VPWxyfGH0EzK4IHhAqAH8vjFcD4U14tPiJXshoUrmQ==
-  dependencies:
-    "@cypress/listr-verbose-renderer" "^0.4.1"
-    "@cypress/request" "^2.88.5"
-    "@cypress/xvfb" "^1.2.4"
-    "@types/node" "12.12.50"
-    "@types/sinonjs__fake-timers" "^6.0.1"
-    "@types/sizzle" "^2.3.2"
-    arch "^2.1.2"
-    blob-util "2.0.2"
-    bluebird "^3.7.2"
-    cachedir "^2.3.0"
-    chalk "^4.1.0"
-    check-more-types "^2.24.0"
-    cli-table3 "~0.6.0"
-    commander "^5.1.0"
-    common-tags "^1.8.0"
-    dayjs "^1.9.3"
-    debug "4.3.2"
-    eventemitter2 "^6.4.2"
-    execa "^4.0.2"
-    executable "^4.1.1"
-    extract-zip "^1.7.0"
-    fs-extra "^9.0.1"
-    getos "^3.2.1"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.3.2"
-    lazy-ass "^1.6.0"
-    listr "^0.14.3"
-    lodash "^4.17.19"
-    log-symbols "^4.0.0"
-    minimist "^1.2.5"
-    moment "^2.29.1"
-    ospath "^1.2.2"
-    pretty-bytes "^5.4.1"
-    ramda "~0.27.1"
-    request-progress "^3.0.0"
-    supports-color "^7.2.0"
-    tmp "~0.2.1"
-    untildify "^4.0.0"
-    url "^0.11.0"
-    yauzl "^2.10.0"
-
-cypress@^8.4.1, cypress@^8.6.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.7.0.tgz#2ee371f383d8f233d3425b6cc26ddeec2668b6da"
   integrity sha512-b1bMC3VQydC6sXzBMFnSqcvwc9dTZMgcaOzT0vpSD+Gq1yFc+72JDWi55sfUK5eIeNLAtWOGy1NNb6UlhMvB+Q==
@@ -5072,17 +4984,12 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-date-fns@^1.27.2:
-  version "1.30.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
-  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
-
 dateformat@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-dayjs@^1.10.4, dayjs@^1.9.3:
+dayjs@^1.10.4:
   version "1.10.7"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468"
   integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==
@@ -5496,11 +5403,6 @@ electron-to-chromium@^1.3.896:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.15.tgz#4bd144d9d13f8b375c65e1a593e7f4a90bd01b90"
   integrity sha512-WDw2IUL3k4QpbzInV3JZK+Zd1NjWJPDZ28oUSchWb/kf6AVj7/niaAlgcJlvojFa1d7pJSyQ/KSZsEtq5W7aGQ==
 
-elegant-spinner@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
-  integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
-
 emittery@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860"
@@ -6031,7 +5933,7 @@ event-stream@=3.3.4:
     stream-combiner "~0.0.4"
     through "~2.3.1"
 
-eventemitter2@^6.4.2, eventemitter2@^6.4.3:
+eventemitter2@^6.4.3:
   version "6.4.5"
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655"
   integrity sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==
@@ -6058,7 +5960,7 @@ eventsource@^1.0.7:
   dependencies:
     original "^1.0.0"
 
-execa@4.1.0, execa@^4.0.2, execa@^4.1.0:
+execa@4.1.0, execa@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
   integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -6121,11 +6023,6 @@ executable@^4.1.1:
   dependencies:
     pify "^2.2.0"
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
-
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
@@ -6251,16 +6148,6 @@ extract-zip@2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
-extract-zip@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
-  dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
-    yauzl "^2.10.0"
-
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -6347,14 +6234,6 @@ figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -6625,7 +6504,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
+fs-extra@^9.0.0, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -6920,13 +6799,6 @@ glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-global-dirs@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d"
-  integrity sha512-MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ==
-  dependencies:
-    ini "1.3.7"
-
 global-dirs@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
@@ -7570,11 +7442,6 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
-  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
-
 ini@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
@@ -7892,14 +7759,6 @@ is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
   integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
 
-is-installed-globally@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141"
-  integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==
-  dependencies:
-    global-dirs "^2.0.1"
-    is-path-inside "^3.0.1"
-
 is-installed-globally@^0.4.0, is-installed-globally@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
@@ -7947,13 +7806,6 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-observable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
-  integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==
-  dependencies:
-    symbol-observable "^1.1.0"
-
 is-path-cwd@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
@@ -7973,7 +7825,7 @@ is-path-inside@^2.1.0:
   dependencies:
     path-is-inside "^1.0.2"
 
-is-path-inside@^3.0.1, is-path-inside@^3.0.2:
+is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -8005,11 +7857,6 @@ is-potential-custom-element-name@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-promise@^2.1.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
-  integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
-
 is-regex@^1.0.4, is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -9078,35 +8925,6 @@ lint-staged@^10.5.4:
     string-argv "0.3.1"
     stringify-object "^3.3.0"
 
-listr-silent-renderer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
-  integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=
-
-listr-update-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2"
-  integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==
-  dependencies:
-    chalk "^1.1.3"
-    cli-truncate "^0.2.1"
-    elegant-spinner "^1.0.1"
-    figures "^1.7.0"
-    indent-string "^3.0.0"
-    log-symbols "^1.0.2"
-    log-update "^2.3.0"
-    strip-ansi "^3.0.1"
-
-listr-verbose-renderer@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db"
-  integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
-  dependencies:
-    chalk "^2.4.1"
-    cli-cursor "^2.1.0"
-    date-fns "^1.27.2"
-    figures "^2.0.0"
-
 listr2@^3.2.2, listr2@^3.8.3:
   version "3.13.5"
   resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.13.5.tgz#105a813f2eb2329c4aae27373a281d610ee4985f"
@@ -9121,21 +8939,6 @@ listr2@^3.2.2, listr2@^3.8.3:
     through "^2.3.8"
     wrap-ansi "^7.0.0"
 
-listr@^0.14.3:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586"
-  integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
-  dependencies:
-    "@samverschueren/stream-to-observable" "^0.3.0"
-    is-observable "^1.1.0"
-    is-promise "^2.1.0"
-    is-stream "^1.1.0"
-    listr-silent-renderer "^1.1.1"
-    listr-update-renderer "^0.5.0"
-    listr-verbose-renderer "^0.5.0"
-    p-map "^2.0.0"
-    rxjs "^6.3.3"
-
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -9291,7 +9094,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.7.0:
+lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -9304,22 +9107,6 @@ log-symbols@4.1.0, log-symbols@^4.0.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
-log-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
-  dependencies:
-    chalk "^1.0.0"
-
-log-update@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
-  integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg=
-  dependencies:
-    ansi-escapes "^3.0.0"
-    cli-cursor "^2.0.0"
-    wrap-ansi "^3.0.1"
-
 log-update@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
@@ -9783,7 +9570,7 @@ mkdirp@*:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5:
+mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -9825,11 +9612,6 @@ modify-values@^1.0.0:
   resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
   integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
 
-moment@^2.29.1:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
-
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -10367,11 +10149,6 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -11021,7 +10798,7 @@ prettier@^2.2.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
   integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
 
-pretty-bytes@^5.4.1, pretty-bytes@^5.6.0:
+pretty-bytes@^5.6.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
@@ -11868,14 +11645,6 @@ responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -11957,7 +11726,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
-rxjs@^6.3.3, rxjs@^6.4.0:
+rxjs@^6.4.0:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
@@ -12291,11 +12060,6 @@ slash@^4.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
-
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -12884,7 +12648,7 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0, supports-color@^7.2.0:
+supports-color@^7.0.0, supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@@ -12899,11 +12663,6 @@ supports-hyperlinks@^2.0.0:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
 
-symbol-observable@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-  integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
-
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -14026,14 +13785,6 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
-  integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"