Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,11 @@ jobs:
- name: Install the dependencies for composer
shell: bash
run: >-
make npm composer_dist
make composer_dist
- name: Build node app
shell: bash
run: >-
make npm

- name: Create the app store package
shell: bash
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
[#700](https://github.com/nextcloud/cookbook/pull/700) @christianlupus
- Correct error messages when recipe already exists
[#702](https://github.com/nextcloud/cookbook/pull/702) @christianlupus
- Update webpack version to 5.x
[#717](https://github.com/nextcloud/cookbook/pull/717) @christianlupus

## 0.8.4 - 2021-03-08

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "src/main.js",
"scripts": {
"build": "node node_modules/webpack/bin/webpack.js --progress --config webpack.build.js",
"build-dev": "node node_modules/webpack/bin/webpack.js --progress --config webpack.devel.js",
"build-dev": "node node_modules/webpack/bin/webpack.js --progress --config webpack.build-dev.js",
"dev": "node node_modules/webpack/bin/webpack.js --progress --watch --config webpack.devel.js",
"test": "echo \"Error: no test specified\" && exit 1",
"prettier": "npx prettier --check src",
Expand Down Expand Up @@ -66,7 +66,7 @@
"vue-style-loader": "^4.1.2",
"vue-template-compiler": "^2.6.11",
"vue-template-loader": "^1.1.0",
"webpack": "^4.42.1",
"webpack": "^5.37.0",
"webpack-bundle-analyzer": "^4.1.0",
"webpack-cli": "^4.5.0",
"webpack-merge": "^5.7.3"
Expand Down
8 changes: 8 additions & 0 deletions webpack.build-dev.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const { merge } = require('webpack-merge')
const common = require('./webpack.config.js')

module.exports = merge(common, {
mode: 'development',
devtool: 'inline-cheap-source-map',
plugins: [],
})
2 changes: 1 addition & 1 deletion webpack.build.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = merge(common, {
comments: false
}
},
sourceMap: true
parallel: true
})
],
},
Expand Down
10 changes: 5 additions & 5 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ module.exports = {
},
module: {
rules: [
{
test: /\.vue$/,
loader: 'vue-loader',
},
{
test: /\.css$/,
use: [{ loader: 'vue-style-loader' },
Expand All @@ -39,10 +43,6 @@ module.exports = {
test: /\.html$/,
loader: 'vue-template-loader',
},
{
test: /\.vue$/,
loader: 'vue-loader',
},
{
test: /\.js$/,
loader: 'babel-loader',
Expand All @@ -57,7 +57,7 @@ module.exports = {
},
{
test: /\.(eot|woff|woff2|ttf)$/,
loaders: 'file-loader',
loader: 'file-loader',
options: {
name: '[path][name].[ext]?[hash]'
},
Expand Down
6 changes: 2 additions & 4 deletions webpack.devel.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
const { merge } = require('webpack-merge')
const common = require('./webpack.config.js')
const base = require('./webpack.build-dev.js')
const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin

module.exports = merge(common, {
mode: 'development',
devtool: 'inline-cheap-source-map',
module.exports = merge(base, {
plugins: [
new BundleAnalyzerPlugin(
{
Expand Down