diff --git a/e2e/README.md b/e2e/README.md deleted file mode 100644 index ef701dd66..000000000 --- a/e2e/README.md +++ /dev/null @@ -1,52 +0,0 @@ -# End to end tests - -These tests are end to end tests in the sense that they actually render a full diagram in the browser. The purpose of these tests is to simplify handling of merge requests and releases by highlighting possible unexpected side-effects. - -Apart from beeing rendered in a browser the tests perform image snapshots of the diagrams. The tests is handled in the same way as regular jest snapshots tests with the difference that an image comparison is performed instead of a comparison of the generated code. - -# Platform differences - -There will be slightly different renderings of the images on different platforms. For instance how fonts are anti-aliased. This means that until this started to render usings some common clod service the snaphos rendered on windows will fail in linux etc. - -Here are a few simple rules to work around this flaw for now: - -1. With no changes assume that tests are working. -2. Before starting to do changes update the snapshots `jest e2e --config e2e/jest.config.js -u` -3. Dont commit the __diff_output__ - -## To run the tests -1. Start the dev server by running ***yarn dev*** -2. Run yarn e2e to run the tests - -## Recomended way of working - -If you are working with an issue you wanto to fix. Start with making a e2e test that show the issue. - -Add otions for the e2e tests to log the dev server url as in the example below. - -``` - await imgSnapshotTest(page, ` - graph LR - foo-->bar - - style foo fill:#F99,stroke-width:2px,stroke:#F0F - style bar fill:#999,color: #ffffff, stroke-width:10px,stroke:#0F0 - `, - { - listUrl: true, - listId: 'color' - logLevel: 0 - }) -``` - -Open the url in the dev server and fix the issue. - -This way if working makes it easy to have render a graph you want to work with ands ensures that the e2e suit is expanded. - -One unwanted sideeffect is that when the fix is done the the likley willl fail. Fix this by updating the snapshots. - -``` - jest e2e --config e2e/jest.config.js -u -``` - -** Important** If you change the text, dont forget to use the new url. \ No newline at end of file diff --git a/e2e/helpers/util.js b/e2e/helpers/util.js deleted file mode 100644 index 7844d3dae..000000000 --- a/e2e/helpers/util.js +++ /dev/null @@ -1,34 +0,0 @@ -/* eslint-env jest */ -import { Base64 } from 'js-base64' - -export const mermaidUrl = (graphStr, options, api) => { - const obj = { - code: graphStr, - mermaid: options - } - const objStr = JSON.stringify(obj) - let url = 'http://localhost:9000/e2e.html?graph=' + Base64.encodeURI(objStr) - if (api) { - url = 'http://localhost:9000/xss.html?graph=' + graphStr - } - - if (options.listUrl) { - console.log(options.listId, ' ', url) - } - - return url -} - -export const imgSnapshotTest = async (page, graphStr, options, api) => { - return new Promise(async resolve => { - const url = mermaidUrl(graphStr, options, api) - - await page.goto(url) - - const image = await page.screenshot() - - expect(image).toMatchImageSnapshot() - resolve() - }) - // page.close() -} diff --git a/e2e/jest.config.js b/e2e/jest.config.js deleted file mode 100644 index 3b7fc6917..000000000 --- a/e2e/jest.config.js +++ /dev/null @@ -1,11 +0,0 @@ -// jest.config.js -module.exports = { - // verbose: true, - transform: { - '^.+\\.jsx?$': '../transformer.js' - }, - preset: 'jest-puppeteer', - 'globalSetup': 'jest-environment-puppeteer/setup', - 'globalTeardown': 'jest-environment-puppeteer/teardown', - 'testEnvironment': 'jest-environment-puppeteer' -} diff --git a/e2e/platform/bundle-test.js b/e2e/platform/bundle-test.js deleted file mode 100644 index 29fe5955b..000000000 --- a/e2e/platform/bundle-test.js +++ /dev/null @@ -1,10 +0,0 @@ -import mermaid from '../../dist/mermaid.core' - -mermaid.initialize({ - theme: 'forest', - gantt: { axisFormatter: [ - ['%Y-%m-%d', (d) => { - return d.getDay() === 1 - }] - ] } -}) diff --git a/e2e/platform/click.html b/e2e/platform/click.html deleted file mode 100644 index 2a018fd72..000000000 --- a/e2e/platform/click.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - Mermaid Quick Test Page - - - -
- graph TB - Function-->URL - click Function clickByFlow "Add a div" - click URL "https://mermaidjs.github.io/" "Visit mermaid docs" -
-
- graph TB - 1Function-->2URL - click 1Function clickByFlow "Add a div" - click 2URL "https://mermaidjs.github.io/" "Visit mermaid docs" -
- -
- gantt - dateFormat YYYY-MM-DD - axisFormat %d/%m - title Adding GANTT diagram to mermaid - excludes weekdays 2014-01-10 - - section A section - Completed task :done, des1, 2014-01-06,2014-01-08 - Active task :active, des2, 2014-01-09, 3d - Future task : des3, after des2, 5d - Future task2 : des4, after des3, 5d - - section Critical tasks - Completed task in the critical line :crit, done, 2014-01-06,24h - Implement parser and jison :crit, done, after des1, 2d - Create tests for parser :crit, active, 3d - Future task in critical line :crit, 5d - Create tests for renderer :2d - Add to mermaid :1d - - section Documentation - Describe gantt syntax :active, a1, after des1, 3d - Add gantt diagram to demo page :after a1 , 20h - Add another diagram to demo page :doc1, after a1 , 48h - - section Clickable - Visit mermaidjs :active, cl1, 2014-01-07,2014-01-10 - Calling a Callback (look at the console log) :cl2, after cl1, 3d - - click cl1 href "https://mermaidjs.github.io/" - click cl2 call clickByGantt("test", test, test) - - section Last section - Describe gantt syntax :after doc1, 3d - Add gantt diagram to demo page : 20h - Add another diagram to demo page : 48h -
- - - - - diff --git a/e2e/platform/e2e.html b/e2e/platform/e2e.html deleted file mode 100644 index 498b374d2..000000000 --- a/e2e/platform/e2e.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - diff --git a/e2e/platform/flow.html b/e2e/platform/flow.html deleted file mode 100644 index e627652d6..000000000 --- a/e2e/platform/flow.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - -
- graph TB - subgraph One - a1-->a2-->a3 - end -
-
- graph TB - a_a --> b_b:::apa --> c_c:::apa - classDef apa fill:#f9f,stroke:#333,stroke-width:4px; - class a_a apa; -
-
- graph TB - a_a(Aftonbladet) --> b_b[gorilla]:::apa --> c_c{chimp}:::apa -->a_a - a_a --> c --> d_d --> c_c - classDef apa fill:#f9f,stroke:#333,stroke-width:4px; - class a_a apa; - click a_a "http://www.aftonbladet.se" "apa" -
- - - - - diff --git a/e2e/platform/info.html b/e2e/platform/info.html deleted file mode 100644 index 2c78628cf..000000000 --- a/e2e/platform/info.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - -

info below

