Skip to content

Commit 09c3fbb

Browse files
authored
Merge pull request mermaid-js#186 from mermaid-js/develop
Develop
2 parents b431571 + dd66ed0 commit 09c3fbb

File tree

4 files changed

+364
-420
lines changed

4 files changed

+364
-420
lines changed

.github/workflows/cypress.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Cypress Tests
22

33
on:
4-
push:
54
pull_request:
65
branches:
76
- master
7+
- develop
88

99
jobs:
1010
cypress-run:
@@ -35,7 +35,7 @@ jobs:
3535
start: yarn preview
3636
wait-on: 'http://localhost:3000'
3737
wait-on-timeout: 120
38-
# record: true
38+
record: true
3939
headless: true
4040
env:
4141
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# Stop : press ctrl + c
77
# or
88
# docker stop mermaid-live-editor
9-
10-
FROM node:14.16.0-alpine3.13 as mermaid-live-editor-builder
9+
# Can go back to alpine image once https://github.com/bmatcuk/eslint-plugin-postcss-modules/issues/19 is fixed.
10+
FROM node:14.16.0 as mermaid-live-editor-builder
1111
COPY --chown=node:node . /home
1212
WORKDIR /home
1313
RUN yarn install

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,40 @@
1313
},
1414
"devDependencies": {
1515
"@cypress/snapshot": "^2.1.7",
16-
"@sveltejs/adapter-static": "^1.0.0-next.11",
16+
"@sveltejs/adapter-static": "1.0.0-next.11",
1717
"@sveltejs/kit": "^1.0.0-next.109",
18-
"@types/mermaid": "^8.2.5",
19-
"@typescript-eslint/eslint-plugin": "^4.19.0",
20-
"@typescript-eslint/parser": "^4.19.0",
21-
"autoprefixer": "^10.2.5",
18+
"@types/mermaid": "^8.2.6",
19+
"@typescript-eslint/eslint-plugin": "^4.26.0",
20+
"@typescript-eslint/parser": "^4.26.0",
21+
"autoprefixer": "^10.2.6",
2222
"chai": "^4.3.4",
23-
"cssnano": "^5.0.1",
24-
"cypress": "^7.3.0",
25-
"cypress-localstorage-commands": "^1.4.4",
23+
"cssnano": "^5.0.5",
24+
"cypress": "^7.4.0",
25+
"cypress-localstorage-commands": "^1.4.5",
2626
"eslint": "^7.27.0",
2727
"eslint-config-prettier": "^8.1.0",
2828
"eslint-plugin-cypress": "^2.11.3",
29-
"eslint-plugin-mocha": "^8.1.0",
29+
"eslint-plugin-mocha": "^9.0.0",
3030
"eslint-plugin-postcss-modules": "^1.2.1",
3131
"eslint-plugin-svelte3": "^3.2.0",
32-
"eslint-plugin-tailwindcss": "^1.8.0",
32+
"eslint-plugin-tailwindcss": "^1.9.1",
3333
"husky": "^6.0.0",
3434
"lint-staged": "^11.0.0",
3535
"mocha": "^8.4.0",
36-
"postcss": "^8.2.10",
36+
"postcss": "^8.3.0",
3737
"postcss-load-config": "^3.0.1",
3838
"prettier": "~2.3.0",
3939
"prettier-plugin-svelte": "^2.3.0",
4040
"svelte": "^3.34.0",
4141
"svelte-preprocess": "^4.7.1",
42-
"tailwindcss": "^2.1.1",
42+
"tailwindcss": "^2.1.4",
4343
"tslib": "^2.0.0",
44-
"typescript": "^4.0.0"
44+
"typescript": "^4.3.2"
4545
},
4646
"type": "module",
4747
"dependencies": {
48-
"@analytics/google-analytics": "^0.5.2",
49-
"@macfja/svelte-persistent-store": "^1.1.0",
48+
"@analytics/google-analytics": "^0.5.3",
49+
"@macfja/svelte-persistent-store": "^1.1.1",
5050
"analytics": "^0.7.5",
5151
"js-base64": "^3.6.1",
5252
"mermaid": "^8.10.1",

0 commit comments

Comments
 (0)