workflow update

package.json

@@ -28,6 +28,7 @@
     "eslint-plugin-node": "^8.0.0",
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
+    "glob": "^7.1.3",
     "gulp": "^4.0.0",
     "gulp-cached": "^1.1.1",
     "gulp-html-tag-include": "^1.0.1",
@@ -48,7 +49,6 @@
     "postcss-preset-env": "^6.5.0",
     "postcss-reporter": "^6.0.0",
     "precss": "^4.0.0",
-    "shx": "^0.3.2",
     "stylelint": "^9.8.0",
     "stylelint-config-standard": "^18.2.0",
     "webpack": "^4.25.1",

tasks/conf.js

@@ -5,5 +5,10 @@ const ENV = (process.env && process.env.NODE_ENV && process.env.NODE_ENV.trim()
 export default {
     env: ENV,
     name: 'biuro',
-    isProduction: ENV === 'production'
+    isProduction: ENV === 'production',
+    certs: {
+        key: 'certs/biuro.lt/privkey.pem',
+        cert: 'certs/biuro.lt/certificate.pem'
+    },
+    proxy: 'https://dev.biuro.lt'
 };

tasks/index.js

@@ -20,11 +20,13 @@ import { serveCoreCSS } from './serve-css--core';
 
 import { serveMainCSS } from './serve-css--main';
 
+import { setPaths } from './set-paths';
+
 // const pre = gulp.parallel(gulp.series(serveCoreCSS, serveHTML), servePHP, serveFonts, serveImages, serveOur, serveRoot, serveMainCSS);
 const pre = gulp.parallel(serveCoreCSS, serveMainCSS);
 
-export const dev = gulp.series(clear, pre, server);
+export const dev = gulp.series(setPaths, clear, pre, server);
 
-export const build = gulp.series(clear, pre, scripts);
+export const build = gulp.series(clear, pre, scripts, setPaths);
 
 export default dev;

tasks/server.js

@@ -31,11 +31,11 @@ const bundler = webpack(config);
 export function server () {
     bs.init({
         // server: 'wp-content/themes/${conf.name}/',
-        proxy: 'https://dev.biuro.lt',
+        proxy: conf.proxy,
         // httpModule: 'http2',
         https: {
-            key: 'certs/biuro.lt/privkey.pem',
-            cert: 'certs/biuro.lt/certificate.pem'
+            key: conf.certs.key,
+            cert: conf.certs.cert
         },
         files: [
             `wp-content/themes/${conf.name}/**/*.php`,

tasks/set-paths.js

+import glob from 'glob';
+import gulp from 'gulp';
+import replace from 'gulp-replace';
+import conf from './conf';
+
+export function setPaths (done) {
+    return glob(`wp-content/themes/${conf.name}/+(css|js)/**/*.min.+(css|js)`, {}, (er, files) => {
+        if (er) {
+            console.dir(er);
+            return done;
+        }
+
+        let stream = gulp.src([`wp-content/themes/${conf.name}/+(footer|header)+(*).php`], { base: `wp-content/themes/${conf.name}/` });
+
+        files.forEach((file) => {
+            file = file.replace(`wp-content/themes/${conf.name}/`, '');
+
+            let str = file.replace(/-[a-z0-9]+/, (conf.isProduction ? '(-[a-z0-9]+)?' : ''));
+
+            if (conf.isProduction) {
+                stream = stream
+                    .pipe(replace(new RegExp(str, 'g'), file));
+            } else {
+                stream = stream
+                    .pipe(replace(new RegExp(file, 'g'), str));
+            }
+        });
+
+        stream = stream
+            .pipe(gulp.dest(`wp-content/themes/${conf.name}/`));
+
+        return stream;
+    });
+}

wp-content/themes/biuro/css/core-12eb319b08.min.css

-:root{--color--gray:#4d4d4d;--color--green:#006957;--typo--font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;--typo--font-size:2.4rem;--typo--line-height:1.286;--typo--font-face:"Open Sans","system",sans-serif}.l-footer{clear:both}.o-nav{margin:0;padding:0;list-style:none}.c-cookies-warning{display:none}.c-data-controller{padding:0 20px;text-align:center;font-size:88%}.u-hidden{display:none}#main{margin:0 auto;padding:0 20px}@media (min-width:768px){#sidebar,#topsearch{float:left}#sidebar{width:195px}#main{max-width:956px}}@media (min-width:980px){#main{padding:0}#sidebar{width:215px}#content{width:714px;float:right}}@media (min-width:1024px){#main{max-width:976px}#sidebar{width:235px}}
\ No newline at end of file

wp-content/themes/biuro/css/main.css

@@ -1732,4 +1732,7 @@ button::-moz-focus-inner,input[type=reset]::-moz-focus-inner,input[type=button]:
 
 /* critical:start */
 
+/** { border: 1px solid #000; }*/
+
 /* critical:end */
+

wp-content/themes/biuro/js/main-fa7efd04.min.js

-!function(e){var t={};function n(o){if(t[o])return t[o].exports;var r=t[o]={i:o,l:!1,exports:{}};return e[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=e,n.c=t,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var r in e)n.d(o,r,function(t){return e[t]}.bind(null,r));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/",n(n.s=0)}([function(e,t,n){e.exports=n(1)},function(e,t,n){var o=function(){var e=document.createElement("link"),t=document.getElementsByTagName("head")[0];e.rel="stylesheet",e.href="/wp-content/themes/biuro/css/main.min.css",t.parentNode.insertBefore(e,t)},r=window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame;r?r(o):window.addEventListener?window.addEventListener("load",o):window.attachEvent("onload",o),function(e){var t=document.getElementById("cookie-warning"),n=document.getElementById("cookie-agree"),o=document.getElementById("cookie-close"),r=!!i()&&localStorage.getItem("biuro-agree");function i(){try{return localStorage.setItem("a","a"),localStorage.removeItem("a"),!0}catch(e){return!1}}t&&n&&o&&!r&&(t.style.display="block",n.addEventListener("click",function(){i()&&localStorage.setItem("biuro-agree","true"),t.style.display="none"}),o.addEventListener("click",function(){t.style.display="none"}))}(window)}]);
\ No newline at end of file

wp-content/themes/biuro/js/main.js

@@ -54,6 +54,8 @@ if (raf) {
     });
 })(window);
 
+// console.error(15);
+
 if (module.hot) {
     module.hot.accept();
 }