client: replace deprecated vue-resource with axios, lint more file
This commit is contained in:
+21
-19
@@ -1,28 +1,30 @@
|
||||
var path = require('path');
|
||||
var config = require('./config');
|
||||
var ExtractTextPlugin = require('extract-text-webpack-plugin');
|
||||
/* eslint-disable no-process-env, no-console */
|
||||
|
||||
exports.assetsPath = function (_path) {
|
||||
var assetsSubDirectory = process.env.NODE_ENV === 'production'
|
||||
? config.build.assetsSubDirectory
|
||||
: config.dev.assetsSubDirectory;
|
||||
const path = require('path');
|
||||
const config = require('./config');
|
||||
const ExtractTextPlugin = require('extract-text-webpack-plugin');
|
||||
|
||||
exports.assetsPath = (_path) => {
|
||||
const assetsSubDirectory = process.env.NODE_ENV === 'production' ?
|
||||
config.build.assetsSubDirectory :
|
||||
config.dev.assetsSubDirectory;
|
||||
return path.posix.join(assetsSubDirectory, _path);
|
||||
};
|
||||
|
||||
exports.cssLoaders = function (options) {
|
||||
exports.cssLoaders = (options) => {
|
||||
options = options || {};
|
||||
// generate loader string to be used with extract text plugin
|
||||
function generateLoaders (loaders) {
|
||||
var sourceLoader = loaders.map(function (loader) {
|
||||
var extraParamChar;
|
||||
let sourceLoader = loaders.map((loader) => {
|
||||
let extraParamChar;
|
||||
if (/\?/.test(loader)) {
|
||||
loader = loader.replace(/\?/, '-loader?');
|
||||
extraParamChar = '&';
|
||||
} else {
|
||||
loader = loader + '-loader';
|
||||
loader = `${loader}-loader`;
|
||||
extraParamChar = '?';
|
||||
}
|
||||
return loader + (options.sourceMap ? extraParamChar + 'sourceMap' : '');
|
||||
return `${loader}${(options.sourceMap ? extraParamChar + 'sourceMap' : '')}`; // eslint-disable-line prefer-template
|
||||
}).join('!');
|
||||
|
||||
if (options.extract) {
|
||||
@@ -45,14 +47,14 @@ exports.cssLoaders = function (options) {
|
||||
};
|
||||
|
||||
// Generate loaders for standalone style files (outside of .vue)
|
||||
exports.styleLoaders = function (options) {
|
||||
var output = [];
|
||||
var loaders = exports.cssLoaders(options);
|
||||
for (var extension in loaders) {
|
||||
var loader = loaders[extension];
|
||||
exports.styleLoaders = (options) => {
|
||||
const output = [];
|
||||
const loaders = exports.cssLoaders(options);
|
||||
for (let extension in loaders) {
|
||||
const loader = loaders[extension];
|
||||
output.push({
|
||||
test: new RegExp('\\.' + extension + '$'),
|
||||
loader: loader,
|
||||
test: new RegExp(`\\.${extension}$`),
|
||||
loader,
|
||||
});
|
||||
}
|
||||
return output;
|
||||
|
||||
Reference in New Issue
Block a user