From 1e1a6135ccbab98ba8f6636060445edba7426155 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sat, 23 May 2020 11:21:05 +0200 Subject: [PATCH 01/18] move assets dir up 1 level --- app/app.js | 2 +- app/views/home.hbs | 4 ++-- {app/assets => assets}/images/msft-azure-logo.svg | 0 {app/assets => assets}/images/nodejs-logo.svg | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {app/assets => assets}/images/msft-azure-logo.svg (100%) rename {app/assets => assets}/images/nodejs-logo.svg (100%) diff --git a/app/app.js b/app/app.js index 425be8f..b433851 100644 --- a/app/app.js +++ b/app/app.js @@ -22,7 +22,7 @@ app.use(monitor) // --- Views --- -app.use(express.static(path.join(__dirname, 'assets'))) +app.use(express.static(path.join(__dirname, './../assets'))) app.set('views', path.join(__dirname, '/views')) app.set('view engine', 'hbs') app.set('view options', { layout: 'layout' }) diff --git a/app/views/home.hbs b/app/views/home.hbs index dfff227..073d537 100644 --- a/app/views/home.hbs +++ b/app/views/home.hbs @@ -1,6 +1,6 @@
- - + +
diff --git a/app/assets/images/msft-azure-logo.svg b/assets/images/msft-azure-logo.svg similarity index 100% rename from app/assets/images/msft-azure-logo.svg rename to assets/images/msft-azure-logo.svg diff --git a/app/assets/images/nodejs-logo.svg b/assets/images/nodejs-logo.svg similarity index 100% rename from app/assets/images/nodejs-logo.svg rename to assets/images/nodejs-logo.svg From a21e39ddc4d13485df00300a928bd6b7e0ee917d Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sat, 23 May 2020 11:44:33 +0200 Subject: [PATCH 02/18] dep: add node-sass and node-sass-middleware --- package-lock.json | 921 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 + 2 files changed, 923 insertions(+) diff --git a/package-lock.json b/package-lock.json index ceef211..9e3378d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -824,6 +824,12 @@ "uri-js": "^4.2.2" } }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + }, "ansi-align": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", @@ -937,6 +943,22 @@ "diagnostic-channel-publishers": "^0.3.3" } }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "dev": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -970,6 +992,12 @@ "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", "dev": true }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -1013,6 +1041,12 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", "dev": true }, + "async-foreach": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", + "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", + "dev": true + }, "async-hook-jl": { "version": "1.7.6", "resolved": "https://registry.npmjs.org/async-hook-jl/-/async-hook-jl-1.7.6.tgz", @@ -1197,6 +1231,15 @@ "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", "dev": true }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dev": true, + "requires": { + "inherits": "~2.0.0" + } + }, "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", @@ -1363,6 +1406,24 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" + }, + "dependencies": { + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", + "dev": true + } + } + }, "camelize": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", @@ -1530,6 +1591,12 @@ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true + }, "collect-v8-coverage": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.0.tgz", @@ -1632,6 +1699,12 @@ } } }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true + }, "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", @@ -1741,6 +1814,15 @@ } } }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, + "requires": { + "array-find-index": "^1.0.1" + } + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -1853,6 +1935,12 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -1965,6 +2053,15 @@ "once": "^1.4.0" } }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, "es-abstract": { "version": "1.17.5", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", @@ -2492,6 +2589,16 @@ "unpipe": "~1.0.0" } }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, "flat-cache": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", @@ -2573,6 +2680,18 @@ "dev": true, "optional": true }, + "fstream": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" + } + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -2584,6 +2703,68 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "dev": true, + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, + "gaze": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", + "dev": true, + "requires": { + "globule": "^1.0.0" + } + }, "gensync": { "version": "1.0.0-beta.1", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", @@ -2596,6 +2777,12 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -2660,6 +2847,17 @@ "type-fest": "^0.8.1" } }, + "globule": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz", + "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==", + "dev": true, + "requires": { + "glob": "~7.1.1", + "lodash": "~4.17.12", + "minimatch": "~3.0.2" + } + }, "got": { "version": "6.7.1", "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", @@ -2762,6 +2960,23 @@ "function-bind": "^1.1.1" } }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + } + } + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -2773,6 +2988,12 @@ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=" }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "dev": true + }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", @@ -2884,6 +3105,12 @@ "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.1.0.tgz", "integrity": "sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg==" }, + "hosted-git-info": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "dev": true + }, "hpkp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz", @@ -3010,6 +3237,21 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, + "in-publish": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", + "dev": true + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "requires": { + "repeating": "^2.0.0" + } + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -3103,6 +3345,12 @@ } } }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -3190,6 +3438,12 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, + "is-finite": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", + "dev": true + }, "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -3313,6 +3567,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -4118,6 +4378,12 @@ "supports-color": "^7.0.0" } }, + "js-base64": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz", + "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==", + "dev": true + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -4270,6 +4536,45 @@ "type-check": "~0.3.2" } }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", @@ -4291,6 +4596,16 @@ "@sinonjs/commons": "^1.7.0" } }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "dev": true, + "requires": { + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" + } + }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -4348,6 +4663,12 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "dev": true + }, "map-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", @@ -4381,6 +4702,24 @@ } } }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" + } + }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -4505,6 +4844,12 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "nan": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", + "dev": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -4551,6 +4896,43 @@ "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz", "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==" }, + "node-gyp": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", + "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "dev": true, + "requires": { + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" + }, + "dependencies": { + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "requires": { + "abbrev": "1" + } + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true + } + } + }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -4586,6 +4968,93 @@ } } }, + "node-sass": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", + "dev": true, + "requires": { + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash": "^4.17.15", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", + "sass-graph": "2.2.5", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "dev": true, + "requires": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, + "node-sass-middleware": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/node-sass-middleware/-/node-sass-middleware-0.11.0.tgz", + "integrity": "sha1-KrVhJDYpQRAuLNVNihwc70Ra+xU=", + "dev": true, + "requires": { + "mkdirp": "^0.5.1", + "node-sass": "^4.3.0" + } + }, "nodemon": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.2.tgz", @@ -4639,6 +5108,18 @@ "abbrev": "1" } }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -4654,6 +5135,24 @@ "path-key": "^2.0.0" } }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "dev": true, + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true + }, "nwsapi": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", @@ -4666,6 +5165,12 @@ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", "dev": true }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, "object-copy": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", @@ -4791,12 +5296,28 @@ "word-wrap": "~1.2.3" } }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "dev": true, + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, "p-defer": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", @@ -4830,6 +5351,15 @@ "p-try": "^2.0.0" } }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", @@ -4857,6 +5387,15 @@ "callsites": "^3.0.0" } }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "^1.2.0" + } + }, "parse5": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", @@ -4874,6 +5413,15 @@ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "^2.0.0" + } + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -4902,6 +5450,25 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -4920,6 +5487,21 @@ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "^2.0.0" + } + }, "pirates": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz", @@ -5010,6 +5592,12 @@ "react-is": "^16.12.0" } }, + "process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true + }, "progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", @@ -5130,6 +5718,42 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, + "requires": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" + } + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, "readdirp": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", @@ -5148,6 +5772,16 @@ "util.promisify": "^1.0.0" } }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "dev": true, + "requires": { + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" + } + }, "referrer-policy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.2.0.tgz", @@ -5206,6 +5840,15 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "^1.0.0" + } + }, "request": { "version": "2.88.0", "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", @@ -5555,6 +6198,111 @@ } } }, + "sass-graph": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", + "dev": true, + "requires": { + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^13.3.2" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, "saxes": { "version": "3.1.11", "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz", @@ -5564,6 +6312,27 @@ "xmlchars": "^2.1.1" } }, + "scss-tokenizer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "dev": true, + "requires": { + "js-base64": "^2.1.8", + "source-map": "^0.4.2" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": ">=0.0.4" + } + } + } + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -5870,6 +6639,38 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, + "spdx-correct": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "dev": true + }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -5944,6 +6745,15 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, + "stdout-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", + "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", + "dev": true, + "requires": { + "readable-stream": "^2.0.1" + } + }, "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", @@ -6002,6 +6812,15 @@ "function-bind": "^1.1.1" } }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -6019,6 +6838,15 @@ } } }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "^0.2.0" + } + }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", @@ -6031,6 +6859,15 @@ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", "dev": true }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "dev": true, + "requires": { + "get-stdin": "^4.0.1" + } + }, "strip-json-comments": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", @@ -6115,6 +6952,17 @@ } } }, + "tar": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "dev": true, + "requires": { + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" + } + }, "term-size": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", @@ -6299,6 +7147,21 @@ "punycode": "^2.1.0" } }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "dev": true + }, + "true-case-path": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", + "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", + "dev": true, + "requires": { + "glob": "^7.1.2" + } + }, "tslib": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", @@ -6515,6 +7378,12 @@ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", "dev": true }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, "util.promisify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", @@ -6571,6 +7440,16 @@ } } }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -6671,6 +7550,48 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, + "requires": { + "string-width": "^1.0.2 || 2" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, "widest-line": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", diff --git a/package.json b/package.json index f7d23b5..ec3698e 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,8 @@ "eslint": "^6.8.0", "jest": "^25.1.0", "mem": ">=4.0.0", + "node-sass": "^4.14.1", + "node-sass-middleware": "^0.11.0", "nodemon": "^2.0.2", "request": "^2.88.0" }, From e851ef16b59b84d62307a2e6141b8650341e88dd Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sat, 23 May 2020 11:45:35 +0200 Subject: [PATCH 03/18] app: use sass instead of plain css --- app/app.js | 28 ++++++++++- app/views/home.hbs | 4 +- app/views/layout.hbs | 103 +---------------------------------------- assets/css/styles.css | 1 + assets/css/styles.scss | 103 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 133 insertions(+), 106 deletions(-) create mode 100644 assets/css/styles.css create mode 100644 assets/css/styles.scss diff --git a/app/app.js b/app/app.js index b433851..60193c8 100644 --- a/app/app.js +++ b/app/app.js @@ -10,9 +10,33 @@ const monitor = require('./middleware/monitor') const forceHttps = require('./middleware/force-https') const bodyParser = require('body-parser') const healthcheck = require('standard-healthcheck') +const sassMiddleware = require('node-sass-middleware') + +const PORT = process.env.PORT || '3000' let app = express() +// --- Static Assets --- + +const ASSETS_DIR = path.join(__dirname, './../assets') +const ASSETS_BASE_URL = process.env.NODE_ENV === 'development' + ? `http://localhost:${PORT}` + : process.env.ASSETS_BASE_URL // todo CDN Url + + +if (process.env.NODE_ENV === 'development') { + app.use(sassMiddleware({ + src: `${ASSETS_DIR}/css`, + dest: `${ASSETS_DIR}/css`, + debug: true, + outputStyle: 'compressed', + prefix: '/css' + })) + + app.use('/css', express.static(`${ASSETS_DIR}/css`)) + app.use('/images', express.static(`${ASSETS_DIR}/images`)) +} + // --- Middleware --- app.use(forceHttps) @@ -22,7 +46,6 @@ app.use(monitor) // --- Views --- -app.use(express.static(path.join(__dirname, './../assets'))) app.set('views', path.join(__dirname, '/views')) app.set('view engine', 'hbs') app.set('view options', { layout: 'layout' }) @@ -30,7 +53,8 @@ app.set('view options', { layout: 'layout' }) app.get('/', (req, res) => { res.render('home', { title: 'Node.js on Azure Demo', - version: 'v' + process.env.npm_package_version + version: 'v' + process.env.npm_package_version, + assetsBaseUrl: ASSETS_BASE_URL }) }) diff --git a/app/views/home.hbs b/app/views/home.hbs index 073d537..781e1e7 100644 --- a/app/views/home.hbs +++ b/app/views/home.hbs @@ -1,6 +1,6 @@
- - + +
diff --git a/app/views/layout.hbs b/app/views/layout.hbs index f8728e7..ae165a4 100644 --- a/app/views/layout.hbs +++ b/app/views/layout.hbs @@ -4,108 +4,7 @@ {{ title }} - +
diff --git a/assets/css/styles.css b/assets/css/styles.css new file mode 100644 index 0000000..3fc22db --- /dev/null +++ b/assets/css/styles.css @@ -0,0 +1 @@ +body{font-family:Helvetica, sans-serif;line-height:1.3;color:#333}a:link,a:visited{color:#044b7f}section{width:50%;max-width:1000px;margin:1em auto;border:1px solid transparent}h1{margin:1em 0;font-size:2rem;color:#222}h1 .version{color:#999;font-weight:normal}h2{margin:2em 0 1em 0}h3{font-weight:500}ul{padding:0;margin:0}li{margin-bottom:1em;list-style-type:none}.row{display:flex;flex-direction:row;flex-wrap:wrap;width:100%;margin-left:auto;margin-right:auto}.column{display:flex;flex-direction:column;flex-basis:100%;flex:1}.logos{margin-bottom:3em}.img-logo{display:inline-block;vertical-align:top}.img-logo--nodejs{height:70px}.img-logo--azure{margin-left:20px;margin-top:5px;height:40px}footer{margin:3rem auto;padding-top:1rem;border-top:1px solid #dcdcdc;font-size:0.85rem;line-height:1.6em;color:#999;text-align:left}footer p{margin:1em 0 2em}footer a:link,footer a:visited{color:#999} diff --git a/assets/css/styles.scss b/assets/css/styles.scss new file mode 100644 index 0000000..1061c6e --- /dev/null +++ b/assets/css/styles.scss @@ -0,0 +1,103 @@ +$light-text-color: #999; + +body { + font-family: Helvetica, sans-serif; + line-height: 1.3; + color: #333; +} + +a:link, a:visited { + color: #044b7f; +} + +section { + width: 50%; + max-width: 1000px; + margin: 1em auto; + border: 1px solid transparent; +} + +h1 { + margin: 1em 0; + font-size: 2rem; + color: #222; + + .version { + color: $light-text-color; + font-weight: normal; + } +} + +h2 { + margin: 2em 0 1em 0; +} + +h3 { + font-weight: 500; +} + +ul { + padding: 0; + margin: 0; +} + +li { + margin-bottom: 1em; + list-style-type: none; +} + +.row { + display: flex; + flex-direction: row; + flex-wrap: wrap; + width: 100%; + margin-left: auto; + margin-right: auto; + +} + +.column { + display: flex; + flex-direction: column; + flex-basis: 100%; + flex: 1; +} + +.logos { + margin-bottom: 3em; +} +.img-logo { + display: inline-block; + vertical-align: top; +} + +.img-logo--nodejs { + height: 70px; +} + +.img-logo--azure { + margin-left: 20px; + margin-top: 5px; + height: 40px; +} + +footer { + margin: 3rem auto; + padding-top: 1rem; + border-top: 1px solid #dcdcdc; + font-size: 0.85rem; + line-height: 1.6em; + color: $light-text-color; + text-align: left; +} + +footer { + p { + margin: 1em 0 2em; + } + + a:link, + a:visited { + color: $light-text-color; + } +} \ No newline at end of file From 80b893354aee4fc92875dd59ebde2dc8e91c29df Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sat, 23 May 2020 12:18:37 +0200 Subject: [PATCH 04/18] ignore compiled css files --- .gitignore | 5 ++++- assets/css/styles.css | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 assets/css/styles.css diff --git a/.gitignore b/.gitignore index fc7690f..0d84af9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ coverage/ node_modules/ .DS_Store -*.azcli \ No newline at end of file +*.azcli + +# Compiled CSS +assets/css/*.css \ No newline at end of file diff --git a/assets/css/styles.css b/assets/css/styles.css deleted file mode 100644 index 3fc22db..0000000 --- a/assets/css/styles.css +++ /dev/null @@ -1 +0,0 @@ -body{font-family:Helvetica, sans-serif;line-height:1.3;color:#333}a:link,a:visited{color:#044b7f}section{width:50%;max-width:1000px;margin:1em auto;border:1px solid transparent}h1{margin:1em 0;font-size:2rem;color:#222}h1 .version{color:#999;font-weight:normal}h2{margin:2em 0 1em 0}h3{font-weight:500}ul{padding:0;margin:0}li{margin-bottom:1em;list-style-type:none}.row{display:flex;flex-direction:row;flex-wrap:wrap;width:100%;margin-left:auto;margin-right:auto}.column{display:flex;flex-direction:column;flex-basis:100%;flex:1}.logos{margin-bottom:3em}.img-logo{display:inline-block;vertical-align:top}.img-logo--nodejs{height:70px}.img-logo--azure{margin-left:20px;margin-top:5px;height:40px}footer{margin:3rem auto;padding-top:1rem;border-top:1px solid #dcdcdc;font-size:0.85rem;line-height:1.6em;color:#999;text-align:left}footer p{margin:1em 0 2em}footer a:link,footer a:visited{color:#999} From 332480af1f8ac02f01217815ffa6ba99ed47b41a Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sat, 23 May 2020 12:24:02 +0200 Subject: [PATCH 05/18] style: rename ASSETS_DIR to assetsDir --- app/app.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/app.js b/app/app.js index 60193c8..df76a86 100644 --- a/app/app.js +++ b/app/app.js @@ -18,23 +18,20 @@ let app = express() // --- Static Assets --- -const ASSETS_DIR = path.join(__dirname, './../assets') -const ASSETS_BASE_URL = process.env.NODE_ENV === 'development' - ? `http://localhost:${PORT}` - : process.env.ASSETS_BASE_URL // todo CDN Url - +const assetsDir = path.join(__dirname, './../assets') +const ASSETS_BASE_URL = process.env.ASSETS_BASE_URL || `http://localhost:${PORT}` if (process.env.NODE_ENV === 'development') { app.use(sassMiddleware({ - src: `${ASSETS_DIR}/css`, - dest: `${ASSETS_DIR}/css`, + src: `${assetsDir}/css`, + dest: `${assetsDir}/css`, debug: true, outputStyle: 'compressed', prefix: '/css' })) - app.use('/css', express.static(`${ASSETS_DIR}/css`)) - app.use('/images', express.static(`${ASSETS_DIR}/images`)) + app.use('/css', express.static(`${assetsDir}/css`)) + app.use('/images', express.static(`${assetsDir}/images`)) } // --- Middleware --- From bc08afde627d6c56060620a8d04aec1b3b3d7f88 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sat, 23 May 2020 12:28:16 +0200 Subject: [PATCH 06/18] add compile sass script --- assets/compile-sass.js | 29 +++++++++++++++++++++++++++++ package.json | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 assets/compile-sass.js diff --git a/assets/compile-sass.js b/assets/compile-sass.js new file mode 100644 index 0000000..75f74a9 --- /dev/null +++ b/assets/compile-sass.js @@ -0,0 +1,29 @@ +const fs = require('fs') +const path = require('path') +const sass = require('node-sass') + +const appVersion = process.env.npm_package_version + +const sourceFile = path.join(__dirname, 'css/styles.css') +const outFile = path.join(__dirname, `css/styles-${appVersion}.css`) +const opts = { + file: sourceFile, + outputStyle: 'compressed' +} + +sass.render(opts, function (err, result) { + if (result) { + console.log('COMPILED CSS') + console.log('-------------') + console.log(result.css.toString()) + fs.writeFileSync(outFile, result.css.toString()) + process.exit(0) + } + + if (err) { + console.error('Error: could not compile sass:') + console.log(err) + } + + process.exit(1) +}) diff --git a/package.json b/package.json index ec3698e..7d67aaa 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "release": "standard-version --sign", "test": "jest", "test:watch": "jest --watch", - "preflight": "NODE_ENV=test npm audit && npm run lint && npm run test" + "preflight": "NODE_ENV=test npm audit && npm run lint && npm run test", + "compile-sass": "node ./assets/compile-sass.js" }, "dependencies": { "applicationinsights": "^1.4.2", From 0a1c48d92693c6f027a4eeb5eed88ca1269a0b69 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sat, 23 May 2020 12:28:39 +0200 Subject: [PATCH 07/18] pass css file as variable to view --- app/app.js | 10 ++++++++-- app/views/layout.hbs | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/app.js b/app/app.js index df76a86..4ee45d6 100644 --- a/app/app.js +++ b/app/app.js @@ -13,15 +13,20 @@ const healthcheck = require('standard-healthcheck') const sassMiddleware = require('node-sass-middleware') const PORT = process.env.PORT || '3000' +const IS_DEVELOPMENT = process.env.NODE_ENV === 'development' +const ASSETS_BASE_URL = process.env.ASSETS_BASE_URL || `http://localhost:${PORT}` let app = express() // --- Static Assets --- const assetsDir = path.join(__dirname, './../assets') -const ASSETS_BASE_URL = process.env.ASSETS_BASE_URL || `http://localhost:${PORT}` +const cssFile = IS_DEVELOPMENT + ? 'styles.css' + : `styles-${process.env.npm_package_version}.css` +const cssFileUrl = `${ASSETS_BASE_URL}/css/${cssFile}` -if (process.env.NODE_ENV === 'development') { +if (IS_DEVELOPMENT) { app.use(sassMiddleware({ src: `${assetsDir}/css`, dest: `${assetsDir}/css`, @@ -51,6 +56,7 @@ app.get('/', (req, res) => { res.render('home', { title: 'Node.js on Azure Demo', version: 'v' + process.env.npm_package_version, + cssFileUrl: cssFileUrl, assetsBaseUrl: ASSETS_BASE_URL }) }) diff --git a/app/views/layout.hbs b/app/views/layout.hbs index ae165a4..7b3f5ad 100644 --- a/app/views/layout.hbs +++ b/app/views/layout.hbs @@ -4,7 +4,7 @@ {{ title }} - +
From 85706b5145f7626a9f725b02280527831f3280d3 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 09:08:36 +0200 Subject: [PATCH 08/18] healthcheck: add ASSETS_BASE_URL and NODE_ENV --- app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app.js b/app/app.js index 4ee45d6..f467998 100644 --- a/app/app.js +++ b/app/app.js @@ -76,7 +76,7 @@ app.post('/webhooks/test', bodyParser.json(), (req, res) => { app.get('/health', healthcheck({ version: process.env.npm_package_version, description: process.env.npm_package_description, - includeEnv: ['WEBSITE_HOSTNAME', 'WEBSITE_INSTANCE_ID'] + includeEnv: ['WEBSITE_HOSTNAME', 'WEBSITE_INSTANCE_ID', 'ASSETS_BASE_URL', 'NODE_ENV'] })) app.use((req, res, next) => { From c87297e856a2088852469040f3b7cd482a02f718 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 09:09:59 +0200 Subject: [PATCH 09/18] express: use static assets in prod too - in case CDN fails --- app/app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/app.js b/app/app.js index f467998..c32cd25 100644 --- a/app/app.js +++ b/app/app.js @@ -34,11 +34,11 @@ if (IS_DEVELOPMENT) { outputStyle: 'compressed', prefix: '/css' })) - - app.use('/css', express.static(`${assetsDir}/css`)) - app.use('/images', express.static(`${assetsDir}/images`)) } +app.use('/css', express.static(`${assetsDir}/css`)) +app.use('/images', express.static(`${assetsDir}/images`)) + // --- Middleware --- app.use(forceHttps) From 378ef2fbdfbdd61c1b8e80d4e7cef0e58bd53d3d Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 09:11:09 +0200 Subject: [PATCH 10/18] assets-url: use app service hostname as failback before localhost --- app/app.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/app.js b/app/app.js index c32cd25..5b1786f 100644 --- a/app/app.js +++ b/app/app.js @@ -14,7 +14,12 @@ const sassMiddleware = require('node-sass-middleware') const PORT = process.env.PORT || '3000' const IS_DEVELOPMENT = process.env.NODE_ENV === 'development' -const ASSETS_BASE_URL = process.env.ASSETS_BASE_URL || `http://localhost:${PORT}` +const AZURE_APP_SERVICE_HOSTNAME = process.env.WEBSITE_HOSTNAME + ? `https://${process.env.WEBSITE_HOSTNAME}` + : false +const ASSETS_BASE_URL = process.env.ASSETS_BASE_URL + || AZURE_APP_SERVICE_HOSTNAME + || `http://localhost:${PORT}` let app = express() From e76a4fa8c82fd42d7077860d44c99cd4cbc9a432 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 09:37:49 +0200 Subject: [PATCH 11/18] dockerfile: add assets dir --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index fa405b2..35c1883 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ WORKDIR /workspace COPY ["package.json", "package-lock.json", "./"] RUN npm install --production +COPY ["assets/", "/workspace/assets/"] COPY ["app/", "/workspace/app/"] EXPOSE ${PORT:-80} From a9c1dae345e693f84afc8a1c9341764bb81782dd Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 09:38:06 +0200 Subject: [PATCH 12/18] force-https: only in prod --- app/middleware/force-https.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/middleware/force-https.js b/app/middleware/force-https.js index db4ae7a..df88c9d 100644 --- a/app/middleware/force-https.js +++ b/app/middleware/force-https.js @@ -1,7 +1,7 @@ 'use strict' function isDeployed () { - return process.env.NODE_ENV !== 'development' && process.env.NODE_ENV !== 'test' + return process.env.NODE_ENV === 'production' } function https (req, res, next) { From 292b63161915dc79c1e3d0becc54e7830d4dd386 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 09:39:09 +0200 Subject: [PATCH 13/18] sass-middleware: use only in DEV. Other envs use static files or cdn/storage --- app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/app.js b/app/app.js index 5b1786f..4164f9c 100644 --- a/app/app.js +++ b/app/app.js @@ -10,7 +10,6 @@ const monitor = require('./middleware/monitor') const forceHttps = require('./middleware/force-https') const bodyParser = require('body-parser') const healthcheck = require('standard-healthcheck') -const sassMiddleware = require('node-sass-middleware') const PORT = process.env.PORT || '3000' const IS_DEVELOPMENT = process.env.NODE_ENV === 'development' @@ -32,6 +31,7 @@ const cssFile = IS_DEVELOPMENT const cssFileUrl = `${ASSETS_BASE_URL}/css/${cssFile}` if (IS_DEVELOPMENT) { + const sassMiddleware = require('node-sass-middleware') app.use(sassMiddleware({ src: `${assetsDir}/css`, dest: `${assetsDir}/css`, From afc134035abfde35df596633992432410f971e87 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 09:42:50 +0200 Subject: [PATCH 14/18] style: use strict --- assets/compile-sass.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/compile-sass.js b/assets/compile-sass.js index 75f74a9..b72abb4 100644 --- a/assets/compile-sass.js +++ b/assets/compile-sass.js @@ -1,3 +1,5 @@ +'use strict' + const fs = require('fs') const path = require('path') const sass = require('node-sass') From b434e2a1cc02eb08c9d508065fbee5ce75c878be Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 09:43:19 +0200 Subject: [PATCH 15/18] test: re-enable all tests. match homepage against heading cannot match against raw template, which now has variables --- app/app.test.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/app.test.js b/app/app.test.js index b93ff75..1ebc088 100644 --- a/app/app.test.js +++ b/app/app.test.js @@ -4,8 +4,6 @@ const app = require('./app') const request = require('request') const http = require('http') -const path = require('path') -const fs = require('fs') const port = process.env.PORT || 3001 @@ -21,9 +19,9 @@ describe ('app', () => { }) describe ('GET /', () => { - fit (`returns 'Hello World!`, (done) => { + it (`returns Homepage`, (done) => { const url = getUrl('/') - const content = fs.readFileSync(path.join(__dirname, '/views/home.hbs')).toString() + const content = 'Node.js on Azure Demo' request.get(url, (error, response, body) => { expect(response.statusCode).toBe(200) expect(response.body.includes(content)).toBe(true) From 282be12a6a6ddd921552dc18617beadf74f4f9b6 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 12:11:19 +0200 Subject: [PATCH 16/18] compile-sass: fix source path, adjust writes, move outside assets/ - the `styles.css` file will be overwritten - the versioned file, e.g. `styles-v1.4` will not be overwritten - compile-sass.js moved outside assets/ folder so Azure CLI does not copy to Storage Account the `--pattern` flag is too limited to exclude the file. --- assets/compile-sass.js | 31 ------------------------------ compile-sass.js | 43 ++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 3 files changed, 44 insertions(+), 32 deletions(-) delete mode 100644 assets/compile-sass.js create mode 100644 compile-sass.js diff --git a/assets/compile-sass.js b/assets/compile-sass.js deleted file mode 100644 index b72abb4..0000000 --- a/assets/compile-sass.js +++ /dev/null @@ -1,31 +0,0 @@ -'use strict' - -const fs = require('fs') -const path = require('path') -const sass = require('node-sass') - -const appVersion = process.env.npm_package_version - -const sourceFile = path.join(__dirname, 'css/styles.css') -const outFile = path.join(__dirname, `css/styles-${appVersion}.css`) -const opts = { - file: sourceFile, - outputStyle: 'compressed' -} - -sass.render(opts, function (err, result) { - if (result) { - console.log('COMPILED CSS') - console.log('-------------') - console.log(result.css.toString()) - fs.writeFileSync(outFile, result.css.toString()) - process.exit(0) - } - - if (err) { - console.error('Error: could not compile sass:') - console.log(err) - } - - process.exit(1) -}) diff --git a/compile-sass.js b/compile-sass.js new file mode 100644 index 0000000..ced043a --- /dev/null +++ b/compile-sass.js @@ -0,0 +1,43 @@ +'use strict' + +const fs = require('fs') +const path = require('path') +const sass = require('node-sass') + +const appVersion = process.env.npm_package_version + +const sourceFile = path.join(__dirname, 'assets/css/styles.scss') +const outFile = path.join(__dirname, `assets/css/styles.css`) +const outFileVersioned = path.join(__dirname, `assets/css/styles-${appVersion}.css`) +const opts = { + file: sourceFile, + outputStyle: 'compressed' +} + +sass.render(opts, function (err, result) { + if (result) { + const css = result.css.toString() + console.log('[Compiled CSS]') + console.log(css) + + // Always write styles.css + fs.writeFileSync(outFile, css) + console.log('[Created] styles.css') + + // Only write versioned file if doesn't exist + try { + fs.writeFileSync(outFileVersioned, css, { flag: 'wx' }) + console.log(`[Created] styles-${appVersion}.css`) + } catch (e) { + console.log(`[Skipped] styles-${appVersion}.css already exists`) + } + process.exit(0) + } + + if (err) { + console.error('Error: could not compile sass:') + console.log(err) + } + + process.exit(1) +}) diff --git a/package.json b/package.json index 7d67aaa..f9016dd 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "test": "jest", "test:watch": "jest --watch", "preflight": "NODE_ENV=test npm audit && npm run lint && npm run test", - "compile-sass": "node ./assets/compile-sass.js" + "compile-sass": "node compile-sass.js" }, "dependencies": { "applicationinsights": "^1.4.2", From 2a9b51244e1fb510f38edbf958b0460a0bc8fe68 Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 12:14:38 +0200 Subject: [PATCH 17/18] pipeline: add upload assets to blob storage account --- azure-pipelines.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3a3022e..d52fc66 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -54,6 +54,15 @@ variables: - name: image-tag value: 'dev' # default + - name: storage-account-name + value: 'demoassetpipeline' + + - name: storage-container-dev + value: 'nodejs-dev' + + - name: storage-container + value: 'nodejs' + - name: is-dev value: ${{ eq(variables['Build.SourceBranch'], 'refs/heads/master') }} @@ -129,6 +138,30 @@ stages: imageName: $(image-name) imageTag: $(image-tag) +# --- Stage: Asset Pipeline --- + +- stage: AssetPipeline + displayName: 'Asset pipeline' + jobs: + - job: build_and_publish + steps: + - script: | + npm install + npm run compile-sass + displayName: 'Compile Sass to CSS' + + - task: AzureCLI@2 + displayName: az storage blob upload-batch + inputs: + azureSubscription: $(lib-var-arm-connection) + scriptType: bash + scriptLocation: inlineScript + inlineScript: | + az --version + az storage blob upload-batch \ + --account-name $(storage-account-name) \ + --source ./assets \ + --destination $(storage-container-dev) # --- Stage: deploy to Azure App Services --- From 62302c2d61e6ed6b4ba87543bff22d46c15af56d Mon Sep 17 00:00:00 2001 From: Julie Ng Date: Sun, 24 May 2020 12:19:03 +0200 Subject: [PATCH 18/18] style(pipeline-yaml): move pool obj to root --- azure-pipelines.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d52fc66..8e8de9b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,6 +6,8 @@ trigger: - master - release +pool: + vmImage: 'ubuntu-latest' # Schedule # --------- @@ -82,8 +84,6 @@ stages: jobs: - job: Audit displayName: Audit Dependencies - pool: - vmImage: 'ubuntu-latest' steps: - script: npm audit --audit-level=moderate displayName: Audit (Dev) @@ -93,16 +93,12 @@ stages: - job: Linter displayName: Lint Code - pool: - vmImage: 'ubuntu-latest' steps: - script: npm ci && npm run lint displayName: Lint Code - job: UnitTests displayName: Unit Tests - pool: - vmImage: 'ubuntu-latest' steps: - script: npm ci && npm run test displayName: Run Tests