Skip to content

Commit

Permalink
Merge pull request mermaid-js#712 from mermaid-js/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
sidharthv96 authored Mar 22, 2022
2 parents d8eee74 + ac22e26 commit d5f9e3d
Show file tree
Hide file tree
Showing 6 changed files with 218 additions and 203 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-browserlist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
- uses: actions/checkout@v3
- run: npx browserslist@latest --update-db
- name: Commit changes
uses: EndBug/add-and-commit@v8
uses: EndBug/add-and-commit@v9
with:
author_name: ${{ github.actor }}
author_email: ${{ github.actor }}@users.noreply.github.com
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-monaco-editor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- run: ./bin/update-monaco
- name: Commit changes
uses: EndBug/add-and-commit@v8
uses: EndBug/add-and-commit@v9
with:
author_name: ${{ github.actor }}
author_email: ${{ github.actor }}@users.noreply.github.com
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Stop : press ctrl + c
# or
# docker stop mermaid-live-editor
FROM node:17.6.0 as mermaid-live-editor-builder
FROM node:17.7.1 as mermaid-live-editor-builder
COPY --chown=node:node . /home
WORKDIR /home
RUN yarn install
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
"devDependencies": {
"@cypress/snapshot": "^2.1.7",
"@sveltejs/adapter-static": "1.0.0-next.29",
"@sveltejs/kit": "1.0.0-next.295",
"@types/mermaid": "^8.2.8",
"@sveltejs/kit": "1.0.0-next.301",
"@types/mermaid": "^8.2.9",
"@types/pako": "^1.0.3",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"autoprefixer": "^10.4.2",
"autoprefixer": "^10.4.4",
"chai": "^4.3.6",
"cssnano": "^5.1.2",
"cypress": "9.5.1",
"cssnano": "^5.1.5",
"cypress": "9.5.2",
"cypress-localstorage-commands": "^1.7.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.5.0",
Expand All @@ -35,12 +35,12 @@
"eslint-plugin-svelte3": "^3.4.1",
"eslint-plugin-tailwindcss": "^3.5.0",
"husky": "^7.0.4",
"lint-staged": "^12.3.5",
"mocha": "^9.2.1",
"node-html-parser": "^5.2.0",
"postcss": "^8.4.8",
"lint-staged": "^12.3.7",
"mocha": "^9.2.2",
"node-html-parser": "^5.3.3",
"postcss": "^8.4.12",
"postcss-load-config": "^3.1.3",
"prettier": "~2.5.1",
"prettier": "~2.6.0",
"prettier-plugin-svelte": "^2.6.0",
"svelte": "^3.46.4",
"svelte-preprocess": "^4.10.4",
Expand All @@ -52,12 +52,12 @@
"dependencies": {
"@analytics/google-analytics": "^0.5.3",
"@macfja/svelte-persistent-store": "^1.3.0",
"analytics": "^0.8.0",
"daisyui": "2.6.4",
"analytics": "^0.8.1",
"daisyui": "2.11.0",
"js-base64": "^3.7.2",
"mermaid": "8.14.0",
"moment": "^2.29.1",
"monaco-editor": "^0.32.1",
"monaco-editor": "^0.33.0",
"monaco-mermaid": "^1.0.3",
"pako": "2.0.4",
"random-word-slugs": "^0.1.6"
Expand Down
10 changes: 5 additions & 5 deletions src/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css" />
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/editor/editor.main.min.css"
href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs/editor/editor.main.min.css"
crossorigin="anonymous"
referrerpolicy="no-referrer" />
<script>
var require = {
paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs' }
paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs' }
};
</script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/loader.min.js"
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs/loader.min.js"
crossorigin="anonymous"
referrerpolicy="no-referrer"></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/editor/editor.main.nls.min.js"
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs/editor/editor.main.nls.min.js"
crossorigin="anonymous"
referrerpolicy="no-referrer"></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/editor/editor.main.js"
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.33.0/min/vs/editor/editor.main.js"
crossorigin="anonymous"
referrerpolicy="no-referrer"></script>

Expand Down
Loading

0 comments on commit d5f9e3d

Please sign in to comment.