Skip to content

Commit fa10c16

Browse files
committed
Merge branch 'release/2.2.13' into craft-webpack
2 parents c1b83f4 + ceba11d commit fa10c16

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# nystudio107/craft Change Log
22

3+
## 2.2.13 - 2020.07.18
4+
### Changed
5+
* Disable the ForkTS plugins for now
6+
37
## 2.2.12 - 2020.07.18
48
### Added
59
* Added TypeScript support

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "craftcms/craft",
33
"description": "nystudio107 Craft 3.4 CMS scaffolding project",
4-
"version": "2.2.12",
4+
"version": "2.2.13",
55
"keywords": [
66
"craft",
77
"cms",

docker-config/webpack-dev-craft/webpack.common.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ const merge = require('webpack-merge');
88

99
// webpack plugins
1010
const CopyWebpackPlugin = require('copy-webpack-plugin');
11+
/* -- Does not yet work with Vue 3
1112
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
1213
const ForkTsCheckerNotifierWebpackPlugin = require('fork-ts-checker-notifier-webpack-plugin');
14+
*/
1315
const ManifestPlugin = require('webpack-manifest-plugin');
1416
const { VueLoaderPlugin } = require('vue-loader');
1517
const WebpackNotifierPlugin = require('webpack-notifier');
@@ -150,6 +152,7 @@ const baseConfig = {
150152
plugins: [
151153
new WebpackNotifierPlugin({title: 'Webpack', excludeWarnings: true, alwaysNotify: true}),
152154
new VueLoaderPlugin(),
155+
/* -- Does not yet work with Vue 3
153156
new ForkTsCheckerWebpackPlugin({
154157
typescript: {
155158
configFile: '../../tsconfig.json',
@@ -163,6 +166,7 @@ const baseConfig = {
163166
excludeWarnings: true,
164167
alwaysNotify: false,
165168
}),
169+
*/
166170
]
167171
};
168172

0 commit comments

Comments
 (0)