Merge branch 'browser-sync' into dev

package.json

@@ -9,23 +9,23 @@
   "private": true,
   "author": "Biuro",
   "devDependencies": {
-    "@babel/core": "^7.5.4",
+    "@babel/core": "^7.5.5",
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/plugin-transform-arrow-functions": "^7.2.0",
-    "@babel/plugin-transform-runtime": "^7.5.0",
-    "@babel/preset-env": "^7.5.4",
-    "@babel/register": "^7.4.4",
-    "@babel/runtime": "^7.5.4",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/register": "^7.5.5",
+    "@babel/runtime": "^7.5.5",
     "autoprefixer": "^9.6.1",
     "babel-loader": "^8.0.6",
     "browser-sync": "^2.26.7",
     "connect-modrewrite": "^0.10.2",
     "css-mqpacker": "^7.0.0",
     "cssnano": "^4.1.10",
-    "del": "^4.1.1",
-    "eslint": "^6.0.1",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-import": "^2.18.0",
+    "del": "^5.0.0",
+    "eslint": "^6.1.0",
+    "eslint-config-standard": "^13.0.1",
+    "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-node": "^9.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
@@ -52,14 +52,14 @@
     "precss": "^4.0.0",
     "stylelint": "^10.1.0",
     "stylelint-config-standard": "^18.3.0",
-    "webpack": "^4.35.0",
-    "webpack-bundle-analyzer": "^3.3.2",
+    "webpack": "^4.39.2",
+    "webpack-bundle-analyzer": "^3.4.1",
     "webpack-dev-middleware": "^3.7.0",
     "webpack-hot-middleware": "^2.25.0",
-    "write-file-webpack-plugin": "^4.3.2"
+    "write-file-webpack-plugin": "^4.5.1"
   },
   "dependencies": {
-    "core-js": "^3.1.4",
-    "npm": "^6.10.1"
+    "core-js": "^3.2.1",
+    "npm": "^6.10.3"
   }
 }

tasks/serve-css--core.js

@@ -15,7 +15,7 @@ export function serveCoreCSS () {
         require('postcss-custom-media')(), // custom media
         require('postcss-preset-env')(), // autoprefixer, CSS 4
         require('postcss-critical-split')({ // critical CSS
-            'output': 'critical'
+            output: 'critical'
         }),
         require('css-mqpacker')(), // merge media queries
         require('cssnano')({ // minify CSS; Disable autoprefixer, because it's already included in cssnext

tasks/serve-css--main.js

@@ -15,7 +15,7 @@ export function serveMainCSS () {
         require('postcss-custom-media')(), // custom media
         require('postcss-preset-env')(), // autoprefixer, CSS 4
         require('postcss-critical-split')({ // critical CSS
-            'output': 'rest'
+            output: 'rest'
         }),
         require('css-mqpacker')(), // merge media queries
         require('cssnano')({ // minify CSS; Disable autoprefixer, because it's already included in cssnext
@@ -47,7 +47,8 @@ export function serveMainCSS () {
 
     if (conf.isProduction) {
         stream = stream
-            .pipe(rev());
+            .pipe(rev())
+            .on('error', logError);
     } else {
         stream = stream
             .pipe(cached('css-main'))

tasks/server.js

 import gulp from 'gulp';
 import browser from 'browser-sync';
 import webpack from 'webpack';
-// import http2 from 'http2';
+// import http2 from 'node-http2';
 
 import webpackDevMiddleware from 'webpack-dev-middleware';
 
@@ -36,39 +36,23 @@ export function server () {
         logPrefix: 'Biuro',
         socket: {
             domain: 'dev.biuro.lt:2000'
-            // domain: 'https://10.0.75.1:3000/'
-        //     // port: 2000
         },
-        // proxy: {
-        //     target: 'https://dev.biuro.lt'
-        //     ws: false
-        // },
         proxy: {
-            target: 'https://dev.biuro.lt/',
-            // target: 'dev.biuro.lt:443',
-            // proxyRes: [
-            //     function (proxyRes, req, res) {
-            //         // console.log(proxyRes.headers);
-            //         console.log(req);
-            //     }
-            // ],
+            target: conf.proxy,
             ws: false
         },
-        // httpModule: http2,
         https: {
             key: conf.certs.key,
             cert: conf.certs.cert
         },
-        // files: [
-        //     `wp-content/themes/${conf.name}/**/*.php`,
-        //     `wp-content/themes/${conf.name}/css/main.min.css`
-        // ],
+        files: [
+            // `wp-content/themes/${conf.name}/**/*.php`,
+            `wp-content/themes/${conf.name}/css/main.min.css`
+        ],
         ghostMode: false,
         open: false,
         port: 2000,
-        // server: false,
         ui: false,
-        // notify: false,
         middleware: [
             webpackDevMiddleware(bundler, { /* options */ }),
             webpackHotMiddleware(bundler)
@@ -92,20 +76,4 @@ export function server () {
     gulp.watch([`wp-content/themes/${conf.name}/css/core.min.css`], { delay: 0 }, gulp.series(reload));
 
     gulp.watch([`wp-content/themes/${conf.name}/**/*.php`], { delay: 0 }, gulp.series(reload));
-
-    // gulp.watch('wp-content/content/**/*.*').on('change', () => {
-    //     serveContent();
-    //     bs.reload();
-    // });
-
-    // gulp.watch([`wp-content/themes/${conf.name}/css/**/*.css`, `!wp-content/themes/${conf.name}/css/**/*.min.css`], gulp.parallel(serveCoreCSS, serveMainCSS));
-
-    // gulp.watch(`wp-content/themes/${conf.name}/css/core.min.css`).on('change', bs.reload);
-
-    // gulp.watch(`wp-content/themes/${conf.name}/**/*.php`).on('change', bs.reload);
-
-    // gulp.watch(`wp-content/themes/${conf.name}/css/main.min.css`).on('change', bs.stream);
-
-//     `wp-content/themes/${conf.name}/**/*.php`,
-//     `wp-content/themes/${conf.name}/css/main.min.css`
 }

tasks/webpack.js

@@ -41,6 +41,10 @@ let config = {
 
     mode: conf.env,
 
+    watchOptions: {
+        poll: true
+    },
+
     module: {
         rules: [{
             test: /\.js?$/,

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

@@ -36,7 +36,7 @@ qa-: Signify that a QA or Test Engineering team is running an automated UI test
 
 /* critical:start */
 /* critical:end */
-/** { border: 1px solid #000; }*/
+ /** { border: 1px solid #00f; }*/
 
 input::-webkit-calendar-picker-indicator {
     display: none;

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

@@ -59,6 +59,8 @@ const lisp = (str) => {
     return str;
 };
 
+// console.error(46);
+
 const autocomplete = (str) => {
     const node = document.getElementById(str);
     const arrow = document.querySelector('.js-toggle--' + str);