Merge branch 'release/2.2.13' into craft-webpack

nystudio107 · Jul 19, 2020 · fa10c16 · fa10c16
2 parents c1b83f4 + ceba11d
commit fa10c16
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.2.13 - 2020.07.18
+### Changed
+* Disable the ForkTS plugins for now
+
 ## 2.2.12 - 2020.07.18
 ### Added
 * Added TypeScript support

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.2.12",
+  "version": "2.2.13",
   "keywords": [
     "craft",
     "cms",

diff --git a/docker-config/webpack-dev-craft/webpack.common.js b/docker-config/webpack-dev-craft/webpack.common.js
@@ -8,8 +8,10 @@ const merge = require('webpack-merge');
 
 // webpack plugins
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+/* -- Does not yet work with Vue 3
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 const ForkTsCheckerNotifierWebpackPlugin = require('fork-ts-checker-notifier-webpack-plugin');
+*/
 const ManifestPlugin = require('webpack-manifest-plugin');
 const { VueLoaderPlugin } = require('vue-loader');
 const WebpackNotifierPlugin = require('webpack-notifier');
@@ -150,6 +152,7 @@ const baseConfig = {
     plugins: [
         new WebpackNotifierPlugin({title: 'Webpack', excludeWarnings: true, alwaysNotify: true}),
         new VueLoaderPlugin(),
+/* -- Does not yet work with Vue 3
         new ForkTsCheckerWebpackPlugin({
             typescript: {
                 configFile: '../../tsconfig.json',
@@ -163,6 +166,7 @@ const baseConfig = {
             excludeWarnings: true,
             alwaysNotify: false,
         }),
+ */
     ]
 };