pleroma-fe

commit: afdc61b9b7088f5d9880a4a8466461bd8c5aeb78
parent a0099ecb6699f02667e7cae39c688e4c0e86f30c
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Thu, 31 Mar 2022 17:39:08 +0000

Merge branch 'vue3-no-compat' into 'vue3-again'

Remove Vue3 compat build

See merge request pleroma/pleroma-fe!1500
Diffstat:
M
build/webpack.base.conf.js
4
----
M
build/webpack.dev.conf.js
4
+++-
M
build/webpack.prod.conf.js
4
+++-
M
package.json
1
-
M
src/boot/after_store.js
10
+---------
M
test/unit/index.js
7
-------
M
yarn.lock
5
-----

7 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -35,7 +35,6 @@ module.exports = {
       path.join(__dirname, '../node_modules')
     ],
     alias: {
-      'vue': '@vue/compat',
       'static': path.resolve(__dirname, '../static'),
       'src': path.resolve(__dirname, '../src'),
       'assets': path.resolve(__dirname, '../src/assets'),
@@ -69,9 +68,6 @@ module.exports = {
                 return true
               }
               return false
-            },
-            compatConfig: {
-              MODE: 2
             }
           }
         }
diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js
@@ -21,7 +21,9 @@ module.exports = merge(baseWebpackConfig, {
     new webpack.DefinePlugin({
       'process.env': config.dev.env,
       'COMMIT_HASH': JSON.stringify('DEV'),
-      'DEV_OVERRIDES': JSON.stringify(config.dev.settings)
+      'DEV_OVERRIDES': JSON.stringify(config.dev.settings),
+      '__VUE_OPTIONS_API__': true,
+      '__VUE_PROD_DEVTOOLS__': false
     }),
     // https://github.com/glenjamin/webpack-hot-middleware#installation--usage
     new webpack.HotModuleReplacementPlugin(),
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
@@ -36,7 +36,9 @@ var webpackConfig = merge(baseWebpackConfig, {
     new webpack.DefinePlugin({
       'process.env': env,
       'COMMIT_HASH': JSON.stringify(commitHash),
-      'DEV_OVERRIDES': JSON.stringify(undefined)
+      'DEV_OVERRIDES': JSON.stringify(undefined),
+      '__VUE_OPTIONS_API__': true,
+      '__VUE_PROD_DEVTOOLS__': false
     }),
     // extract css into its own file
     new MiniCssExtractPlugin({
diff --git a/package.json b/package.json
@@ -23,7 +23,6 @@
     "@fortawesome/free-solid-svg-icons": "5.15.4",
     "@fortawesome/vue-fontawesome": "3.0.0-5",
     "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
-    "@vue/compat": "^3.1.0",
     "@vuelidate/core": "2.0.0-alpha.35",
     "@vuelidate/validators": "2.0.0-alpha.27",
     "body-scroll-lock": "2.7.1",
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
@@ -1,4 +1,4 @@
-import { createApp, configureCompat } from 'vue'
+import { createApp } from 'vue'
 import { createRouter, createWebHistory } from 'vue-router'
 import vClickOutside from 'click-outside-vue3'
 
@@ -15,14 +15,6 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme } from '../services/style_setter/style_setter.js'
 import FaviconService from '../services/favicon_service/favicon_service.js'
 
-// disable compat for certain features
-configureCompat({
-  ATTR_FALSE_VALUE: false,
-  COMPONENT_V_MODEL: false,
-  INSTANCE_SET: false,
-  RENDER_FUNCTION: false
-})
-
 let staticInitialResults = null
 
 const parsedInitialResults = () => {
diff --git a/test/unit/index.js b/test/unit/index.js
@@ -1,10 +1,3 @@
-import { configureCompat } from 'vue'
-// disable compat for certain features
-configureCompat({
-  COMPONENT_V_MODEL: false,
-  INSTANCE_SET: false,
-  RENDER_FUNCTION: false
-})
 // require all test files (files that ends with .spec.js)
 const testsContext = require.context('./specs', true, /\.spec$/)
 testsContext.keys().forEach(testsContext)
diff --git a/yarn.lock b/yarn.lock
@@ -1450,11 +1450,6 @@
     html-tags "^3.1.0"
     svg-tags "^1.0.0"
 
-"@vue/compat@^3.1.0":
-  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/compat/-/compat-3.2.31.tgz#9c8bdf265eeba1777e5edb56cda73581e351a648"
-  integrity sha512-hhwJk/SRwpT2OADctj+t7QZCRIgh04AcelGpe6gdj0OxA75xpHnPrG+fmG37U3Z6WDrNHZpGvu2eXBzWXM4OVA==
-
 "@vue/compiler-core@3.2.31":
   version "3.2.31"
   resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.31.tgz#d38f06c2cf845742403b523ab4596a3fda152e89"