Bump settings config

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-06-06 19:22:35 +02:00
parent 62e29abc5b
commit 14cb805cf1
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
6 changed files with 391 additions and 2788 deletions

View File

@ -14,6 +14,7 @@ do
cp $entryFile $backupFile cp $entryFile $backupFile
# Make the app # Make the app
set -e
cd "$path/../" cd "$path/../"
make make
@ -25,7 +26,7 @@ do
if ! diff -q $entryFile $backupFile &>/dev/null if ! diff -q $entryFile $backupFile &>/dev/null
then then
echo "$entryFile build is NOT up-to-date! Please send the proper production build within the pull request" echo "$entryFile build is NOT up-to-date! Please send the proper production build within the pull request"
cat /root/.npm/_logs/*.log cat $HOME/.npm/_logs/*.log
exit 2 exit 2
else else
echo "$entryFile build is up-to-date" echo "$entryFile build is up-to-date"

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -34,10 +34,10 @@
"babel-preset-stage-3": "^6.24.1", "babel-preset-stage-3": "^6.24.1",
"css-loader": "^0.28.11", "css-loader": "^0.28.11",
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
"vue-loader": "^14.2.2", "vue-loader": "^15.2.4",
"vue-template-compiler": "^2.5.16", "vue-template-compiler": "^2.5.16",
"webpack": "^4.8.3", "webpack": "^4.11.1",
"webpack-cli": "^2.1.4", "webpack-cli": "^3.0.2",
"webpack-merge": "^4.1.2" "webpack-merge": "^4.1.2"
} }
} }

View File

@ -1,9 +1,10 @@
const path = require('path') const path = require('path')
const { VueLoaderPlugin } = require('vue-loader');
module.exports = { module.exports = {
entry: './src/main.js', entry: './src/main.js',
output: { output: {
path: path.resolve(__dirname, './js'), path: __dirname + '/js',
publicPath: '/dist/', publicPath: '/dist/',
filename: 'main.js' filename: 'main.js'
}, },
@ -12,39 +13,30 @@ module.exports = {
{ {
test: /\.css$/, test: /\.css$/,
use: [ use: [
'vue-style-loader',
'css-loader' 'css-loader'
], ],
}, },
{ {
test: /\.scss$/, test: /\.scss$/,
use: [ use: [
'vue-style-loader',
'css-loader', 'css-loader',
'sass-loader'
], ],
}, },
{ {
test: /\.vue$/, test: /\.vue$/,
loader: 'vue-loader', loader: 'vue-loader',
options: {
loaders: {}
// other vue-loader options go here
}
}, },
{ {
test: /\.js$/, test: /\.js$/,
loader: 'babel-loader', loader: 'babel-loader',
exclude: /node_modules/ exclude: /node_modules/
}, },
{
test: /\.(png|jpg|gif|svg)$/,
loader: 'file-loader',
options: {
name: '[name].[ext]?[hash]'
}
}
] ]
}, },
plugins: [
new VueLoaderPlugin()
],
resolve: { resolve: {
alias: { alias: {
'vue$': 'vue/dist/vue.esm.js' 'vue$': 'vue/dist/vue.esm.js'