-
info
- - - - - diff --git a/e2e/platform/pie.html b/e2e/platform/pie.html deleted file mode 100644 index 4522a5bd8..000000000 --- a/e2e/platform/pie.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - Mermaid Quick Test Page - - - -
- pie title Example pie chart - "ash" :60.89 - "bat" : 39.5 - "cat": 89.99 -
- - - - diff --git a/e2e/platform/subgraph.html b/e2e/platform/subgraph.html deleted file mode 100644 index c22de76f1..000000000 --- a/e2e/platform/subgraph.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - Mermaid Quick Test Page - - - - -
- graph TD - A[Christmas] -->|Get money| B(Go shopping) - subgraph 1test["id starting with number"] - A - end - style 1test fill:#F99,stroke-width:2px,stroke:#F0F -
-
- graph TD - A.a[Christmas]:::someclass -->|Get money| B(Go shopping):::someclass - subgraph test["id starting with number"] - A.a - end - style test fill:#F99,stroke-width:2px,stroke:#F0F - classDef someclass fill:#f96; -
-
- graph TD - 9e122290-->82072290_1ec3_e711_8c5a_005056ad0002 - style 9e122290 fill:#F99,stroke-width:2px,stroke:#F0F -
- - - - diff --git a/e2e/platform/vertices.html b/e2e/platform/vertices.html deleted file mode 100644 index e3807cda7..000000000 --- a/e2e/platform/vertices.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - Mermaid Quick Test Page - - - - -
- info -
-
- graph TD - subgraph one - 1 - end -
- B --> C - --> - - - - - diff --git a/e2e/platform/viewer.js b/e2e/platform/viewer.js deleted file mode 100644 index b33c76502..000000000 --- a/e2e/platform/viewer.js +++ /dev/null @@ -1,66 +0,0 @@ -import { Base64 } from 'js-base64' -import mermaid2 from '../../src/mermaid' - -/** - * ##contentLoaded - * Callback function that is called when page is loaded. This functions fetches configuration for mermaid rendering and - * calls init for rendering the mermaid diagrams on the page. - */ -const contentLoaded = function () { - let pos = document.location.href.indexOf('?graph=') - if (pos > 0) { - pos = pos + 7 - const graphBase64 = document.location.href.substr(pos) - const graphObj = JSON.parse(Base64.decode(graphBase64)) - // const graph = 'hello' - console.log(graphObj) - const div = document.createElement('div') - div.id = 'block' - div.className = 'mermaid' - div.innerHTML = graphObj.code - document.getElementsByTagName('body')[0].appendChild(div) - global.mermaid.initialize(graphObj.mermaid) - // console.log('graphObj.mermaid', graphObj.mermaid) - global.mermaid.init() - } -} -const contentLoadedApi = function () { - let pos = document.location.href.indexOf('?graph=') - if (pos > 0) { - pos = pos + 7 - const graphBase64 = document.location.href.substr(pos) - const graphObj = JSON.parse(Base64.decode(graphBase64)) - // const graph = 'hello' - const div = document.createElement('div') - div.id = 'block' - div.className = 'mermaid' - // div.innerHTML = graphObj.code - document.getElementsByTagName('body')[0].appendChild(div) - global.mermaid.initialize(graphObj.mermaid) - - mermaid2.render('newid', graphObj.code, (svgCode, bindFunctions) => { - div.innerHTML = svgCode - - bindFunctions(div) - }, div) - } -} - -if (typeof document !== 'undefined') { - /*! - * Wait for document loaded before starting the execution - */ - window.addEventListener( - 'load', - function () { - if (this.location.href.match('xss.html')) { - this.console.log('Using api') - contentLoadedApi() - } else { - this.console.log('Not using api') - contentLoaded() - } - }, - false - ) -} diff --git a/e2e/platform/webpackUsage.html b/e2e/platform/webpackUsage.html deleted file mode 100644 index 32123d902..000000000 --- a/e2e/platform/webpackUsage.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - -
-graph LR -A-->B -
-
-gantt -title A Gantt Diagram -dateFormat YYYY-MM-DD -section Section -A task :a1, 2014-01-01, 30d -Another task :after a1 , 20d -section Another -Task in sec :2014-01-12 , 12d -another task : 24d -
- - - - \ No newline at end of file diff --git a/e2e/platform/xss.html b/e2e/platform/xss.html deleted file mode 100644 index 9abc43852..000000000 --- a/e2e/platform/xss.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - diff --git a/e2e/platform/xss.png b/e2e/platform/xss.png deleted file mode 100644 index 9dc80e071..000000000 Binary files a/e2e/platform/xss.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/class-diagram-spec-js-sequencediagram-should-render-a-simple-class-diagrams-1-snap.png b/e2e/spec/__image_snapshots__/class-diagram-spec-js-sequencediagram-should-render-a-simple-class-diagrams-1-snap.png deleted file mode 100644 index 303e2ae0c..000000000 Binary files a/e2e/spec/__image_snapshots__/class-diagram-spec-js-sequencediagram-should-render-a-simple-class-diagrams-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-flowchart-full-of-circles-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-flowchart-full-of-circles-1-snap.png deleted file mode 100644 index d83e0fd6e..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-flowchart-full-of-circles-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-flowchart-full-of-icons-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-flowchart-full-of-icons-1-snap.png deleted file mode 100644 index 03c638640..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-flowchart-full-of-icons-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-flowchart-with-ling-sames-and-class-definitoins-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-flowchart-with-ling-sames-and-class-definitoins-1-snap.png deleted file mode 100644 index 90c6c6bc3..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-flowchart-with-ling-sames-and-class-definitoins-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-simple-flowchart-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-simple-flowchart-1-snap.png deleted file mode 100644 index 1b9891432..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-simple-flowchart-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-simple-flowchart-with-line-breaks-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-simple-flowchart-with-line-breaks-1-snap.png deleted file mode 100644 index c4ec929d2..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-simple-flowchart-with-line-breaks-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-simple-flowchart-with-trapezoid-and-inverse-trapezoid-vertex-options-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-simple-flowchart-with-trapezoid-and-inverse-trapezoid-vertex-options-1-snap.png deleted file mode 100644 index 9294cb49c..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-a-simple-flowchart-with-trapezoid-and-inverse-trapezoid-vertex-options-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-color-of-styled-nodes-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-color-of-styled-nodes-1-snap.png deleted file mode 100644 index aa4e769a8..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-color-of-styled-nodes-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-labels-with-numbers-at-the-start-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-labels-with-numbers-at-the-start-1-snap.png deleted file mode 100644 index 1010e173d..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-labels-with-numbers-at-the-start-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-styled-subgraphs-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-styled-subgraphs-1-snap.png deleted file mode 100644 index 1dda2a575..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-styled-subgraphs-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-subgraphs-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-subgraphs-1-snap.png deleted file mode 100644 index d9022b64f..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-subgraphs-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-subgraphs-with-a-title-startign-with-a-digit-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-subgraphs-with-a-title-startign-with-a-digit-1-snap.png deleted file mode 100644 index 8dcba8c4f..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-subgraphs-with-a-title-startign-with-a-digit-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-subgraphs-with-a-title-startign-with-a-digit-2-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-subgraphs-with-a-title-startign-with-a-digit-2-snap.png deleted file mode 100644 index 8dcba8c4f..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-render-subgraphs-with-a-title-startign-with-a-digit-2-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-style-nodes-via-a-class-1-snap.png b/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-style-nodes-via-a-class-1-snap.png deleted file mode 100644 index 05d790f95..000000000 Binary files a/e2e/spec/__image_snapshots__/flowchart-spec-js-flowcart-should-style-nodes-via-a-class-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/gantt-spec-js-sequencediagram-should-render-a-gantt-chart-1-snap.png b/e2e/spec/__image_snapshots__/gantt-spec-js-sequencediagram-should-render-a-gantt-chart-1-snap.png deleted file mode 100644 index e719c6059..000000000 Binary files a/e2e/spec/__image_snapshots__/gantt-spec-js-sequencediagram-should-render-a-gantt-chart-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/info-spec-js-sequencediagram-should-render-a-simple-info-diagrams-1-snap.png b/e2e/spec/__image_snapshots__/info-spec-js-sequencediagram-should-render-a-simple-info-diagrams-1-snap.png deleted file mode 100644 index d8b84521b..000000000 Binary files a/e2e/spec/__image_snapshots__/info-spec-js-sequencediagram-should-render-a-simple-info-diagrams-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/sequencediagram-spec-js-sequencediagram-background-rects-should-render-a-single-and-nested-rects-2-snap.png b/e2e/spec/__image_snapshots__/sequencediagram-spec-js-sequencediagram-background-rects-should-render-a-single-and-nested-rects-2-snap.png deleted file mode 100644 index 58ba25086..000000000 Binary files a/e2e/spec/__image_snapshots__/sequencediagram-spec-js-sequencediagram-background-rects-should-render-a-single-and-nested-rects-2-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/sequencediagram-spec-js-sequencediagram-should-render-a-simple-sequence-diagrams-1-snap.png b/e2e/spec/__image_snapshots__/sequencediagram-spec-js-sequencediagram-should-render-a-simple-sequence-diagrams-1-snap.png deleted file mode 100644 index fe6735ab3..000000000 Binary files a/e2e/spec/__image_snapshots__/sequencediagram-spec-js-sequencediagram-should-render-a-simple-sequence-diagrams-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/webpack-usage-spec-js-sequencediagram-should-render-a-simple-sequence-diagrams-1-snap.png b/e2e/spec/__image_snapshots__/webpack-usage-spec-js-sequencediagram-should-render-a-simple-sequence-diagrams-1-snap.png deleted file mode 100644 index 940075836..000000000 Binary files a/e2e/spec/__image_snapshots__/webpack-usage-spec-js-sequencediagram-should-render-a-simple-sequence-diagrams-1-snap.png and /dev/null differ diff --git a/e2e/spec/__image_snapshots__/xss-spec-js-xss-should-handle-xss-in-tags-1-snap.png b/e2e/spec/__image_snapshots__/xss-spec-js-xss-should-handle-xss-in-tags-1-snap.png deleted file mode 100644 index 8ffea2fa5..000000000 Binary files a/e2e/spec/__image_snapshots__/xss-spec-js-xss-should-handle-xss-in-tags-1-snap.png and /dev/null differ diff --git a/e2e/spec/classDiagram.spec.js b/e2e/spec/classDiagram.spec.js deleted file mode 100644 index e4fba5a2c..000000000 --- a/e2e/spec/classDiagram.spec.js +++ /dev/null @@ -1,27 +0,0 @@ -/* eslint-env jest */ -import { imgSnapshotTest } from '../helpers/util.js' -const { toMatchImageSnapshot } = require('jest-image-snapshot') - -expect.extend({ toMatchImageSnapshot }) - -describe('Sequencediagram', () => { - it('should render a simple class diagrams', async () => { - await imgSnapshotTest(page, ` - classDiagram - Class01 <|-- AveryLongClass : Cool - Class03 *-- Class04 - Class05 o-- Class06 - Class07 .. Class08 - Class09 --> C2 : Where am i? - Class09 --* C3 - Class09 --|> Class07 - Class07 : equals() - Class07 : Object[] elementData - Class01 : size() - Class01 : int chimp - Class01 : int gorilla - Class08 <--> C2: Cool label - `, - {}) - }) -}) diff --git a/e2e/spec/flowchart.spec.js b/e2e/spec/flowchart.spec.js deleted file mode 100644 index f8567356b..000000000 --- a/e2e/spec/flowchart.spec.js +++ /dev/null @@ -1,326 +0,0 @@ -/* eslint-env jest */ -import { imgSnapshotTest } from '../helpers/util.js' -const { toMatchImageSnapshot } = require('jest-image-snapshot') - -expect.extend({ toMatchImageSnapshot }) - -describe('Flowcart', () => { - it('should render a simple flowchart', async () => { - await imgSnapshotTest(page, `graph TD - A[Christmas] -->|Get money| B(Go shopping) - B --> C{Let me think} - C -->|One| D[Laptop] - C -->|Two| E[iPhone] - C -->|Three| F[fa:fa-car Car] - `, - {}) - }) - it('should render a simple flowchart with line breaks', async () => { - await imgSnapshotTest(page, ` - graph TD - A[Christmas] -->|Get money| B(Go shopping) - B --> C{Let me thinksssss
ssssssssssssssssssssss
sssssssssssssssssssssssssss} - C -->|One| D[Laptop] - C -->|Two| E[iPhone] - C -->|Three| F[Car] - `, - {}) - }) - - it('should render a simple flowchart with trapezoid and inverse trapezoid vertex options.', async () => { - await imgSnapshotTest(page, ` - graph TD - A[/Christmas\\] - A -->|Get money| B[\\Go shopping/] - B --> C{Let me thinksssss
ssssssssssssssssssssss
sssssssssssssssssssssssssss} - C -->|One| D[/Laptop/] - C -->|Two| E[\\iPhone\\] - C -->|Three| F[Car] - `, - {}) - }) - - it('should style nodes via a class.', async () => { - await imgSnapshotTest(page, ` - graph TD - 1A --> 1B - 1B --> 1C - 1C --> D - 1C --> E - - classDef processHead fill:#888888,color:white,font-weight:bold,stroke-width:3px,stroke:#001f3f - class 1A,1B,D,E processHead - `, - {}) - }) - - it('should render a flowchart full of circles', async () => { - await imgSnapshotTest(page, ` - graph LR - 47(SAM.CommonFA.FMESummary)-->48(SAM.CommonFA.CommonFAFinanceBudget) - 37(SAM.CommonFA.BudgetSubserviceLineVolume)-->48(SAM.CommonFA.CommonFAFinanceBudget) - 35(SAM.CommonFA.PopulationFME)-->47(SAM.CommonFA.FMESummary) - 41(SAM.CommonFA.MetricCost)-->47(SAM.CommonFA.FMESummary) - 44(SAM.CommonFA.MetricOutliers)-->47(SAM.CommonFA.FMESummary) - 46(SAM.CommonFA.MetricOpportunity)-->47(SAM.CommonFA.FMESummary) - 40(SAM.CommonFA.OPVisits)-->47(SAM.CommonFA.FMESummary) - 38(SAM.CommonFA.CommonFAFinanceRefund)-->47(SAM.CommonFA.FMESummary) - 43(SAM.CommonFA.CommonFAFinancePicuDays)-->47(SAM.CommonFA.FMESummary) - 42(SAM.CommonFA.CommonFAFinanceNurseryDays)-->47(SAM.CommonFA.FMESummary) - 45(SAM.CommonFA.MetricPreOpportunity)-->46(SAM.CommonFA.MetricOpportunity) - 35(SAM.CommonFA.PopulationFME)-->45(SAM.CommonFA.MetricPreOpportunity) - 41(SAM.CommonFA.MetricCost)-->45(SAM.CommonFA.MetricPreOpportunity) - 41(SAM.CommonFA.MetricCost)-->44(SAM.CommonFA.MetricOutliers) - 39(SAM.CommonFA.ChargeDetails)-->43(SAM.CommonFA.CommonFAFinancePicuDays) - 39(SAM.CommonFA.ChargeDetails)-->42(SAM.CommonFA.CommonFAFinanceNurseryDays) - 39(SAM.CommonFA.ChargeDetails)-->41(SAM.CommonFA.MetricCost) - 39(SAM.CommonFA.ChargeDetails)-->40(SAM.CommonFA.OPVisits) - 35(SAM.CommonFA.PopulationFME)-->39(SAM.CommonFA.ChargeDetails) - 36(SAM.CommonFA.PremetricCost)-->39(SAM.CommonFA.ChargeDetails) - `, - {}) - }) - it('should render a flowchart full of icons', async () => { - await imgSnapshotTest(page, ` - graph TD - 9e122290_1ec3_e711_8c5a_005056ad0002("fa:fa-creative-commons My System | Test Environment") - 82072290_1ec3_e711_8c5a_005056ad0002("fa:fa-cogs Shared Business Logic Server:Service 1") - db052290_1ec3_e711_8c5a_005056ad0002("fa:fa-cogs Shared Business Logic Server:Service 2") - 4e112290_1ec3_e711_8c5a_005056ad0002("fa:fa-cogs Shared Report Server:Service 1") - 30122290_1ec3_e711_8c5a_005056ad0002("fa:fa-cogs Shared Report Server:Service 2") - 5e112290_1ec3_e711_8c5a_005056ad0002("fa:fa-cogs Dedicated Test Business Logic Server:Service 1") - c1112290_1ec3_e711_8c5a_005056ad0002("fa:fa-cogs Dedicated Test Business Logic Server:Service 2") - b7042290_1ec3_e711_8c5a_005056ad0002("fa:fa-circle [DBServer\\SharedDbInstance].[SupportDb]") - 8f102290_1ec3_e711_8c5a_005056ad0002("fa:fa-circle [DBServer\\SharedDbInstance].[DevelopmentDb]") - 0e102290_1ec3_e711_8c5a_005056ad0002("fa:fa-circle [DBServer\\SharedDbInstance].[TestDb]") - 07132290_1ec3_e711_8c5a_005056ad0002("fa:fa-circle [DBServer\\SharedDbInstance].[SharedReportingDb]") - c7072290_1ec3_e711_8c5a_005056ad0002("fa:fa-server Shared Business Logic Server") - ca122290_1ec3_e711_8c5a_005056ad0002("fa:fa-server Shared Report Server") - 68102290_1ec3_e711_8c5a_005056ad0002("fa:fa-server Dedicated Test Business Logic Server") - f4112290_1ec3_e711_8c5a_005056ad0002("fa:fa-database [DBServer\\SharedDbInstance]") - d6072290_1ec3_e711_8c5a_005056ad0002("fa:fa-server DBServer") - 71082290_1ec3_e711_8c5a_005056ad0002("fa:fa-cogs DBServer\\:MSSQLSERVER") - c0102290_1ec3_e711_8c5a_005056ad0002("fa:fa-cogs DBServer\\:SQLAgent") - 9a072290_1ec3_e711_8c5a_005056ad0002("fa:fa-cogs DBServer\\:SQLBrowser") - 1d0a2290_1ec3_e711_8c5a_005056ad0002("fa:fa-server VmHost1") - 200a2290_1ec3_e711_8c5a_005056ad0002("fa:fa-server VmHost2") - 1c0a2290_1ec3_e711_8c5a_005056ad0002("fa:fa-server VmHost3") - 9e122290_1ec3_e711_8c5a_005056ad0002-->82072290_1ec3_e711_8c5a_005056ad0002 - 9e122290_1ec3_e711_8c5a_005056ad0002-->db052290_1ec3_e711_8c5a_005056ad0002 - 9e122290_1ec3_e711_8c5a_005056ad0002-->4e112290_1ec3_e711_8c5a_005056ad0002 - 9e122290_1ec3_e711_8c5a_005056ad0002-->30122290_1ec3_e711_8c5a_005056ad0002 - 9e122290_1ec3_e711_8c5a_005056ad0002-->5e112290_1ec3_e711_8c5a_005056ad0002 - 9e122290_1ec3_e711_8c5a_005056ad0002-->c1112290_1ec3_e711_8c5a_005056ad0002 - 82072290_1ec3_e711_8c5a_005056ad0002-->b7042290_1ec3_e711_8c5a_005056ad0002 - 82072290_1ec3_e711_8c5a_005056ad0002-->8f102290_1ec3_e711_8c5a_005056ad0002 - 82072290_1ec3_e711_8c5a_005056ad0002-->0e102290_1ec3_e711_8c5a_005056ad0002 - 82072290_1ec3_e711_8c5a_005056ad0002-->c7072290_1ec3_e711_8c5a_005056ad0002 - db052290_1ec3_e711_8c5a_005056ad0002-->c7072290_1ec3_e711_8c5a_005056ad0002 - db052290_1ec3_e711_8c5a_005056ad0002-->82072290_1ec3_e711_8c5a_005056ad0002 - 4e112290_1ec3_e711_8c5a_005056ad0002-->b7042290_1ec3_e711_8c5a_005056ad0002 - 4e112290_1ec3_e711_8c5a_005056ad0002-->8f102290_1ec3_e711_8c5a_005056ad0002 - 4e112290_1ec3_e711_8c5a_005056ad0002-->0e102290_1ec3_e711_8c5a_005056ad0002 - 4e112290_1ec3_e711_8c5a_005056ad0002-->07132290_1ec3_e711_8c5a_005056ad0002 - 4e112290_1ec3_e711_8c5a_005056ad0002-->ca122290_1ec3_e711_8c5a_005056ad0002 - 30122290_1ec3_e711_8c5a_005056ad0002-->ca122290_1ec3_e711_8c5a_005056ad0002 - 30122290_1ec3_e711_8c5a_005056ad0002-->4e112290_1ec3_e711_8c5a_005056ad0002 - 5e112290_1ec3_e711_8c5a_005056ad0002-->8f102290_1ec3_e711_8c5a_005056ad0002 - 5e112290_1ec3_e711_8c5a_005056ad0002-->68102290_1ec3_e711_8c5a_005056ad0002 - c1112290_1ec3_e711_8c5a_005056ad0002-->68102290_1ec3_e711_8c5a_005056ad0002 - c1112290_1ec3_e711_8c5a_005056ad0002-->5e112290_1ec3_e711_8c5a_005056ad0002 - b7042290_1ec3_e711_8c5a_005056ad0002-->f4112290_1ec3_e711_8c5a_005056ad0002 - 8f102290_1ec3_e711_8c5a_005056ad0002-->f4112290_1ec3_e711_8c5a_005056ad0002 - 0e102290_1ec3_e711_8c5a_005056ad0002-->f4112290_1ec3_e711_8c5a_005056ad0002 - 07132290_1ec3_e711_8c5a_005056ad0002-->f4112290_1ec3_e711_8c5a_005056ad0002 - c7072290_1ec3_e711_8c5a_005056ad0002-->1d0a2290_1ec3_e711_8c5a_005056ad0002 - ca122290_1ec3_e711_8c5a_005056ad0002-->200a2290_1ec3_e711_8c5a_005056ad0002 - 68102290_1ec3_e711_8c5a_005056ad0002-->1c0a2290_1ec3_e711_8c5a_005056ad0002 - f4112290_1ec3_e711_8c5a_005056ad0002-->d6072290_1ec3_e711_8c5a_005056ad0002 - f4112290_1ec3_e711_8c5a_005056ad0002-->71082290_1ec3_e711_8c5a_005056ad0002 - f4112290_1ec3_e711_8c5a_005056ad0002-->c0102290_1ec3_e711_8c5a_005056ad0002 - f4112290_1ec3_e711_8c5a_005056ad0002-->9a072290_1ec3_e711_8c5a_005056ad0002 - d6072290_1ec3_e711_8c5a_005056ad0002-->1c0a2290_1ec3_e711_8c5a_005056ad0002 - 71082290_1ec3_e711_8c5a_005056ad0002-->d6072290_1ec3_e711_8c5a_005056ad0002 - c0102290_1ec3_e711_8c5a_005056ad0002-->d6072290_1ec3_e711_8c5a_005056ad0002 - c0102290_1ec3_e711_8c5a_005056ad0002-->71082290_1ec3_e711_8c5a_005056ad0002 - 9a072290_1ec3_e711_8c5a_005056ad0002-->d6072290_1ec3_e711_8c5a_005056ad0002 - 9a072290_1ec3_e711_8c5a_005056ad0002-->71082290_1ec3_e711_8c5a_005056ad0002 - `, - {}) - }) - - it('should render labels with numbers at the start', async () => { - await imgSnapshotTest(page, ` - graph TB;subgraph "number as labels";1;end; - `, - {}) - }) - it('should render subgraphs', async () => { - await imgSnapshotTest(page, ` - graph TB - subgraph One - a1-->a2 - end - `, - {}) - }) - - it('should render subgraphs with a title startign with a digit', async () => { - await imgSnapshotTest(page, ` - graph TB - subgraph 2Two - a1-->a2 - end - `, - {}) - }) - - it('should render styled subgraphs', async () => { - await imgSnapshotTest(page, ` - graph TB - A - B - subgraph foo[Foo SubGraph] - C - D - end - subgraph bar[Bar SubGraph] - E - F - end - G - - A-->B - B-->C - C-->D - B-->D - D-->E - E-->A - E-->F - F-->D - F-->G - B-->G - G-->D - - style foo fill:#F99,stroke-width:2px,stroke:#F0F - style bar fill:#999,stroke-width:10px,stroke:#0F0 - `, - {}) - }) - - it('should render a flowchart with ling sames and class definitoins', async () => { - await imgSnapshotTest(page, `graph LR - sid-B3655226-6C29-4D00-B685-3D5C734DC7E1[" - - 提交申请 - 熊大 - "]; - class sid-B3655226-6C29-4D00-B685-3D5C734DC7E1 node-executed; - sid-4DA958A0-26D9-4D47-93A7-70F39FD7D51A[" - 负责人审批 - 强子 - "]; - class sid-4DA958A0-26D9-4D47-93A7-70F39FD7D51A node-executed; - sid-E27C0367-E6D6-497F-9736-3CDC21FDE221[" - DBA审批 - 强子 - "]; - class sid-E27C0367-E6D6-497F-9736-3CDC21FDE221 node-executed; - sid-BED98281-9585-4D1B-934E-BD1AC6AC0EFD[" - SA审批 - 阿美 - "]; - class sid-BED98281-9585-4D1B-934E-BD1AC6AC0EFD node-executed; - sid-7CE72B24-E0C1-46D3-8132-8BA66BE05AA7[" - 主管审批 - 光头强 - "]; - class sid-7CE72B24-E0C1-46D3-8132-8BA66BE05AA7 node-executed; - sid-A1B3CD96-7697-4D7C-BEAA-73D187B1BE89[" - DBA确认 - 强子 - "]; - class sid-A1B3CD96-7697-4D7C-BEAA-73D187B1BE89 node-executed; - sid-3E35A7FF-A2F4-4E07-9247-DBF884C81937[" - SA确认 - 阿美 - "]; - class sid-3E35A7FF-A2F4-4E07-9247-DBF884C81937 node-executed; - sid-4FC27B48-A6F9-460A-A675-021F5854FE22[" - 结束 - "]; - class sid-4FC27B48-A6F9-460A-A675-021F5854FE22 node-executed; - sid-19DD9E9F-98C1-44EE-B604-842AFEE76F1E[" - SA执行1 - 强子 - "]; - class sid-19DD9E9F-98C1-44EE-B604-842AFEE76F1E node-executed; - sid-6C2120F3-D940-4958-A067-0903DCE879C4[" - SA执行2 - 强子 - "]; - class sid-6C2120F3-D940-4958-A067-0903DCE879C4 node-executed; - sid-9180E2A0-5C4B-435F-B42F-0D152470A338[" - DBA执行1 - 强子 - "]; - class sid-9180E2A0-5C4B-435F-B42F-0D152470A338 node-executed; - sid-03A2C3AC-5337-48A5-B154-BB3FD0EC8DAD[" - DBA执行3 - 强子 - "]; - class sid-03A2C3AC-5337-48A5-B154-BB3FD0EC8DAD node-executed; - sid-D5E1F2F4-306C-47A2-BF74-F66E3D769756[" - DBA执行2 - 强子 - "]; - class sid-D5E1F2F4-306C-47A2-BF74-F66E3D769756 node-executed; - sid-8C3F2F1D-F014-4F99-B966-095DC1A2BD93[" - DBA执行4 - 强子 - "]; - class sid-8C3F2F1D-F014-4F99-B966-095DC1A2BD93 node-executed; - sid-1897B30A-9C5C-4D5B-B80B-76A038785070[" - 负责人确认 - 梁静茹 - "]; - class sid-1897B30A-9C5C-4D5B-B80B-76A038785070 node-executed; - sid-B3655226-6C29-4D00-B685-3D5C734DC7E1-->sid-7CE72B24-E0C1-46D3-8132-8BA66BE05AA7; - sid-4DA958A0-26D9-4D47-93A7-70F39FD7D51A-->sid-1897B30A-9C5C-4D5B-B80B-76A038785070; - sid-E27C0367-E6D6-497F-9736-3CDC21FDE221-->sid-A1B3CD96-7697-4D7C-BEAA-73D187B1BE89; - sid-BED98281-9585-4D1B-934E-BD1AC6AC0EFD-->sid-3E35A7FF-A2F4-4E07-9247-DBF884C81937; - sid-19DD9E9F-98C1-44EE-B604-842AFEE76F1E-->sid-6C2120F3-D940-4958-A067-0903DCE879C4; - sid-9180E2A0-5C4B-435F-B42F-0D152470A338-->sid-D5E1F2F4-306C-47A2-BF74-F66E3D769756; - sid-03A2C3AC-5337-48A5-B154-BB3FD0EC8DAD-->sid-8C3F2F1D-F014-4F99-B966-095DC1A2BD93; - sid-6C2120F3-D940-4958-A067-0903DCE879C4-->sid-4DA958A0-26D9-4D47-93A7-70F39FD7D51A; - sid-1897B30A-9C5C-4D5B-B80B-76A038785070-->sid-4FC27B48-A6F9-460A-A675-021F5854FE22; - sid-3E35A7FF-A2F4-4E07-9247-DBF884C81937-->sid-19DD9E9F-98C1-44EE-B604-842AFEE76F1E; - sid-A1B3CD96-7697-4D7C-BEAA-73D187B1BE89-->sid-9180E2A0-5C4B-435F-B42F-0D152470A338; - sid-A1B3CD96-7697-4D7C-BEAA-73D187B1BE89-->sid-03A2C3AC-5337-48A5-B154-BB3FD0EC8DAD; - sid-D5E1F2F4-306C-47A2-BF74-F66E3D769756-->sid-4DA958A0-26D9-4D47-93A7-70F39FD7D51A; - sid-8C3F2F1D-F014-4F99-B966-095DC1A2BD93-->sid-4DA958A0-26D9-4D47-93A7-70F39FD7D51A; - sid-7CE72B24-E0C1-46D3-8132-8BA66BE05AA7-->sid-BED98281-9585-4D1B-934E-BD1AC6AC0EFD; - sid-7CE72B24-E0C1-46D3-8132-8BA66BE05AA7-->sid-E27C0367-E6D6-497F-9736-3CDC21FDE221; - sid-3E35A7FF-A2F4-4E07-9247-DBF884C81937-->sid-6C2120F3-D940-4958-A067-0903DCE879C4; - sid-7CE72B24-E0C1-46D3-8132-8BA66BE05AA7-->sid-4DA958A0-26D9-4D47-93A7-70F39FD7D51A; - sid-7CE72B24-E0C1-46D3-8132-8BA66BE05AA7-->sid-4FC27B48-A6F9-460A-A675-021F5854FE22; - `, - {}) - }) - - it('should render color of styled nodes', async () => { - await imgSnapshotTest(page, ` - graph LR - foo-->bar - - classDef foo fill:lightblue,color:green,stroke:#FF9E2C,font-weight:bold - style foo fill:#F99,stroke-width:2px,stroke:#F0F - style bar fill:#999,color: #00ff00, stroke-width:10px,stroke:#0F0 - `, - { - listUrl: false, - listId: 'color styling', - logLevel: 0 - }) - }) -}) diff --git a/e2e/spec/gantt.spec.js b/e2e/spec/gantt.spec.js deleted file mode 100644 index 7ead76f21..000000000 --- a/e2e/spec/gantt.spec.js +++ /dev/null @@ -1,42 +0,0 @@ -/* eslint-env jest */ -import { imgSnapshotTest } from '../helpers/util.js' -const { toMatchImageSnapshot } = require('jest-image-snapshot') - -expect.extend({ toMatchImageSnapshot }) - -describe('Sequencediagram', () => { - it('should render a gantt chart', async () => { - await imgSnapshotTest(page, ` - gantt - dateFormat YYYY-MM-DD - axisFormat %d/%m - title Adding GANTT diagram to mermaid - excludes weekdays 2014-01-10 - - section A section - Completed task :done, des1, 2014-01-06,2014-01-08 - Active task :active, des2, 2014-01-09, 3d - Future task : des3, after des2, 5d - Future task2 : des4, after des3, 5d - - section Critical tasks - Completed task in the critical line :crit, done, 2014-01-06,24h - Implement parser and jison :crit, done, after des1, 2d - Create tests for parser :crit, active, 3d - Future task in critical line :crit, 5d - Create tests for renderer :2d - Add to mermaid :1d - - section Documentation - Describe gantt syntax :active, a1, after des1, 3d - Add gantt diagram to demo page :after a1 , 20h - Add another diagram to demo page :doc1, after a1 , 48h - - section Last section - Describe gantt syntax :after doc1, 3d - Add gantt diagram to demo page : 20h - Add another diagram to demo page : 48h - `, - {}) - }) -}) diff --git a/e2e/spec/gitGraph.spec.js b/e2e/spec/gitGraph.spec.js deleted file mode 100644 index 43886134e..000000000 --- a/e2e/spec/gitGraph.spec.js +++ /dev/null @@ -1,29 +0,0 @@ -/* eslint-env jest */ -import { imgSnapshotTest } from '../helpers/util.js' -const { toMatchImageSnapshot } = require('jest-image-snapshot') - -expect.extend({ toMatchImageSnapshot }) - -describe('Sequencediagram', () => { - it('should render a simple git graph', async () => { - await imgSnapshotTest(page, ` - gitGraph: - options - { - "nodeSpacing": 150, - "nodeRadius": 10 - } - end - commit - branch newbranch - checkout newbranch - commit - commit - checkout master - commit - commit - merge newbranch - `, - {}) - }) -}) diff --git a/e2e/spec/info.spec.js b/e2e/spec/info.spec.js deleted file mode 100644 index 914a952da..000000000 --- a/e2e/spec/info.spec.js +++ /dev/null @@ -1,15 +0,0 @@ -/* eslint-env jest */ -import { imgSnapshotTest } from '../helpers/util.js' -const { toMatchImageSnapshot } = require('jest-image-snapshot') - -expect.extend({ toMatchImageSnapshot }) - -describe('Sequencediagram', () => { - it('should render a simple info diagrams', async () => { - await imgSnapshotTest(page, ` - info - showInfo - `, - {}) - }) -}) diff --git a/e2e/spec/pie.spec.js b/e2e/spec/pie.spec.js deleted file mode 100644 index bebeb96bf..000000000 --- a/e2e/spec/pie.spec.js +++ /dev/null @@ -1,16 +0,0 @@ -/* eslint-env jest */ -import { imgSnapshotTest } from '../helpers/util.js' -const { toMatchImageSnapshot } = require('jest-image-snapshot') - -expect.extend({ toMatchImageSnapshot }) - -describe('Pie Chart simple', () => { - it('should render a simple Pie chart diagram', async () => { - await imgSnapshotTest(page, ` - pie - "Ash" : 40 - "Bat" : 50 - `, - {}) - }) -}) diff --git a/e2e/spec/sequencediagram.spec.js b/e2e/spec/sequencediagram.spec.js deleted file mode 100644 index 73ae8e728..000000000 --- a/e2e/spec/sequencediagram.spec.js +++ /dev/null @@ -1,121 +0,0 @@ -/* eslint-env jest */ -import { imgSnapshotTest } from '../helpers/util.js' -const { toMatchImageSnapshot } = require('jest-image-snapshot') - -expect.extend({ toMatchImageSnapshot }) - -describe('Sequencediagram', () => { - it('should render a simple sequence diagrams', async () => { - await imgSnapshotTest(page, ` - sequenceDiagram - participant Alice - participant Bob - participant John as John
Second Line - Alice ->> Bob: Hello Bob, how are you? - Bob-->>John: How about you John? - Bob--x Alice: I am good thanks! - Bob-x John: I am good thanks! - Note right of John: Bob thinks a long
long time, so long
that the text does
not fit on a row. - Bob-->Alice: Checking with John... - alt either this - Alice->>John: Yes - else or this - Alice->>John: No - else or this will happen - Alice->John: Maybe - end - par this happens in parallel - Alice -->> Bob: Parallel message 1 - and - Alice -->> John: Parallel message 2 - end - `, - {}) - }) - describe('background rects', async () => { - it('should render a single and nested rects', async () => { - await imgSnapshotTest(page, ` - sequenceDiagram - participant A - participant B - participant C - participant D - participant E - participant G - - A ->>+ B: Task 1 - rect rgb(178, 102, 255) - B ->>+ C: Task 2 - C -->>- B: Return - end - - A ->> D: Task 3 - rect rgb(0, 128, 255) - D ->>+ E: Task 4 - rect rgb(0, 204, 0) - E ->>+ G: Task 5 - G -->>- E: Return - end - E ->> E: Task 6 - end - D -->> A: Complete - `, {}) - }) - it('should render rect around and inside loops', async () => { - await imgSnapshotTest(page, ` - sequenceDiagram - A ->> B: 1 - rect rgb(204, 0, 102) - loop check C - C ->> C: Every 10 seconds - end - end - A ->> B: 2 - loop check D - C ->> D: 3 - rect rgb(153, 153, 255) - D -->> D: 5 - D --> C: 4 - end - end - `, {}) - }) - it('should render rect around and inside alts', async () => { - await imgSnapshotTest(page, ` - sequenceDiagram - A ->> B: 1 - rect rgb(204, 0, 102) - alt yes - C ->> C: 1 - else no - rect rgb(0, 204, 204) - C ->> C: 0 - end - end - end - B ->> A: Return - `, {}) - }) - it('should render rect around and inside opts', async () => { - await imgSnapshotTest(page, ` - sequenceDiagram - A ->> B: 1 - rect rgb(204, 0, 102) - opt maybe - C -->> D: Do something - rect rgb(0, 204, 204) - C ->> C: 0 - end - end - end - - opt possibly - rect rgb(0, 204, 204) - C ->> C: 0 - end - end - B ->> A: Return - `, {}) - }) - }) -}) diff --git a/e2e/spec/xss.spec.js b/e2e/spec/xss.spec.js deleted file mode 100644 index a1fec028a..000000000 --- a/e2e/spec/xss.spec.js +++ /dev/null @@ -1,15 +0,0 @@ -/* eslint-env jest */ -import { imgSnapshotTest } from '../helpers/util.js' -const { toMatchImageSnapshot } = require('jest-image-snapshot') - -expect.extend({ toMatchImageSnapshot }) - -/* eslint-disable */ -describe('XSS', () => { - it('should handle xss in tags', async () => { - // const str = 'graph LR;\nB-->D();' - const str = 'eyJjb2RlIjoiXG5ncmFwaCBMUlxuICAgICAgQi0tPkQoPGltZyBvbmVycm9yPWxvY2F0aW9uPWBqYXZhc2NyaXB0XFx1MDAzYXhzc0F0dGFja1xcdTAwMjhkb2N1bWVudC5kb21haW5cXHUwMDI5YCBzcmM9eD4pOyIsIm1lcm1haWQiOnsidGhlbWUiOiJkZWZhdWx0In19'; - await imgSnapshotTest(page, str, - {}, true) - }) -}) diff --git a/jest.config.js b/jest.config.js index fcfcccb81..c717dcd17 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require('path'); module.exports = { transform: { @@ -10,4 +10,4 @@ module.exports = { '\\.(css|scss)$': 'identity-obj-proxy' }, moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx', 'node', 'jison'] -} +}; diff --git a/package.json b/package.json index 5cd538f71..8fb6edaab 100644 --- a/package.json +++ b/package.json @@ -50,10 +50,6 @@ "d3": "^5.7.0", "dagre-d3-renderer": "^0.5.8", "dagre-layout": "^0.8.8", - "documentation": "^12.0.1", - "eslint": "^6.3.0", - "eslint-config-prettier": "^6.3.0", - "eslint-plugin-prettier": "^3.1.0", "graphlibrary": "^2.2.0", "he": "^1.2.0", "lodash": "^4.17.11", @@ -63,6 +59,10 @@ "scope-css": "^1.2.1" }, "devDependencies": { + "documentation": "^12.0.1", + "eslint": "^6.3.0", + "eslint-config-prettier": "^6.3.0", + "eslint-plugin-prettier": "^3.1.0", "@babel/core": "^7.2.2", "@babel/preset-env": "^7.2.0", "@babel/register": "^7.0.0", @@ -85,7 +85,6 @@ "node-sass": "^4.11.0", "puppeteer": "^1.17.0", "sass-loader": "^7.1.0", - "standard": "^12.0.1", "start-server-and-test": "^1.10.0", "webpack": "^4.27.1", "webpack-cli": "^3.1.2", diff --git a/webpack.config.e2e.js b/webpack.config.e2e.js index 7db98fe03..d99cf0884 100644 --- a/webpack.config.e2e.js +++ b/webpack.config.e2e.js @@ -1,4 +1,4 @@ -const path = require('path') +const path = require('path'); const jsRule = { test: /\.js$/, @@ -6,7 +6,7 @@ const jsRule = { use: { loader: 'babel-loader' } -} +}; const jisonRule = { test: /\.jison$/, @@ -16,30 +16,26 @@ const jisonRule = { 'token-stack': true } } -} +}; const amdRule = { parser: { amd: false // https://github.com/lodash/lodash/issues/3052 } -} +}; const scssRule = { // load scss to string test: /\.scss$/, - use: [ - { loader: 'css-to-string-loader' }, - { loader: 'css-loader' }, - { loader: 'sass-loader' } - ] -} + use: [{ loader: 'css-to-string-loader' }, { loader: 'css-loader' }, { loader: 'sass-loader' }] +}; module.exports = { mode: 'development', target: 'web', entry: { mermaid: './src/mermaid.js', - e2e: './e2e/platform/viewer.js', - 'bundle-test': './e2e/platform/bundle-test.js' + e2e: './cypress/platform/viewer.js', + 'bundle-test': './cypress/platform/bundle-test.js' }, resolve: { extensions: ['.wasm', '.mjs', '.js', '.json', '.jison'] @@ -55,10 +51,7 @@ module.exports = { libraryExport: 'default' }, devServer: { - contentBase: [ - path.join(__dirname, 'e2e', 'platform'), - path.join(__dirname, 'dist') - ], + contentBase: [path.join(__dirname, 'cypress', 'platform'), path.join(__dirname, 'dist')], compress: true, port: 9000 }, @@ -69,4 +62,4 @@ module.exports = { mermaid: 'mermaid' }, devtool: 'source-map' -} +}; diff --git a/yarn.lock b/yarn.lock index a1adc84a1..860b5949b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1524,10 +1524,6 @@ acorn-globals@^4.1.0: acorn "^6.0.1" acorn-walk "^6.0.1" -acorn-jsx@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e" - acorn-jsx@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f" @@ -1541,7 +1537,7 @@ acorn@^5.0.0, acorn@^5.2.1, acorn@^5.5.3, acorn@^5.6.2: version "5.7.3" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" -acorn@^6.0.1, acorn@^6.0.2: +acorn@^6.0.1: version "6.0.4" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.4.tgz#77377e7353b72ec5104550aa2d2097a2fd40b754" @@ -1560,23 +1556,10 @@ ajv-errors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" -ajv-keywords@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" - ajv-keywords@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be" -ajv@^6.0.1, ajv@^6.5.0, ajv@^6.5.5: - version "6.6.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - ajv@^6.1.0: version "6.3.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.3.0.tgz#1650a41114ef00574cac10b8032d8f4c14812da7" @@ -1595,6 +1578,15 @@ ajv@^6.10.0, ajv@^6.10.2: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.5.5: + version "6.6.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d" + dependencies: + fast-deep-equal "^2.0.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -1728,13 +1720,6 @@ array-flatten@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" -array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" - array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -2384,22 +2369,12 @@ caller-callsite@^2.0.0: dependencies: callsites "^2.0.0" -caller-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" - dependencies: - callsites "^0.2.0" - caller-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" dependencies: caller-callsite "^2.0.0" -callsites@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" - callsites@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" @@ -2526,10 +2501,6 @@ character-reference-invalid@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz#1647f4f726638d3ea4a750cf5d1975c1c7919a85" -chardet@^0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" - chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -2597,10 +2568,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" -circular-json@^0.3.1: - version "0.3.3" - resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66" - cjson@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/cjson/-/cjson-0.3.0.tgz#e6439b90703d312ff6e2224097bea92ce3d02a14" @@ -2874,10 +2841,6 @@ constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" -contains-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" - content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -3409,10 +3372,6 @@ de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" -debug-log@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" - debug@2.6.9, debug@^2.1.2, debug@^2.3.3, debug@^2.6.6, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -3517,17 +3476,6 @@ defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" -deglob@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/deglob/-/deglob-2.1.1.tgz#d268e168727799862e8eac07042e165957c1f3be" - dependencies: - find-root "^1.0.0" - glob "^7.0.5" - ignore "^3.0.9" - pkg-config "^1.1.0" - run-parallel "^1.1.2" - uniq "^1.0.1" - del@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" @@ -3646,19 +3594,6 @@ doctrine-temporary-fork@2.1.0: dependencies: esutils "^2.0.2" -doctrine@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" - dependencies: - esutils "^2.0.2" - isarray "^1.0.0" - -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - dependencies: - esutils "^2.0.2" - doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -3873,16 +3808,6 @@ es-abstract@^1.5.1: is-callable "^1.1.3" is-regex "^1.0.4" -es-abstract@^1.7.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165" - dependencies: - es-to-primitive "^1.1.1" - function-bind "^1.1.1" - has "^1.0.1" - is-callable "^1.1.3" - is-regex "^1.0.4" - es-to-primitive@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" @@ -3945,61 +3870,6 @@ eslint-config-prettier@^6.3.0: dependencies: get-stdin "^6.0.0" -eslint-config-standard-jsx@6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-6.0.2.tgz#90c9aa16ac2c4f8970c13fc7efc608bacd02da70" - -eslint-config-standard@12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9" - -eslint-import-resolver-node@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - dependencies: - debug "^2.6.9" - resolve "^1.5.0" - -eslint-module-utils@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.2.0.tgz#b270362cd88b1a48ad308976ce7fa54e98411746" - dependencies: - debug "^2.6.8" - pkg-dir "^1.0.0" - -eslint-plugin-es@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz#475f65bb20c993fc10e8c8fe77d1d60068072da6" - dependencies: - eslint-utils "^1.3.0" - regexpp "^2.0.1" - -eslint-plugin-import@~2.14.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8" - dependencies: - contains-path "^0.1.0" - debug "^2.6.8" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.1" - eslint-module-utils "^2.2.0" - has "^1.0.1" - lodash "^4.17.4" - minimatch "^3.0.3" - read-pkg-up "^2.0.0" - resolve "^1.6.0" - -eslint-plugin-node@~7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-7.0.1.tgz#a6e054e50199b2edd85518b89b4e7b323c9f36db" - dependencies: - eslint-plugin-es "^1.3.1" - eslint-utils "^1.3.1" - ignore "^4.0.2" - minimatch "^3.0.4" - resolve "^1.8.1" - semver "^5.5.0" - eslint-plugin-prettier@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d" @@ -4007,24 +3877,6 @@ eslint-plugin-prettier@^3.1.0: dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-promise@~4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.0.1.tgz#2d074b653f35a23d1ba89d8e976a985117d1c6a2" - -eslint-plugin-react@~7.11.1: - version "7.11.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.11.1.tgz#c01a7af6f17519457d6116aa94fc6d2ccad5443c" - dependencies: - array-includes "^3.0.3" - doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.0.1" - prop-types "^15.6.2" - -eslint-plugin-standard@~4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz#f845b45109c99cd90e77796940a344546c8f6b5c" - eslint-scope@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172" @@ -4040,7 +3892,7 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.0, eslint-utils@^1.3.1, eslint-utils@^1.4.2: +eslint-utils@^1.4.2: version "1.4.2" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== @@ -4095,57 +3947,6 @@ eslint@^6.3.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -eslint@~5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.4.0.tgz#d068ec03006bb9e06b429dc85f7e46c1b69fac62" - dependencies: - ajv "^6.5.0" - babel-code-frame "^6.26.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" - debug "^3.1.0" - doctrine "^2.1.0" - eslint-scope "^4.0.0" - eslint-utils "^1.3.1" - eslint-visitor-keys "^1.0.0" - espree "^4.0.0" - esquery "^1.0.1" - esutils "^2.0.2" - file-entry-cache "^2.0.0" - functional-red-black-tree "^1.0.1" - glob "^7.1.2" - globals "^11.7.0" - ignore "^4.0.2" - imurmurhash "^0.1.4" - inquirer "^5.2.0" - is-resolvable "^1.1.0" - js-yaml "^3.11.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.5" - minimatch "^3.0.4" - mkdirp "^0.5.1" - natural-compare "^1.4.0" - optionator "^0.8.2" - path-is-inside "^1.0.2" - pluralize "^7.0.0" - progress "^2.0.0" - regexpp "^2.0.0" - require-uncached "^1.0.3" - semver "^5.5.0" - strip-ansi "^4.0.0" - strip-json-comments "^2.0.1" - table "^4.0.3" - text-table "^0.2.0" - -espree@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz#728d5451e0fd156c04384a7ad89ed51ff54eb25f" - dependencies: - acorn "^6.0.2" - acorn-jsx "^5.0.0" - eslint-visitor-keys "^1.0.0" - espree@^6.1.1: version "6.1.1" resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de" @@ -4398,14 +4199,6 @@ extend@^3.0.0, extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" -external-editor@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" - dependencies: - chardet "^0.4.0" - iconv-lite "^0.4.17" - tmp "^0.0.33" - external-editor@^3.0.3: version "3.1.0" resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" @@ -4544,13 +4337,6 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" -file-entry-cache@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361" - dependencies: - flat-cache "^1.2.1" - object-assign "^4.0.1" - file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -4643,10 +4429,6 @@ find-process@^1.4.1: commander "^2.11.0" debug "^2.6.8" -find-root@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" - find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -4654,7 +4436,7 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.0.0, find-up@^2.1.0: +find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" dependencies: @@ -4666,15 +4448,6 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -flat-cache@^1.2.1: - version "1.3.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f" - dependencies: - circular-json "^0.3.1" - graceful-fs "^4.1.2" - rimraf "~2.6.2" - write "^0.2.1" - flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" @@ -5000,7 +4773,7 @@ glob@7.1.3, glob@^7.0.0, glob@~7.1.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2: +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: @@ -5201,12 +4974,6 @@ has@^1.0.1: dependencies: function-bind "^1.0.2" -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - dependencies: - function-bind "^1.1.1" - hash-base@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" @@ -5412,7 +5179,7 @@ hyperlinker@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e" -iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" dependencies: @@ -5448,11 +5215,7 @@ ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" -ignore@^3.0.9: - version "3.3.10" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" - -ignore@^4.0.2, ignore@^4.0.6: +ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== @@ -5539,24 +5302,6 @@ ini@~1.3.0: version "1.3.4" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" -inquirer@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726" - dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^2.1.0" - figures "^2.0.0" - lodash "^4.3.0" - mute-stream "0.0.7" - run-async "^2.2.0" - rxjs "^5.5.2" - string-width "^2.1.0" - strip-ansi "^4.0.0" - through "^2.3.6" - inquirer@^6.4.1: version "6.5.2" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" @@ -5908,10 +5653,6 @@ is-relative@^1.0.0: dependencies: is-unc-path "^1.0.0" -is-resolvable@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" - is-ssh@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3" @@ -6425,7 +6166,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: +js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -6565,12 +6306,6 @@ jssha@^2.1.0: version "2.3.1" resolved "https://registry.yarnpkg.com/jssha/-/jssha-2.3.1.tgz#147b2125369035ca4b2f7d210dc539f009b3de9a" -jsx-ast-utils@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f" - dependencies: - array-includes "^3.0.3" - killable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -6735,15 +6470,6 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" @@ -6837,7 +6563,7 @@ lodash@4.17.11: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" -lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@~4.17.10: version "4.17.13" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.13.tgz#0bdc3a6adc873d2f4e0c4bac285df91b64fc7b93" @@ -6883,12 +6609,6 @@ loose-envify@^1.0.0: dependencies: js-tokens "^3.0.0" -loose-envify@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" @@ -7638,7 +7358,7 @@ oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" -object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -8043,12 +7763,6 @@ path-type@^1.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - dependencies: - pify "^2.0.0" - path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -8135,27 +7849,6 @@ pixelmatch@^4.0.2: dependencies: pngjs "^3.0.0" -pkg-conf@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.1.0.tgz#2126514ca6f2abfebd168596df18ba57867f0058" - dependencies: - find-up "^2.0.0" - load-json-file "^4.0.0" - -pkg-config@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pkg-config/-/pkg-config-1.1.1.tgz#557ef22d73da3c8837107766c52eadabde298fe4" - dependencies: - debug-log "^1.0.0" - find-root "^1.0.0" - xtend "^4.0.1" - -pkg-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" - dependencies: - find-up "^1.0.0" - pkg-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -8174,10 +7867,6 @@ please-upgrade-node@^3.1.1: dependencies: semver-compare "^1.0.0" -pluralize@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" - pn@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" @@ -8307,13 +7996,6 @@ prompts@^2.0.4: kleur "^3.0.2" sisteransi "^1.0.0" -prop-types@^15.6.2: - version "15.6.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" - dependencies: - loose-envify "^1.3.1" - object-assign "^4.1.1" - property-information@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz#f0e66e07cbd6fed31d96844d958d153ad3eb486e" @@ -8519,13 +8201,6 @@ read-pkg-up@^1.0.1: find-up "^1.0.0" read-pkg "^1.0.0" -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - read-pkg-up@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978" @@ -8541,14 +8216,6 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - read-pkg@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" @@ -8726,7 +8393,7 @@ regexp-tree@^0.1.6: version "0.1.11" resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz#c9c7f00fcf722e0a56c7390983a7a63dd6c272f3" -regexpp@^2.0.0, regexpp@^2.0.1: +regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -8972,13 +8639,6 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" -require-uncached@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" - dependencies: - caller-path "^0.1.0" - resolve-from "^1.0.0" - requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -8996,10 +8656,6 @@ resolve-dir@^0.1.0: expand-tilde "^1.2.2" global-modules "^0.2.3" -resolve-from@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" - resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" @@ -9029,7 +8685,7 @@ resolve@^1.1.3: dependencies: path-parse "^1.0.6" -resolve@^1.3.2, resolve@^1.5.0, resolve@^1.6.0, resolve@^1.8.1: +resolve@^1.3.2, resolve@^1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" dependencies: @@ -9061,7 +8717,7 @@ reusify@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" -rimraf@2, rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@~2.6.2: +rimraf@2, rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" dependencies: @@ -9088,7 +8744,7 @@ run-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" -run-parallel@^1.1.2, run-parallel@^1.1.9: +run-parallel@^1.1.9: version "1.1.9" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" @@ -9106,7 +8762,7 @@ rx@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -rxjs@^5.0.0-beta.11, rxjs@^5.5.2: +rxjs@^5.0.0-beta.11: version "5.5.12" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc" dependencies: @@ -9410,12 +9066,6 @@ slice-ansi@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" -slice-ansi@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" - dependencies: - is-fullwidth-code-point "^2.0.0" - slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" @@ -9634,29 +9284,6 @@ stack-utils@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" -standard-engine@~9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-9.0.0.tgz#d3a3d74c4c1b91f51a1e66362465261ca7610316" - dependencies: - deglob "^2.1.0" - get-stdin "^6.0.0" - minimist "^1.1.0" - pkg-conf "^2.0.0" - -standard@^12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/standard/-/standard-12.0.1.tgz#0fc5a8aa6c34c546c5562aae644242b24dae2e61" - dependencies: - eslint "~5.4.0" - eslint-config-standard "12.0.0" - eslint-config-standard-jsx "6.0.2" - eslint-plugin-import "~2.14.0" - eslint-plugin-node "~7.0.1" - eslint-plugin-promise "~4.0.0" - eslint-plugin-react "~7.11.1" - eslint-plugin-standard "~4.0.0" - standard-engine "~9.0.0" - start-server-and-test@^1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.10.0.tgz#a7cd88932a52b42bc9de184430a498338e426c0b" @@ -9928,17 +9555,6 @@ symbol-tree@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" -table@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc" - dependencies: - ajv "^6.0.1" - ajv-keywords "^3.0.0" - chalk "^2.1.0" - lodash "^4.17.4" - slice-ansi "1.0.0" - string-width "^2.1.1" - table@^5.2.3: version "5.4.6" resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" @@ -10327,10 +9943,6 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^0.4.3" -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - unique-filename@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" @@ -10940,12 +10552,6 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -write@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" - dependencies: - mkdirp "^0.5.1" - ws@^5.2.0: version "5.2.2" resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"