diff --git a/src/lib/middleware.js b/src/lib/middleware.js
index 5bfcde2..e3d388e 100644
--- a/src/lib/middleware.js
+++ b/src/lib/middleware.js
@@ -62,20 +62,20 @@ function injectManifestMeta(html, templateEngine, manifest) {
function injectStyles(html, templateEngine, chunkName, assets) {
const publicPath = '/';
- const styles = assets.filter(asset => asset.endsWith('.css'));
+ const styles = assets.filter(({ name }) => name.endsWith('.css'));
if (styles.length > 0) {
let styleHtml;
if (templateEngine === 'pug') {
styleHtml = `block append style\n${
styles
- .map(file => ` link(href="${publicPath + file}" rel="stylesheet")`)
+ .map(({ name }) => ` link(href="${publicPath + name}" rel="stylesheet")`)
.join('\n')
}`;
html = `${html}\n${styleHtml}\n`;
} else {
styleHtml = styles
- .map(file => ` `)
+ .map(({ name }) => ` `)
.join('\n');
html = html.replace('', `${styleHtml}\n `);
}
@@ -84,10 +84,10 @@ function injectStyles(html, templateEngine, chunkName, assets) {
return html;
}
-// eslint-disable-next-line
+// eslint-disable-next-line max-len
function injectScripts(html, templateEngine, chunkName, assets, commonChunks, scriptInjectPosition) {
const publicPath = '/';
- const scripts = assets.filter(asset => asset.endsWith('.js'));
+ const scripts = assets.filter(({ name }) => name.endsWith('.js'));
if (isObject(commonChunks)) {
Object.keys(commonChunks).forEach((name) => {
@@ -100,13 +100,13 @@ function injectScripts(html, templateEngine, chunkName, assets, commonChunks, sc
if (templateEngine === 'pug') {
scriptHtml = `block append script\n${
scripts
- .map(file => ` script(src="${publicPath + file}")`)
+ .map(({ name }) => ` script(src="${publicPath + name}")`)
.join('\n')
}`;
html = `${html}\n${scriptHtml}\n`;
} else {
scriptHtml = scripts
- .map(file => ` `)
+ .map(({ name }) => ` `)
.join('\n');
html = html.replace(`${scriptInjectPosition}>`, `${scriptHtml}\n ${scriptInjectPosition}>`);
}
@@ -142,7 +142,6 @@ export default (app, appConfig) => {
const templatePages = templates.pages || templates;
-
// 根据 entry 信息在 express 中添加路由
const entryPoints = getEntries(entries);
Object.keys(entryPoints).forEach((chunkName) => {
@@ -203,7 +202,7 @@ export default (app, appConfig) => {
}
if (inject && assets.length > 0) {
html = injectStyles(html, engine, chunkName, assets);
- html = injectScripts(html, engine, chunkName, assets, commonChunks, scriptInjectPosition); // eslint-disable-line
+ html = injectScripts(html, engine, chunkName, assets, commonChunks, scriptInjectPosition);
}
html = html
// 替换格式为 __var__ 用户自定义变量
diff --git a/src/lib/validate-schema.js b/src/lib/validate-schema.js
index e54cb79..48a563c 100644
--- a/src/lib/validate-schema.js
+++ b/src/lib/validate-schema.js
@@ -1,28 +1,28 @@
-import validateSchema from 'webpack/lib/validateSchema';
+// import validateSchema from 'webpack/lib/validateSchema';
// import WebpackOptionsValidationError from 'webpack/lib/WebpackOptionsValidationError';
-import packingOptionsSchema from '../schemas/packing-options';
-import { pRequire } from '..';
+// import packingOptionsSchema from '../schemas/packing-options';
+// import { pRequire } from '..';
-class PackingOptionsValidationError extends Error {
- constructor(message) {
- super();
- this.name = 'PackingOptionsValidationError';
- this.message = message;
- }
-}
+// class PackingOptionsValidationError extends Error {
+// constructor(message) {
+// super();
+// this.name = 'PackingOptionsValidationError';
+// this.message = message;
+// }
+// }
/**
* 校验 `config/packing.js` 参数
*/
export default () => {
- const options = pRequire('config/packing');
- const packingOptionsValidationErrors = validateSchema(packingOptionsSchema, options);
+ // const options = pRequire('config/packing');
+ // const packingOptionsValidationErrors = validateSchema(packingOptionsSchema, options);
- if (packingOptionsValidationErrors.length) {
- // 重写 error.message
- // 保证输出消息的可读性
- // const error = new WebpackOptionsValidationError(packingOptionsValidationErrors);
- // const message = error.message.replace(/Webpack/mg, 'Packing');
- throw new PackingOptionsValidationError(message);
- }
+ // if (packingOptionsValidationErrors.length !== 0) {
+ // // 重写 error.message
+ // // 保证输出消息的可读性
+ // // const error = new WebpackOptionsValidationError(packingOptionsValidationErrors);
+ // // const message = error.message.replace(/Webpack/mg, 'Packing');
+ // throw new PackingOptionsValidationError(packingOptionsValidationErrors);
+ // }
};