diff --git a/build/utils.js b/build/utils.js index 65991421..5220a400 100644 --- a/build/utils.js +++ b/build/utils.js @@ -16,7 +16,6 @@ exports.cssLoaders = function (options) { loader: 'css-loader', options: { minimize: process.env.NODE_ENV === 'production', - url: process.env.NODE_ENV !== 'production', sourceMap: options.sourceMap } } @@ -35,8 +34,13 @@ exports.cssLoaders = function (options) { // Extract CSS when that option is specified // (which is the case during production build) + // Remarks: Unfortunately ExtractTextPlugin is not able to rewrite url paths to resources + // referenced in the extracted css. As a workaround, override publicPath, which will work because all + // css resources end up in /static/css. For more information see + // https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/27 if (options.extract) { return ExtractTextPlugin.extract({ + publicPath: '../../', use: loaders, fallback: 'vue-style-loader' }) diff --git a/embedded.html b/embedded.html index 7a1482d5..b8e80c3f 100644 --- a/embedded.html +++ b/embedded.html @@ -5,9 +5,6 @@ Wegue WebGIS Embedded - - -
diff --git a/index.html b/index.html index cb787058..bb9c6c2c 100644 --- a/index.html +++ b/index.html @@ -5,9 +5,6 @@ Wegue WebGIS - - -
diff --git a/package-lock.json b/package-lock.json index 582bbd7d..bf661f20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1565,6 +1565,12 @@ "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz", "integrity": "sha1-FWUb1VOme4WB+zmIEMmK2Go0Uk4=" }, + "@mdi/font": { + "version": "5.9.55", + "resolved": "https://registry.npmjs.org/@mdi/font/-/font-5.9.55.tgz", + "integrity": "sha512-jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg==", + "dev": true + }, "@sinonjs/commons": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", @@ -7997,6 +8003,12 @@ "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.0.tgz", "integrity": "sha512-v674D0WtpxCXlA6E+sBlG1QJWdUkz/s9qAD91bJSXBGuBL5lL4tJXpoJEftecphCh2SVQCjWMS2vhylc3AIQTg==" }, + "material-icons": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/material-icons/-/material-icons-0.5.4.tgz", + "integrity": "sha512-5ycazkNmIOtV78Ff3WgvxQESoJuujdRm0cNbf18fmyJN20jHyqp9rpwi4EfQyGimag0ZLElxtVg3H9enIKdOOw==", + "dev": true + }, "math-expression-evaluator": { "version": "1.2.17", "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", diff --git a/package.json b/package.json index 88efc6af..2eab94e8 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@babel/preset-env": "^7.0.0", "@babel/register": "^7.0.0", "@babel/runtime-corejs3": "^7.13.10", + "@mdi/font": "^5.9.55", "@vue/test-utils": "^1.0.3", "autoprefixer": "^9.8.0", "babel-eslint": "^9.0.0", @@ -72,6 +73,7 @@ "karma-sourcemap-loader": "^0.3.7", "karma-spec-reporter": "^0.0.32", "karma-webpack": "^3.0.5", + "material-icons": "^0.5.4", "mocha": "^6.2.3", "opn": "^6.0.0", "optimize-css-assets-webpack-plugin": "^2.0.0", diff --git a/src/main.js b/src/main.js index a2d7f4c5..ec19f85c 100644 --- a/src/main.js +++ b/src/main.js @@ -3,6 +3,8 @@ import Vue from 'vue'; import Vuetify from 'vuetify'; import PortalVue from 'portal-vue' +import '@mdi/font/css/materialdesignicons.css' +import 'material-icons/iconfont/material-icons.css' import '../node_modules/ol/ol.css'; import WguApp from '../app/WguApp'; import UrlUtil from './util/Url';