diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..f94a77c --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,3 @@ +{ + "recommendations": ["eamodio.gitlens", "esbenp.prettier-vscode"] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..8ff87c0 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,22 @@ +{ + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.tabSize": 2, + "prettier.printWidth": 120, + "prettier.tabWidth": 2, + "prettier.useTabs": false, + "prettier.semi": true, + "prettier.singleQuote": true, + "prettier.quoteProps": "as-needed", + "prettier.jsxSingleQuote": false, + "prettier.trailingComma": "all", + "prettier.bracketSpacing": true, + "prettier.arrowParens": "always", + "prettier.requirePragma": false, + "prettier.insertPragma": false, + "prettier.proseWrap": "preserve", + "prettier.htmlWhitespaceSensitivity": "css", + "prettier.vueIndentScriptAndStyle": false, + "prettier.endOfLine": "lf", + "prettier.embeddedLanguageFormatting": "auto", + "prettier.singleAttributePerLine": true +} diff --git a/master_vue3.diff b/master_vue3.diff deleted file mode 100644 index 8643c9f..0000000 --- a/master_vue3.diff +++ /dev/null @@ -1,1847 +0,0 @@ -diff --git a/package.json b/package.json -index 4d30ebf..481c92d 100644 ---- a/package.json -+++ b/package.json -@@ -9,7 +9,8 @@ - ], - "main": "./dist/vcc.umd.min.js", - "scripts": { -- "serve": "vue-cli-service serve --open --port 8008", -+ "dev": "vite --port 8008", -+ "serve": "vite --port 8008", - "build:release": "vue-cli-service build", - "build": "vue-cli-service build --report --target lib --name vcc './src/components-v2/VCC.vue' && node ./src/script/distClear.js", - "build:win": "vue-cli-service build --report --target lib --name vcc ./src/components-v2/VCC.vue && node ./src/script/distClear.js", -@@ -21,13 +22,16 @@ - "debugParser": "node ./src/test/parserJsCode.js" - }, - "dependencies": { -- "ant-design-vue": "^1.7.2", -+ "@element-plus/icons": "0.0.11", -+ "@vitejs/plugin-vue": "^1.10.0", -+ "@vue/compiler-sfc": "^3.2.22", - "axios": "^0.21.4", -+ "codemirror-editor-vue3": "^0.2.4", - "copy-to-clipboard": "^3.3.1", -- "crypto-random-string": "^3.3.0", -+ "crypto-random-string": "^3.3.1", - "css": "^3.0.0", -+ "element-plus": "^1.2.0-beta.3", - "css-scoped": "^1.0.0", -- "element-ui": "^2.15.6", - "escodegen": "^2.0.0", - "espree": "^7.3.0", - "eventemitter3": "^4.0.7", -@@ -35,16 +39,17 @@ - "fs-extra": "^9.0.1", - "glob": "^7.1.6", - "keymaster": "^1.6.2", -- "lodash": "^4.17.20", -+ "lodash-es": "^4.17.21", -+ "nanoid": "^3.1.30", - "prettier": "^2.4.0", -- "prismjs": "^1.20.0", - "split.js": "^1.6.2", -- "stringify-object": "^3.3.0", - "vant": "^2.10.7", -- "vue": "^2.6.14", -- "vue-codemirror": "^4.0.6", -- "vue-github-button": "^1.3.0", -- "vue-nestable": "^2.6.0" -+ "vite": "^2.6.14", -+ "vue": "^3.2.22", -+ "vuedraggable": "^4.1.0", -+ "vuex": "^4.0.2", -+ "vue-template-compiler": "^2.6.14", -+ "vue-github-button": "^1.3.0" - }, - "devDependencies": { - "@babel/generator": "^7.11.6", -@@ -60,7 +65,8 @@ - "lint-staged": "^9.5.0", - "sass": "^1.25.0", - "sass-loader": "^8.0.2", -- "vue-template-compiler": "^2.6.14" -+ "is-obj": "^3.0.0", -+ "is-regexp": "^3.0.0" - }, - "eslintConfig": { - "root": true, -diff --git a/public/index.html b/public/index.html -index 851ae63..2d5bb51 100644 ---- a/public/index.html -+++ b/public/index.html -@@ -11,7 +11,7 @@ - --
-+ - -