From ba845f52186128bffbf8fc89cd24907e5a1e327d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 9 Nov 2018 04:02:12 +0900
Subject: [PATCH] Clean up
---
webpack.config.ts | 25 +------------------------
webpack/loaders/replace.js | 30 ------------------------------
2 files changed, 1 insertion(+), 54 deletions(-)
delete mode 100644 webpack/loaders/replace.js
diff --git a/webpack.config.ts b/webpack.config.ts
index 7d1f914c4e..ee1b59c950 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -6,7 +6,6 @@ import * as fs from 'fs';
import * as webpack from 'webpack';
import chalk from 'chalk';
const { VueLoaderPlugin } = require('vue-loader');
-const minifyHtml = require('html-minifier').minify;
const WebpackOnBuildPlugin = require('on-build-webpack');
//const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
const ProgressBarPlugin = require('progress-bar-webpack-plugin');
@@ -18,20 +17,6 @@ const meta = require('./package.json');
const version = meta.clientVersion;
const codename = meta.codename;
-declare var global: {
- collapseSpacesReplacement: any;
-};
-
-//#region Replacer definitions
-global['collapseSpacesReplacement'] = (html: string) => {
- return minifyHtml(html, {
- collapseWhitespace: true,
- collapseInlineTagWhitespace: true,
- keepClosingSlash: true
- }).replace(/\t/g, '');
-};
-//#endregion
-
const langs = Object.keys(locales);
const isProduction = process.env.NODE_ENV == 'production';
@@ -122,14 +107,6 @@ module.exports = {
}
}, {
loader: 'vue-svg-inline-loader'
- }, {
- loader: 'replace',
- query: {
- qs: [{
- search: /^<template>([\s\S]+?)\r?\n<\/template>/.toString(),
- replace: 'collapseSpacesReplacement'
- }]
- }
}]
}, {
test: /\.styl(us)?$/,
@@ -199,7 +176,7 @@ module.exports = {
}
},
resolveLoader: {
- modules: ['node_modules', './webpack/loaders']
+ modules: ['node_modules']
},
cache: true,
devtool: false, //'source-map',
diff --git a/webpack/loaders/replace.js b/webpack/loaders/replace.js
deleted file mode 100644
index 9f4825e18c..0000000000
--- a/webpack/loaders/replace.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { getOptions } from 'loader-utils';
-
-function trim(text, g) {
- return text.substring(1, text.length - (g ? 2 : 0));
-}
-
-export default function(src) {
- const fn = options => {
- const search = options.search;
- const g = search.endsWith('g');
- const file = this.resourcePath.replace(/\\/g, '/');
- const replace = options.i18n ? global[options.replace].bind(null, {
- src: file,
- lang: options.lang
- }) : global[options.replace];
- if (typeof search != 'string' || search.length == 0) console.error('invalid search');
- if (typeof replace != 'function') console.error('invalid replacer:', replace, this.request);
- src = src.replace(new RegExp(trim(search, g), g ? 'g' : ''), replace);
- };
-
- this.cacheable();
- const options = getOptions(this);
- if (options.qs) {
- options.qs.forEach(q => fn(q));
- } else {
- fn(options);
- }
- this.callback(null, src);
- return src;
-}