diff --git a/scripts/config_scripts/0.loader-config.js b/scripts/config_scripts/0.loader-config.js index e9520cc..77df584 100644 --- a/scripts/config_scripts/0.loader-config.js +++ b/scripts/config_scripts/0.loader-config.js @@ -12,11 +12,11 @@ const fontLoader = { { loader: "url-loader", options: { - name: process.env.NODE_ENV === 'production' ? 'fonts/[name].[hash].[ext]' : '[path][name].[ext]', + name: process.env.NODE_ENV === 'production' ? '[hash].[ext]' : '[name].[ext]', limit: 5120, - publicPath: "/", - context: SRC_PATH, - outputPath: "/" + publicPath: "assets/fonts", + // context: SRC_PATH, + outputPath: "assets/fonts" } } ] @@ -28,10 +28,10 @@ const imgLoader = { loader: 'url-loader', options: { limit: 10240, - name: process.env.NODE_ENV === 'production' ? 'images/[hash].[ext]' : '[path][name].[ext]', - publicPath: '/', - context: SRC_PATH, //源码目录,这里更改context，是为了在开发环境下，导出图片和图片源的路径一致 - outputPath: '/' + name: process.env.NODE_ENV === 'production' ? '[hash].[ext]' : '[name].[ext]', + publicPath: 'assets/images', + // context: SRC_PATH, //源码目录,这里更改context，是为了在开发环境下，导出图片和图片源的路径一致 + outputPath: 'assets/images' } } ] diff --git a/scripts/serve.js b/scripts/serve.js index 722468f..296f1f5 100644 --- a/scripts/serve.js +++ b/scripts/serve.js @@ -30,9 +30,12 @@ generateConfig().then(config => { app.use(webpackDevMiddleware(compiler, { publicPath: config.output.publicPath + // writeToDisk: true })); app.use(hotMiddleware(compiler)); - + app.get('/', function (req, res, next) { + res.send(config); + }); let port = appConfig.devServer ? appConfig.devServer.port : 3100; app.listen(port, err => { if(err){ diff --git a/src/pages/page1/index.js b/src/pages/page1/index.js index 3c34d0a..2a4b50e 100644 --- a/src/pages/page1/index.js +++ b/src/pages/page1/index.js @@ -2,7 +2,7 @@ import './page1.scss'; // import './page2.less'; import * as $ from "jquery"; - +import '../../assets/images/testimg/ee.jpg'; let a = 1; let _ = require('lodash'); diff --git a/yarn.lock b/yarn.lock index 86f40c3..d6959f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,9 +3,9 @@ "@angular/core@^7.1.4": - version "7.1.4" - resolved "http://registry.npm.taobao.org/@angular/core/download/@angular/core-7.1.4.tgz#ad899985290957bbb9ac5c47c62ae5a72ccf5d00" - integrity sha1-rYmZhSkJV7u5rFxHxirlpyzPXQA= + version "7.2.0" + resolved "http://registry.npm.taobao.org/@angular/core/download/@angular/core-7.2.0.tgz#79573fe66be28a047ca4348e870566e32e4ff8e2" + integrity sha1-eVc/5mviigR8pDSOhwVm4y5P+OI= dependencies: tslib "^1.9.0" @@ -1396,9 +1396,9 @@ camelcase@^5.0.0: integrity sha1-AylVJ9WL081Kp1Nj81sujZe+L0I= caniuse-lite@^1.0.30000925: - version "1.0.30000927" - resolved "http://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30000927.tgz#114a9de4ff1e01f5790fe578ecd93421c7524665" - integrity sha1-EUqd5P8eAfV5D+V47Nk0IcdSRmU= + version "1.0.30000928" + resolved "http://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30000928.tgz#805e828dc72b06498e3683a32e61c7507fd67b88" + integrity sha1-gF6CjccrBkmONoOjLmHHUH/We4g= caseless@~0.12.0: version "0.12.0" @@ -1416,7 +1416,7 @@ chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "http://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ= @@ -1598,9 +1598,9 @@ concat-stream@^1.5.0: typedarray "^0.0.6" connect-history-api-fallback@^1.3.0: - version "1.5.0" - resolved "http://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a" - integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo= + version "1.6.0" + resolved "http://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + integrity sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w= console-browserify@^1.1.0: version "1.1.0" @@ -2061,9 +2061,9 @@ ejs@^2.6.1: integrity sha1-SY7A1JVlWrxvI81hho2SZGQHGqA= electron-to-chromium@^1.3.96: - version "1.3.98" - resolved "http://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.98.tgz#f200bdac84b1110d7d9904f34f4fc6d5573a8a9c" - integrity sha1-8gC9rISxEQ19mQTzT0/G1Vc6ipw= + version "1.3.100" + resolved "http://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.100.tgz#899fb088def210aee6b838a47655bbb299190e13" + integrity sha1-iZ+wiN7yEK7muDikdlW7spkZDhM= elliptic@^6.0.0: version "6.4.1" @@ -2664,9 +2664,9 @@ global-prefix@^1.0.1: which "^1.2.14" globals@^11.1.0: - version "11.9.0" - resolved "http://registry.npm.taobao.org/globals/download/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" - integrity sha1-veI2gI6YfykHaKk9BlBg145qskk= + version "11.10.0" + resolved "http://registry.npm.taobao.org/globals/download/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50" + integrity sha1-Hgl3bf/aXgGBazu0B3yLWcJOqlA= globby@^6.1.0: version "6.1.0" @@ -3323,9 +3323,9 @@ js-base64@^2.1.8: integrity sha1-QiVboYOrZ85ZoN7mQK/cAKta6T4= js-levenshtein@^1.1.3: - version "1.1.4" - resolved "http://registry.npm.taobao.org/js-levenshtein/download/js-levenshtein-1.1.4.tgz#3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e" - integrity sha1-Olbjy/WJygCB6yLNm6CxKQoW0m4= + version "1.1.6" + resolved "http://registry.npm.taobao.org/js-levenshtein/download/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d" + integrity sha1-xs7ljrNVA3LfjeuF+tXOZs4B1Z0= "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -4440,13 +4440,13 @@ postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1: integrity sha1-n/giVH4okyE88cMO+lGsX9G6goE= postcss@^7.0.5, postcss@^7.0.6: - version "7.0.7" - resolved "http://registry.npm.taobao.org/postcss/download/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614" - integrity sha1-J1TQc/d6y07wjxI1w2xXIacgFhQ= + version "7.0.8" + resolved "http://registry.npm.taobao.org/postcss/download/postcss-7.0.8.tgz#2a3c5f2bdd00240cd0d0901fd998347c93d36696" + integrity sha1-KjxfK90AJAzQ0JAf2Zg0fJPTZpY= dependencies: - chalk "^2.4.1" + chalk "^2.4.2" source-map "^0.6.1" - supports-color "^5.5.0" + supports-color "^6.0.0" pretty-error@^2.1.1: version "2.1.1" @@ -5436,6 +5436,13 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.5.0: dependencies: has-flag "^3.0.0" +supports-color@^6.0.0: + version "6.1.0" + resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + integrity sha1-B2Srxpxj1ayELdSGfo0CXogN+PM= + dependencies: + has-flag "^3.0.0" + tapable@^1.0.0, tapable@^1.1.0: version "1.1.1" resolved "http://registry.npm.taobao.org/tapable/download/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e" @@ -5936,9 +5943,9 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0: source-map "~0.6.1" webpack@^4.27.1: - version "4.28.3" - resolved "http://registry.npm.taobao.org/webpack/download/webpack-4.28.3.tgz#8acef6e77fad8a01bfd0c2b25aa3636d46511874" - integrity sha1-is7253+tigG/0MKyWqNjbUZRGHQ= + version "4.28.4" + resolved "http://registry.npm.taobao.org/webpack/download/webpack-4.28.4.tgz#1ddae6c89887d7efb752adf0c3cd32b9b07eacd0" + integrity sha1-HdrmyJiH1++3Uq3ww80yubB+rNA= dependencies: "@webassemblyjs/ast" "1.7.11" "@webassemblyjs/helper-module-context" "1.7.11"