-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #62 from SunSpecOrangeButton/development
Development
- Loading branch information
Showing
11 changed files
with
132,204 additions
and
129,796 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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,59 +1,59 @@ | ||
| { | ||
| "name": "ob-editor", | ||
| "version": "1.1.2", | ||
| "private": true, | ||
| "scripts": { | ||
| "serve": "vue-cli-service serve", | ||
| "build": "vue-cli-service build", | ||
| "lint": "vue-cli-service lint" | ||
| }, | ||
| "dependencies": { | ||
| "bootstrap": "^4.6.0", | ||
| "bootstrap-vue": "^2.21.2", | ||
| "core-js": "^3.3.2", | ||
| "file-saver": "^2.0.2", | ||
| "vue": "^2.6.10", | ||
| "vue-awesome": "^3.5.4", | ||
| "vue-router": "^3.1.3", | ||
| "vuex": "^3.0.1" | ||
| }, | ||
| "devDependencies": { | ||
| "@vue/cli-plugin-babel": "^4.0.0", | ||
| "@vue/cli-plugin-eslint": "^4.0.0", | ||
| "@vue/cli-service": "^4.0.0", | ||
| "@vue/eslint-config-prettier": "^5.0.0", | ||
| "babel-eslint": "^10.0.3", | ||
| "eslint": "^5.16.0", | ||
| "eslint-plugin-prettier": "^3.1.1", | ||
| "eslint-plugin-vue": "^5.2.3", | ||
| "prettier": "^1.18.2", | ||
| "vue-template-compiler": "^2.6.10" | ||
| }, | ||
| "eslintConfig": { | ||
| "root": true, | ||
| "env": { | ||
| "node": true | ||
| }, | ||
| "extends": [ | ||
| "plugin:vue/essential", | ||
| "@vue/prettier" | ||
| ], | ||
| "rules": { | ||
| "no-console": "off", | ||
| "vue/no-use-v-if-with-v-for": "off", | ||
| "no-unused-vars": "off" | ||
| }, | ||
| "parserOptions": { | ||
| "parser": "babel-eslint" | ||
| } | ||
| }, | ||
| "postcss": { | ||
| "plugins": { | ||
| "autoprefixer": {} | ||
| } | ||
| }, | ||
| "browserslist": [ | ||
| "> 1%", | ||
| "last 2 versions" | ||
| ] | ||
| } | ||
| { | ||
| "name": "ob-editor", | ||
| "version": "1.1.3", | ||
| "private": true, | ||
| "scripts": { | ||
| "serve": "vue-cli-service serve", | ||
| "build": "vue-cli-service build", | ||
| "lint": "vue-cli-service lint" | ||
| }, | ||
| "dependencies": { | ||
| "bootstrap": "^4.6.0", | ||
| "bootstrap-vue": "^2.21.2", | ||
| "core-js": "^3.3.2", | ||
| "file-saver": "^2.0.2", | ||
| "vue": "^2.6.10", | ||
| "vue-awesome": "^3.5.4", | ||
| "vue-router": "^3.1.3", | ||
| "vuex": "^3.0.1" | ||
| }, | ||
| "devDependencies": { | ||
| "@vue/cli-plugin-babel": "^4.0.0", | ||
| "@vue/cli-plugin-eslint": "^4.0.0", | ||
| "@vue/cli-service": "^4.0.0", | ||
| "@vue/eslint-config-prettier": "^5.0.0", | ||
| "babel-eslint": "^10.0.3", | ||
| "eslint": "^5.16.0", | ||
| "eslint-plugin-prettier": "^3.1.1", | ||
| "eslint-plugin-vue": "^5.2.3", | ||
| "prettier": "^1.18.2", | ||
| "vue-template-compiler": "^2.6.10" | ||
| }, | ||
| "eslintConfig": { | ||
| "root": true, | ||
| "env": { | ||
| "node": true | ||
| }, | ||
| "extends": [ | ||
| "plugin:vue/essential", | ||
| "@vue/prettier" | ||
| ], | ||
| "rules": { | ||
| "no-console": "off", | ||
| "vue/no-use-v-if-with-v-for": "off", | ||
| "no-unused-vars": "off" | ||
| }, | ||
| "parserOptions": { | ||
| "parser": "babel-eslint" | ||
| } | ||
| }, | ||
| "postcss": { | ||
| "plugins": { | ||
| "autoprefixer": {} | ||
| } | ||
| }, | ||
| "browserslist": [ | ||
| "> 1%", | ||
| "last 2 versions" | ||
| ] | ||
| } |
Oops, something went wrong.