diff --git a/gulpfile.js b/gulpfile.js index 7e6729e2..b6b809e7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -15,7 +15,7 @@ const config = require(__dirname+'/config.js') , realFavicon = require('gulp-real-favicon') , del = require('del') , pug = require('pug') - , gulppug = require('@fatchan/gulp-pug') + , gulppug = require('gulp-pug') , { migrateVersion, version } = require(__dirname+'/package.json') , { randomBytes } = require('crypto') , Redis = require(__dirname+'/redis.js') diff --git a/package-lock.json b/package-lock.json index 82b803cc..218c0846 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "0.1.8", "license": "AGPL-3.0-only", "dependencies": { - "@fatchan/gulp-pug": "^4.0.1", "bcrypt": "^5.0.1", "bull": "^3.29.3", "cache-pug-templates": "^2.0.3", @@ -31,6 +30,7 @@ "gulp-clean-css": "^4.3.0", "gulp-concat": "^2.6.1", "gulp-less": "^5.0.0", + "gulp-pug": "^5.0.0", "gulp-real-favicon": "^0.3.2", "gulp-replace": "^1.1.3", "gulp-uglify-es": "^3.0.0", @@ -1615,22 +1615,6 @@ "@canvas/image-data": "^1.0.0" } }, - "node_modules/@fatchan/gulp-pug": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@fatchan/gulp-pug/-/gulp-pug-4.0.1.tgz", - "integrity": "sha512-BDCcBX1OIjjLMRVzFPSzbclxPdIuDaHABfy2Lh0KLiyQgcOujVNTx02pYJZNv1JdxIS6KnSIEZZxjxmUxAUYAw==", - "dependencies": { - "@types/pug": "^2.0.4", - "fancy-log": "^1.3.3", - "plugin-error": "^1.0.1", - "pug": "^3.0.2", - "replace-ext": "^1.0.0", - "through2": "^3.0.1" - }, - "engines": { - "node": ">= 6.0.0" - } - }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -2287,11 +2271,6 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.21.tgz", "integrity": "sha512-zv8ukKci1mrILYiQOwGSV4FpkZhyxQtuFWGya2GujWg+zVAeRQ4qbaMmWp9vb9889CFA8JECH7lkwCL6Ygg8kA==" }, - "node_modules/@types/pug": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.5.tgz", - "integrity": "sha512-LOnASQoeNZMkzexRuyqcBBDZ6rS+rQxUMkmj5A0PkhhiSZivLIuz6Hxyr1mkGoEZEkk66faROmpMi4fFkrKsBA==" - }, "node_modules/@types/vinyl": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz", @@ -3324,6 +3303,14 @@ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "optional": true }, + "node_modules/bl": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz", + "integrity": "sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ==", + "dependencies": { + "readable-stream": "^3.0.1" + } + }, "node_modules/blessed": { "version": "0.1.81", "resolved": "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz", @@ -6719,6 +6706,38 @@ "readable-stream": "3" } }, + "node_modules/gulp-pug": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/gulp-pug/-/gulp-pug-5.0.0.tgz", + "integrity": "sha512-NPnuj9hw35s78X/6Ho0vieKT/ipa0rh8cEAq3R4RWybZ7XEFPNez0O6kcxJipOLp3U6gjglsU1yiAR28bkuFkA==", + "dependencies": { + "fancy-log": "^1.3.3", + "plugin-error": "^1.0.1", + "pug": "^3.0.2", + "replace-ext": "^2.0.0", + "through2": "^4.0.2", + "vinyl-contents": "^1.0.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/gulp-pug/node_modules/replace-ext": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", + "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", + "engines": { + "node": ">= 10" + } + }, + "node_modules/gulp-pug/node_modules/through2": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "dependencies": { + "readable-stream": "3" + } + }, "node_modules/gulp-real-favicon": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/gulp-real-favicon/-/gulp-real-favicon-0.3.2.tgz", @@ -12507,15 +12526,6 @@ "url": "https://bevry.me/fund" } }, - "node_modules/through2": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", - "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", - "dependencies": { - "inherits": "^2.0.4", - "readable-stream": "2 || 3" - } - }, "node_modules/through2-filter": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz", @@ -13165,6 +13175,19 @@ "node": ">= 0.10" } }, + "node_modules/vinyl-contents": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-1.0.0.tgz", + "integrity": "sha512-xBH8ZUy8IK7K06eCBmd2GGjdf1EqNEGPNfRP2VsrCvSvsOggywGCGZg435WZiG/kcyCdXc1CZXCf4pUJ2EuEsg==", + "dependencies": { + "bl": "^3.0.0", + "readable-stream": "^3.3.0", + "vinyl": "^2.2.0" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/vinyl-fs": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", @@ -14588,19 +14611,6 @@ "@canvas/image-data": "^1.0.0" } }, - "@fatchan/gulp-pug": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@fatchan/gulp-pug/-/gulp-pug-4.0.1.tgz", - "integrity": "sha512-BDCcBX1OIjjLMRVzFPSzbclxPdIuDaHABfy2Lh0KLiyQgcOujVNTx02pYJZNv1JdxIS6KnSIEZZxjxmUxAUYAw==", - "requires": { - "@types/pug": "^2.0.4", - "fancy-log": "^1.3.3", - "plugin-error": "^1.0.1", - "pug": "^3.0.2", - "replace-ext": "^1.0.0", - "through2": "^3.0.1" - } - }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -15137,11 +15147,6 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.21.tgz", "integrity": "sha512-zv8ukKci1mrILYiQOwGSV4FpkZhyxQtuFWGya2GujWg+zVAeRQ4qbaMmWp9vb9889CFA8JECH7lkwCL6Ygg8kA==" }, - "@types/pug": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.5.tgz", - "integrity": "sha512-LOnASQoeNZMkzexRuyqcBBDZ6rS+rQxUMkmj5A0PkhhiSZivLIuz6Hxyr1mkGoEZEkk66faROmpMi4fFkrKsBA==" - }, "@types/vinyl": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz", @@ -15953,6 +15958,14 @@ } } }, + "bl": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz", + "integrity": "sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ==", + "requires": { + "readable-stream": "^3.0.1" + } + }, "blessed": { "version": "0.1.81", "resolved": "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz", @@ -18732,6 +18745,34 @@ } } }, + "gulp-pug": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/gulp-pug/-/gulp-pug-5.0.0.tgz", + "integrity": "sha512-NPnuj9hw35s78X/6Ho0vieKT/ipa0rh8cEAq3R4RWybZ7XEFPNez0O6kcxJipOLp3U6gjglsU1yiAR28bkuFkA==", + "requires": { + "fancy-log": "^1.3.3", + "plugin-error": "^1.0.1", + "pug": "^3.0.2", + "replace-ext": "^2.0.0", + "through2": "^4.0.2", + "vinyl-contents": "^1.0.0" + }, + "dependencies": { + "replace-ext": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", + "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==" + }, + "through2": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "requires": { + "readable-stream": "3" + } + } + } + }, "gulp-real-favicon": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/gulp-real-favicon/-/gulp-real-favicon-0.3.2.tgz", @@ -23209,15 +23250,6 @@ "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz", "integrity": "sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==" }, - "through2": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz", - "integrity": "sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==", - "requires": { - "inherits": "^2.0.4", - "readable-stream": "2 || 3" - } - }, "through2-filter": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz", @@ -23745,6 +23777,16 @@ "replace-ext": "^1.0.0" } }, + "vinyl-contents": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-1.0.0.tgz", + "integrity": "sha512-xBH8ZUy8IK7K06eCBmd2GGjdf1EqNEGPNfRP2VsrCvSvsOggywGCGZg435WZiG/kcyCdXc1CZXCf4pUJ2EuEsg==", + "requires": { + "bl": "^3.0.0", + "readable-stream": "^3.3.0", + "vinyl": "^2.2.0" + } + }, "vinyl-fs": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz", diff --git a/package.json b/package.json index c86fb75a..cf257d48 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "description": "", "main": "server.js", "dependencies": { - "@fatchan/gulp-pug": "^4.0.1", "bcrypt": "^5.0.1", "bull": "^3.29.3", "cache-pug-templates": "^2.0.3", @@ -27,6 +26,7 @@ "gulp-clean-css": "^4.3.0", "gulp-concat": "^2.6.1", "gulp-less": "^5.0.0", + "gulp-pug": "^5.0.0", "gulp-real-favicon": "^0.3.2", "gulp-replace": "^1.1.3", "gulp-uglify-es": "^3.0.0",