-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:luogu-dev/markdown-palettes
# Conflicts: # package.json # fix defaultContentParser
- Loading branch information
Showing
20 changed files
with
148 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,54 +1,56 @@ | ||
{ | ||
"name": "markdown-palettes", | ||
"description": "Markdown*Palettes: Markdown editor for the modern web.", | ||
"version": "0.4.10", | ||
"author": "Luogu Dev Team", | ||
"license": "MIT", | ||
"main": "dist/MarkdownPalettes.common.js", | ||
"style": "dist/MarkdownPalettes.css", | ||
"scripts": { | ||
"dev": "vue-cli-service serve --open", | ||
"prod-test": "vue-cli-service serve --open --mode production", | ||
"build": "vue-cli-service build --name MarkdownPalettes --target lib src/module.js && vue-cli-service build --name MarkdownPalettesBrowser --target lib src/browserModule.js --no-clean && ./.after-build.sh && cp demo.html dist/demo.html", | ||
"build-lib": "vue-cli-service build --name MarkdownPalettes --target lib src/module.js && ./.after-build.sh", | ||
"build-browser": "vue-cli-service build --name MarkdownPalettesBrowser --target lib src/browserModule.js && ./.after-build.sh", | ||
"build-dev": "vue-cli-service build --name MarkdownPalettes --target lib src/browserModule.js --mode development", | ||
"lint": "vue-cli-service lint", | ||
"lint-fix": "vue-cli-service lint --fix", | ||
"analyze": "vue-cli-service build --name MarkdownPalettes --target lib src/browserModule.js --report", | ||
"test-dist": "hs dist" | ||
}, | ||
"dependencies": { | ||
"@fortawesome/fontawesome-free": "^5.1.0", | ||
"axios": "^0.18.0", | ||
"codemirror": "^5.39.0", | ||
"global": "^4.3.2", | ||
"katex": "^0.9.0", | ||
"lodash": "4.17.10", | ||
"markdown-it": "^8.4.2", | ||
"markdown-it-v": "^1.2.1", | ||
"markdown-it-v-codemirror-highlighter": "1.0.0", | ||
"markdown-it-v-katex": "^1.0.0-alpha.1", | ||
"vue": "^2.5.11" | ||
}, | ||
"devDependencies": { | ||
"@babel/plugin-proposal-object-rest-spread": "7.3.1", | ||
"@babel/preset-env": "7.3.1", | ||
"@vue/cli-plugin-babel": "^3.4.0", | ||
"@vue/cli-plugin-eslint": "^3.1.5", | ||
"@vue/cli-service": "3.4.0", | ||
"@vue/eslint-config-standard": "^4.0.0", | ||
"babel-plugin-lodash": "^3.3.4", | ||
"http-server": "^0.11.1", | ||
"stylus": "^0.54.5", | ||
"stylus-loader": "^3.0.2", | ||
"vue-template-compiler": "^2.5.16" | ||
}, | ||
"browserslist": [ | ||
"Edge >= 15", | ||
"Firefox >= 53", | ||
"Chrome >= 55", | ||
"Opera >= 42", | ||
"Safari >= 10.1" | ||
] | ||
} | ||
{ | ||
"name": "markdown-palettes", | ||
"description": "Markdown*Palettes: Markdown editor for the modern web.", | ||
"version": "0.4.11", | ||
"author": "Luogu Dev Team", | ||
"license": "MIT", | ||
"main": "dist/MarkdownPalettes.common.js", | ||
"style": "dist/MarkdownPalettes.css", | ||
"scripts": { | ||
"dev": "vue-cli-service serve --open", | ||
"prod-test": "vue-cli-service serve --open --mode production", | ||
"build": "vue-cli-service build --name MarkdownPalettes --target lib src/module.js && vue-cli-service build --name MarkdownPalettesBrowser --target lib src/browserModule.js --no-clean && ./.after-build.sh && cp demo.html dist/demo.html", | ||
"build-lib": "vue-cli-service build --name MarkdownPalettes --target lib src/module.js && ./.after-build.sh", | ||
"build-browser": "vue-cli-service build --name MarkdownPalettesBrowser --target lib src/browserModule.js && ./.after-build.sh", | ||
"build-dev": "vue-cli-service build --name MarkdownPalettes --target lib src/browserModule.js --mode development", | ||
"lint": "vue-cli-service lint", | ||
"lint-fix": "vue-cli-service lint --fix", | ||
"analyze": "vue-cli-service build --name MarkdownPalettes --target lib src/browserModule.js --report", | ||
"test-dist": "hs dist" | ||
}, | ||
"dependencies": { | ||
"@fortawesome/fontawesome-svg-core": "^1.2.15", | ||
"@fortawesome/free-solid-svg-icons": "^5.7.2", | ||
"@fortawesome/vue-fontawesome": "^0.1.6", | ||
"axios": "^0.18.0", | ||
"codemirror": "^5.39.0", | ||
"global": "^4.3.2", | ||
"katex": "^0.9.0", | ||
"lodash": "4.17.10", | ||
"markdown-it": "^8.4.2", | ||
"markdown-it-v": "^1.2.1", | ||
"markdown-it-v-codemirror-highlighter": "1.0.0", | ||
"markdown-it-v-katex": "^1.0.0-alpha.1", | ||
"vue": "^2.5.11" | ||
}, | ||
"devDependencies": { | ||
"@babel/plugin-proposal-object-rest-spread": "7.3.1", | ||
"@babel/preset-env": "7.3.1", | ||
"@vue/cli-plugin-babel": "^3.4.0", | ||
"@vue/cli-plugin-eslint": "^3.1.5", | ||
"@vue/cli-service": "3.4.0", | ||
"@vue/eslint-config-standard": "^4.0.0", | ||
"babel-plugin-lodash": "^3.3.4", | ||
"http-server": "^0.11.1", | ||
"stylus": "^0.54.5", | ||
"stylus-loader": "^3.0.2", | ||
"vue-template-compiler": "^2.5.16" | ||
}, | ||
"browserslist": [ | ||
"Edge >= 15", | ||
"Firefox >= 53", | ||
"Chrome >= 55", | ||
"Opera >= 42", | ||
"Safari >= 10.1" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,11 @@ | ||
import Vue from 'vue' | ||
import Editor from './module.js' | ||
import { Editor, defaultContentParser } from './module.js' | ||
|
||
// eslint-disable-next-line | ||
const app = new Vue({ | ||
el: '#editor', | ||
functional: true, | ||
render: h => h(Editor) | ||
}) | ||
|
||
window.defaultContentParser = defaultContentParser |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters