From 7f67c727579da384388d8394d04f48302bc78608 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 24 Aug 2019 23:25:54 -0400 Subject: [PATCH] fix: missing vuetify-loader in webpack prod --- dev/webpack/webpack.prod.js | 10 ++++++---- server/views/legacy/master.pug | 18 ++++++++++++++++-- server/views/master.pug | 18 ++++++++++++++++-- server/views/setup.pug | 18 ++++++++++++++++-- 4 files changed, 54 insertions(+), 10 deletions(-) diff --git a/dev/webpack/webpack.prod.js b/dev/webpack/webpack.prod.js index 7127ce04..7d49d007 100644 --- a/dev/webpack/webpack.prod.js +++ b/dev/webpack/webpack.prod.js @@ -5,6 +5,7 @@ const yargs = require('yargs').argv const _ = require('lodash') const Fiber = require('fibers') +const { VueLoaderPlugin } = require('vue-loader') const { CleanWebpackPlugin } = require('clean-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin') @@ -12,9 +13,9 @@ const HtmlWebpackPugPlugin = require('html-webpack-pug-plugin') const MiniCssExtractPlugin = require('mini-css-extract-plugin') const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin') const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin') -const SimpleProgressWebpackPlugin = require('simple-progress-webpack-plugin') +const VuetifyLoaderPlugin = require('vuetify-loader/lib/plugin') +const WebpackBarPlugin = require('webpackbar') const SriWebpackPlugin = require('webpack-subresource-integrity') -const { VueLoaderPlugin } = require('vue-loader') const babelConfig = fs.readJsonSync(path.join(process.cwd(), '.babelrc')) const cacheDir = '.webpack-cache/cache' @@ -194,6 +195,7 @@ module.exports = { }, plugins: [ new VueLoaderPlugin(), + new VuetifyLoaderPlugin(), new webpack.BannerPlugin('Wiki.js - wiki.js.org - Licensed under AGPL'), new CopyWebpackPlugin([ { from: 'client/static' }, @@ -234,8 +236,8 @@ module.exports = { hashFuncNames: ['sha256', 'sha512'], enabled: true }), - new SimpleProgressWebpackPlugin({ - format: 'expanded' + new WebpackBarPlugin({ + name: 'Client Assets' }), new CleanWebpackPlugin(), new OptimizeCssAssetsPlugin({ diff --git a/server/views/legacy/master.pug b/server/views/legacy/master.pug index ec294e55..2896ea00 100644 --- a/server/views/legacy/master.pug +++ b/server/views/legacy/master.pug @@ -43,6 +43,16 @@ html //- CSS + + link( + type='text/css' + rel='stylesheet' + href='/css/legacy.b8600c4bfa9b6d21f54c.css' + integrity='sha256-c43Iog8YvFPD9EQvD11jnxb0IYOFUtxYA2ABtJIQPmM= sha512-g1nj/OKi7ykTfsdrhgu4lqOqyKMZBvAGvjS98r9cXI96DaciNfgXtlLIGmR3wgQuGrV3n3rCs94BB6lK9OI7qA==' + crossorigin='use-credentials' + ) + + script( crossorigin='anonymous' @@ -54,14 +64,18 @@ html script( type='text/javascript' - src='/js/runtime.js' + src='/js/runtime.fc95297b6e8ae6e2e003.js' + integrity='sha256-6bZfGqlPATFeFRP90SGQYPuIILZahs+tXrS/eQdEUzc= sha512-tBIg4dA1HmUAT8xl3YuZu9eyiB1KWmSkI74kM2bi+BzZe12YXogJ5PHNzxb+Cnw6fjavInmnljB4X1QFzumrUw==' + crossorigin='use-credentials' ) script( type='text/javascript' - src='/js/legacy.js' + src='/js/legacy.b8600c4bfa9b6d21f54c.js' + integrity='sha256-KYTyzCk08U1fUx2pAcphdJOBWcWNe3m4jAcIeeZJX2U= sha512-vOBKbPZkD3HfjP2MfM6O4yhXBXZ5WJNzukJVZMtQKw84yvUePUnJstJ6t90jy2NPO9UTaEpF3J2SNh+3DBofKQ==' + crossorigin='use-credentials' ) diff --git a/server/views/master.pug b/server/views/master.pug index e43defcd..deadab0f 100644 --- a/server/views/master.pug +++ b/server/views/master.pug @@ -47,20 +47,34 @@ html(lang=siteConfig.lang) //- CSS + + link( + type='text/css' + rel='stylesheet' + href='/css/app.303f1e1fbb500ede4cef.css' + integrity='sha256-wmeXKjjPKSCWT+1pyn38uD5929SyTO0vx1rq3xjLFcE= sha512-Qjh++VFQQnL0y3E0WAzvHmpT9UwTwtQBoo9vwZu02OqxG9OXRGCEJWzRPLkn/fRVP6wrlBPMSz/DVaAaeUhW1w==' + crossorigin='use-credentials' + ) + + //- JS script( type='text/javascript' - src='/js/runtime.js' + src='/js/runtime.fc95297b6e8ae6e2e003.js' + integrity='sha256-6bZfGqlPATFeFRP90SGQYPuIILZahs+tXrS/eQdEUzc= sha512-tBIg4dA1HmUAT8xl3YuZu9eyiB1KWmSkI74kM2bi+BzZe12YXogJ5PHNzxb+Cnw6fjavInmnljB4X1QFzumrUw==' + crossorigin='use-credentials' ) script( type='text/javascript' - src='/js/app.js' + src='/js/app.303f1e1fbb500ede4cef.js' + integrity='sha256-cSXcjyRtFGAvQ5BnRPbLxcr3itR1X8wgcNO5RlvMLEU= sha512-dy3W6c8IlJpAfGpMi3FibzOI6g1o65CpsEWgIZU/Fl/l0ofUxrxXP3xpfNuAaLgmQfc5l+x3IomXmeM8OBEIUQ==' + crossorigin='use-credentials' ) diff --git a/server/views/setup.pug b/server/views/setup.pug index 80e6da6f..51932d1f 100644 --- a/server/views/setup.pug +++ b/server/views/setup.pug @@ -23,20 +23,34 @@ html //- CSS + + link( + type='text/css' + rel='stylesheet' + href='/css/setup.35a646a90c01e5e5f6f5.css' + integrity='sha256-HNu607cPBzAhzYo8xjvM307b5k18J+Vr2OWTFlMuiIw= sha512-b0KTirC8Myjz1FnIYY9fFrYoexiVj7/3N3TeuHU+IfCx2ZM+uMilVoZPe4sBC+xXTuuJIoJWwgjH3ZI1Lt6eAQ==' + crossorigin='use-credentials' + ) + + //- JS script( type='text/javascript' - src='/js/runtime.js' + src='/js/runtime.fc95297b6e8ae6e2e003.js' + integrity='sha256-6bZfGqlPATFeFRP90SGQYPuIILZahs+tXrS/eQdEUzc= sha512-tBIg4dA1HmUAT8xl3YuZu9eyiB1KWmSkI74kM2bi+BzZe12YXogJ5PHNzxb+Cnw6fjavInmnljB4X1QFzumrUw==' + crossorigin='use-credentials' ) script( type='text/javascript' - src='/js/setup.js' + src='/js/setup.35a646a90c01e5e5f6f5.js' + integrity='sha256-DS7oIW0jf1JjTIBH/NfUxFTx9ZCUd67yy0OdZ4+PqZc= sha512-dHe0IsiBCGYirAl+JqFIjQEtG/sV/QShDoppFskoqunXxGnzqM1zphxfRCX8ooKLaQrGfW9F8HNBVsUSK02HNg==' + crossorigin='use-credentials' )