Skip to content

Commit

Permalink
Merge pull request #651 from mermaid-js/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
sidharthv96 committed Feb 11, 2022
2 parents cf2e6f4 + a49e8e9 commit 278982c
Show file tree
Hide file tree
Showing 5 changed files with 260 additions and 250 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-monaco-editor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Update Monaco-editor
on:
workflow_dispatch:
pull_request:
push:
branches:
- 'dependabot/npm_and_yarn/develop/monaco-editor-**'

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.4.0 as mermaid-live-editor-builder
FROM node:17.5.0 as mermaid-live-editor-builder
COPY --chown=node:node . /home
WORKDIR /home
RUN yarn install
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
},
"devDependencies": {
"@cypress/snapshot": "^2.1.7",
"@sveltejs/adapter-static": "1.0.0-next.26",
"@sveltejs/adapter-static": "1.0.0-next.28",
"@sveltejs/kit": "1.0.0-next.260",
"@types/mermaid": "^8.2.7",
"@types/pako": "^1.0.3",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"autoprefixer": "^10.4.2",
"chai": "^4.3.6",
"cssnano": "^5.0.16",
"cssnano": "^5.0.17",
"cypress": "9.4.1",
"cypress-localstorage-commands": "^1.6.1",
"eslint": "^7.32.0",
Expand All @@ -39,25 +39,25 @@
"mocha": "^9.2.0",
"node-html-parser": "^5.2.0",
"postcss": "^8.4.6",
"postcss-load-config": "^3.1.1",
"postcss-load-config": "^3.1.3",
"prettier": "~2.5.1",
"prettier-plugin-svelte": "^2.6.0",
"svelte": "^3.46.4",
"svelte-preprocess": "^4.10.2",
"tailwindcss": "^3.0.18",
"svelte-preprocess": "^4.10.3",
"tailwindcss": "^3.0.21",
"tslib": "^2.3.1",
"typescript": "^4.5.5"
},
"type": "module",
"dependencies": {
"@analytics/google-analytics": "^0.5.3",
"@macfja/svelte-persistent-store": "^1.2.0",
"analytics": "^0.7.21",
"analytics": "^0.8.0",
"daisyui": "1.25.4",
"js-base64": "^3.7.2",
"mermaid": "8.13.10",
"mermaid": "8.14.0",
"moment": "^2.29.1",
"monaco-editor": "^0.32.0",
"monaco-editor": "^0.32.1",
"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.0/min/vs/editor/editor.main.min.css"
href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/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.0/min/vs' }
paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs' }
};
</script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.0/min/vs/loader.min.js"
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/loader.min.js"
crossorigin="anonymous"
referrerpolicy="no-referrer"></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.0/min/vs/editor/editor.main.nls.min.js"
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/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.0/min/vs/editor/editor.main.js"
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.32.1/min/vs/editor/editor.main.js"
crossorigin="anonymous"
referrerpolicy="no-referrer"></script>

Expand Down
Loading

0 comments on commit 278982c

Please sign in to comment.