AkkomaGang
/
akkoma-fe
4
13
Fork 57
Code Issues 72 Pull Requests 16 Projects Releases 1 Wiki Activity

Big 'ol set of patches and dep maintenance #212

Merged
floatingghost merged 9 commits from magical-patches into develop 2022-11-15 15:47:33 +00:00
Conversation 1 Commits 9 Files Changed 35 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa6ff2e87d - Show all commits

2
config/test.env.js
View File

@ -1,4 +1,4 @@
var merge = require('webpack-merge')
var { merge } = require('webpack-merge')
var devEnv = require('./dev.env')
module.exports = merge(devEnv, {

4
test/unit/karma.conf.js
View File

@ -4,7 +4,7 @@
// https://github.com/webpack/karma-webpack
// var path = require('path')
var merge = require('webpack-merge')
var { merge } = require('webpack-merge')
var HtmlWebpackPlugin = require('html-webpack-plugin')
var baseConfig = require('../../build/webpack.base.conf')
var utils = require('../../build/utils')
@ -16,7 +16,7 @@ var webpackConfig = merge(baseConfig, {
module: {
rules: utils.styleLoaders()
},
devtool: '#inline-source-map',
devtool: 'inline-source-map',
// vue: {
// loaders: {
// js: 'isparta'