.gitlab-ci.yml

+stages:
+ - build
+
+build:lektor:
+ stage: build
+ image:
+ name: nikolaik/python-nodejs
+ entrypoint: /bin/bash
+ before_script:
+ - pipenv install
+ script:
+ - pipenv run lektor build -f webpack -O www
+ artifacts:
+ paths:
+ - www

webpack/js/home.js

-import fontawesome from '@fortawesome/fontawesome';
-
-import faPhone from '@fortawesome/fontawesome-free-solid/faPhone';
-import faAt from '@fortawesome/fontawesome-free-solid/faAt';
-import faMapSigns from '@fortawesome/fontawesome-free-solid/faMapSigns';
-import faEnvelopeOpen from '@fortawesome/fontawesome-free-solid/faEnvelopeOpen';
-import faThumbsUp from '@fortawesome/fontawesome-free-solid/faThumbsUp';
-import faCheckSquare from '@fortawesome/fontawesome-free-solid/faCheckSquare';
-import faClock from '@fortawesome/fontawesome-free-solid/faClock';
-import faComments from '@fortawesome/fontawesome-free-solid/faComments';
-import faBars from '@fortawesome/fontawesome-free-solid/faBars';
-import faSpinner from '@fortawesome/fontawesome-free-solid/faSpinner';
-import faEllipsisH from '@fortawesome/fontawesome-free-solid/faEllipsisH';
-
-import faTerminal from '@fortawesome/fontawesome-free-solid/faTerminal';
-
-import faFacebookF from '@fortawesome/fontawesome-free-brands/faFacebookF';
-import faTwitter from '@fortawesome/fontawesome-free-brands/faTwitter';
-import faTelegram from '@fortawesome/fontawesome-free-brands/faTelegram';
-
-import farClock from '@fortawesome/fontawesome-free-regular/faClock';
-
-fontawesome.library.add(faPhone);
-fontawesome.library.add(faAt);
-fontawesome.library.add(faThumbsUp);
-fontawesome.library.add(faCheckSquare);
-fontawesome.library.add(faEnvelopeOpen);
-fontawesome.library.add(faMapSigns);
-fontawesome.library.add(faClock);
-fontawesome.library.add(faComments);
-fontawesome.library.add(faBars);
-fontawesome.library.add(faSpinner);
-fontawesome.library.add(faEllipsisH);
-
-fontawesome.library.add(faTerminal);
-
-fontawesome.library.add(faFacebookF);
-fontawesome.library.add(faTwitter);
-fontawesome.library.add(faTelegram);
-
-fontawesome.library.add(farClock);
+import { library, dom } from '@fortawesome/fontawesome-svg-core'
+import {
+ faPhone,
+ faAt,
+ faMapSigns,
+ faEnvelopeOpen,
+ faThumbsUp,
+ faCheckSquare,
+ faClock,
+ faComments,
+ faBars,
+ faSpinner,
+ faEllipsisH,
+ faTerminal
+} from '@fortawesome/free-solid-svg-icons';
+
+import {
+ faFacebookF,
+ faTwitter,
+ faTelegram
+} from '@fortawesome/free-brands-svg-icons';
+
+import {faClock as farClock} from '@fortawesome/free-regular-svg-icons';
+
+library.add(
+ faPhone,
+ faAt,
+ faThumbsUp,
+ faCheckSquare,
+ faEnvelopeOpen,
+ faMapSigns,
+ faClock,
+ faComments,
+ faBars,
+ faSpinner,
+ faEllipsisH,
+ faTerminal,
+ faFacebookF,
+ faTwitter,
+ faTelegram,
+ farClock
+);
+
+dom.watch()
 
 import 'ol/ol.css'
 import {Map, View} from 'ol';

webpack/package.json

@@ -10,35 +10,36 @@
  "license": "MIT",
  "repository": "https://git.mittelab.org/proj/www",
  "devDependencies": {
- "ajv": "^6.5.5",
+ "ajv": "^6.7.0",
  "babel-core": "^6.26.3",
  "babel-loader": "^7.1.5",
- "bootstrap": "^4.1.3",
+ "binary-search-bounds": "^2.0.4",
+ "bootstrap": "^4.2.1",
  "css-loader": "^0.28.11",
  "file-loader": "^1.1.11",
  "imports-loader": "^0.8.0",
  "jquery": "^3.3.1",
- "mini-css-extract-plugin": "^0.4.4",
- "node-sass": "^4.10.0",
+ "mini-css-extract-plugin": "^0.4.5",
+ "node-sass": "^4.11.0",
  "optimize-css-assets-webpack-plugin": "^5.0.1",
- "popper.js": "^1.14.4",
+ "popper.js": "^1.14.7",
  "postcss-loader": "^2.1.6",
  "precss": "^3.1.2",
  "sass-loader": "^6.0.7",
  "snapsvg": "^0.5.1",
  "style-loader": "^0.20.3",
+ "typeface-ubuntu": "^0.0.65",
  "url-loader": "^0.6.2",
- "webpack": "^4.25.1",
+ "webpack": "^4.29.0",
  "webpack-bundle-analyzer": "^3.0.3",
- "webpack-cli": "^3.1.2",
- "typeface-ubuntu": "^0.0.65",
- "binary-search-bounds": "^2.0.4"
+ "webpack-cli": "^3.2.1"
  },
  "dependencies": {
- "@fortawesome/fontawesome": "^1.1.8",
- "@fortawesome/fontawesome-free-brands": "^5.0.13",
- "@fortawesome/fontawesome-free-regular": "^5.0.13",
- "@fortawesome/fontawesome-free-solid": "^5.0.13",
+ "@fortawesome/fontawesome-free": "^5.7.1",
+ "@fortawesome/fontawesome-svg-core": "^1.2.14",
+ "@fortawesome/free-brands-svg-icons": "^5.7.1",
+ "@fortawesome/free-regular-svg-icons": "^5.7.1",
+ "@fortawesome/free-solid-svg-icons": "^5.7.1",
  "konami": "^1.6.2",
  "ol": "^5.3.0"
  }