Merge branch 'main' into feature/vue3-implementation-improvements
# Conflicts: # package.json # vite.config.js # yarn.lock
This commit is contained in:
commit
5cfb99bfc2
5 changed files with 263 additions and 431 deletions
|
@ -1,5 +0,0 @@
|
|||
module.exports = {
|
||||
presets: [
|
||||
'@vue/app',
|
||||
],
|
||||
}
|
27
package.json
27
package.json
|
@ -7,22 +7,24 @@
|
|||
"serve:dist-dev": "node scripts/serve-dist.js",
|
||||
"serve:dist": "vite preview",
|
||||
"build": "vite build && workbox copyLibraries dist/",
|
||||
"build:modern-only": "BUILD_MODERN_ONLY=true vite build && workbox copyLibraries dist/",
|
||||
"build:dev": "vite build -m development --outDir dist-dev/",
|
||||
"lint": "eslint --ignore-pattern '*.test.*' ./src --ext .vue,.js,.ts",
|
||||
"cypress:open": "cypress open",
|
||||
"test:unit": "jest",
|
||||
"test:frontend": "cypress run"
|
||||
"test:frontend": "cypress run",
|
||||
"browserslist:update": "npx browserslist@latest --update-db"
|
||||
},
|
||||
"dependencies": {
|
||||
"@kyvg/vue3-notification": "2.3.3",
|
||||
"@vue/compat": "3.2.14",
|
||||
"browserslist": "4.17.1",
|
||||
"bulma": "0.9.3",
|
||||
"camel-case": "4.1.2",
|
||||
"copy-to-clipboard": "3.3.1",
|
||||
"date-fns": "2.24.0",
|
||||
"dompurify": "2.3.3",
|
||||
"easymde": "^2.15.0",
|
||||
"flatpickr": "^4.6.9",
|
||||
"highlight.js": "11.2.0",
|
||||
"is-touch-device": "1.0.1",
|
||||
"lodash.clonedeep": "^4.5.0",
|
||||
|
@ -49,27 +51,29 @@
|
|||
"@types/jest": "27.0.2",
|
||||
"@typescript-eslint/eslint-plugin": "4.32.0",
|
||||
"@typescript-eslint/parser": "4.32.0",
|
||||
"@vitejs/plugin-legacy": "^1.6.1",
|
||||
"@vitejs/plugin-vue": "^1.9.0",
|
||||
"@vue/babel-preset-app": "4.5.13",
|
||||
"@vue/eslint-config-typescript": "7.0.0",
|
||||
"@vue/runtime-dom": "latest",
|
||||
"autoprefixer": "10.3.6",
|
||||
"axios": "0.21.4",
|
||||
"browserslist": "4.17.3",
|
||||
"cypress": "8.5.0",
|
||||
"cypress-file-upload": "5.0.8",
|
||||
"esbuild": "0.13.3",
|
||||
"esbuild": "0.13.4",
|
||||
"eslint": "7.32.0",
|
||||
"eslint-plugin-vue": "7.18.0",
|
||||
"eslint-plugin-vue": "7.19.1",
|
||||
"express": "4.17.1",
|
||||
"faker": "5.5.3",
|
||||
"jest": "27.2.4",
|
||||
"rollup-plugin-terser": "7.0.2",
|
||||
"postcss": "^8.3.9",
|
||||
"rollup": "^2.58.0",
|
||||
"rollup-plugin-visualizer": "5.5.2",
|
||||
"sass": "1.42.1",
|
||||
"ts-jest": "27.0.5",
|
||||
"typescript": "4.4.3",
|
||||
"vite": "2.6.1",
|
||||
"vite-plugin-pwa": "0.11.2",
|
||||
"vite": "2.6.3",
|
||||
"vite-plugin-pwa": "0.11.3",
|
||||
"wait-on": "6.0.0",
|
||||
"workbox-cli": "6.3.0"
|
||||
},
|
||||
|
@ -118,13 +122,6 @@
|
|||
"autoprefixer": {}
|
||||
}
|
||||
},
|
||||
"browserslist": [
|
||||
"> 1%",
|
||||
"last 2 versions",
|
||||
"not ie > 0",
|
||||
"not dead",
|
||||
"Firefox ESR"
|
||||
],
|
||||
"jest": {
|
||||
"testPathIgnorePatterns": [
|
||||
"cypress"
|
||||
|
|
|
@ -97,7 +97,7 @@ export default {
|
|||
this.assignees.splice(a, 1)
|
||||
}
|
||||
}
|
||||
this.$message.success({message: this.$t('task.assignee.assignSuccess')})
|
||||
this.$message.success({message: this.$t('task.assignee.unassignSuccess')})
|
||||
})
|
||||
.catch(e => {
|
||||
this.$message.error(e)
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
import createVuePlugin from '@vitejs/plugin-vue'
|
||||
import { defineConfig } from 'vite'
|
||||
import vue from '@vitejs/plugin-vue'
|
||||
import legacyFn from '@vitejs/plugin-legacy'
|
||||
const {VitePWA} = require('vite-plugin-pwa')
|
||||
const path = require('path')
|
||||
const {visualizer} = require('rollup-plugin-visualizer')
|
||||
|
@ -9,14 +11,28 @@ const pathSrc = path.resolve(__dirname, './src')
|
|||
const SCSS_IMPORT_PREFIX = `@use "sass:math";
|
||||
@import "${pathSrc}/styles/variables";`
|
||||
|
||||
module.exports = {
|
||||
const isModernBuild = Boolean(process.env.BUILD_MODERN_ONLY)
|
||||
const legacy = isModernBuild
|
||||
? undefined
|
||||
: legacyFn({
|
||||
// recommended by browserslist => https://github.com/vitejs/vite/tree/main/packages/plugin-legacy#targets
|
||||
targets: ['defaults', 'not IE 11'],
|
||||
})
|
||||
|
||||
if (isModernBuild) {
|
||||
console.log('Building "modern-only" build')
|
||||
} else {
|
||||
console.log('Building "legacy" build with "@vitejs/plugin-legacy"')
|
||||
}
|
||||
|
||||
export default defineConfig({
|
||||
css: {
|
||||
preprocessorOptions: {
|
||||
scss: { additionalData: SCSS_IMPORT_PREFIX },
|
||||
},
|
||||
},
|
||||
plugins: [
|
||||
createVuePlugin({
|
||||
vue({
|
||||
template: {
|
||||
compilerOptions: {
|
||||
compatConfig: {
|
||||
|
@ -25,6 +41,7 @@ module.exports = {
|
|||
},
|
||||
},
|
||||
}),
|
||||
legacy,
|
||||
VitePWA({
|
||||
srcDir: 'src',
|
||||
filename: 'sw.js',
|
||||
|
@ -103,7 +120,6 @@ module.exports = {
|
|||
strictPort: true,
|
||||
},
|
||||
build: {
|
||||
target: 'es2015',
|
||||
rollupOptions: {
|
||||
plugins: [
|
||||
visualizer({
|
||||
|
@ -112,4 +128,4 @@ module.exports = {
|
|||
],
|
||||
},
|
||||
},
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue