diff --git a/gulpfile.js b/gulpfile.js index 5c1c63bd..9bb6f394 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,6 +4,8 @@ const { parallel } = require('gulp'); +const fileinclude = require('gulp-file-include'); + const csso = require('gulp-csso'); const concat = require('gulp-concat'); @@ -108,6 +110,10 @@ const build = { }, html: function() { return src(path.src + '/index.html') + .pipe(fileinclude({ + prefix: '@@', + basepath: '@file' + })) .pipe(replace(/\<\!\-\-\ css\-block\ \-\-\>([\s\S]*)\<\!\-\-\ end\-css\-block\ \-\-\>/mg, '')) .pipe(replace(/\<\!\-\-\ js\-block\ \-\-\>([\s\S]*)\<\!\-\-\ end\-js\-block\ \-\-\>/mg, '')) .pipe(htmlmin({ @@ -156,10 +162,14 @@ const dev = { }) }, html: function() { - watch(path.src + '/index.html', { + watch(path.src + '/**/*.html', { ignoreInitial: false }, function() { return src(path.src + '/index.html') + .pipe(fileinclude({ + prefix: '@@', + basepath: '@file' + })) .pipe(dest(path.dev)) }) }, diff --git a/package-lock.json b/package-lock.json index 4febf96f..cc0ddccb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nightTab", - "version": "4.33.0", + "version": "4.34.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3718,6 +3718,12 @@ } } }, + "flatnest": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/flatnest/-/flatnest-1.0.0.tgz", + "integrity": "sha1-IEIa0FtGxjytMO8UqOxiX4az8cU=", + "dev": true + }, "flatstr": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/flatstr/-/flatstr-1.0.12.tgz", @@ -4926,6 +4932,67 @@ "vinyl-sourcemaps-apply": "^0.2.1" } }, + "gulp-file-include": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/gulp-file-include/-/gulp-file-include-2.1.1.tgz", + "integrity": "sha512-jZ/of95c/2HIM+tSvY25B6Ou7PKIgBgBPMtUQPzkxaOEgRItPBdjj3SsY26IBlafvB2a6c8AQCdWF8c7+BVTZQ==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-stream": "^2.0.0", + "extend": "^3.0.2", + "flatnest": "^1.0.0", + "plugin-error": "^1.0.1", + "through2": "^3.0.1", + "vinyl": "^2.2.0" + }, + "dependencies": { + "concat-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.0.2", + "typedarray": "^0.0.6" + } + }, + "plugin-error": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", + "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", + "dev": true, + "requires": { + "ansi-colors": "^1.0.1", + "arr-diff": "^4.0.0", + "arr-union": "^3.1.0", + "extend-shallow": "^3.0.2" + } + }, + "readable-stream": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz", + "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + }, + "through2": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz", + "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==", + "dev": true, + "requires": { + "readable-stream": "2 || 3" + } + } + } + }, "gulp-filter": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-6.0.0.tgz", diff --git a/package.json b/package.json index 34d1bdfb..ad3da3f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nightTab", - "version": "4.33.0", + "version": "4.34.0", "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.", "main": "index.js", "scripts": { @@ -43,6 +43,7 @@ "gulp-cli": "^2.2.0", "gulp-concat": "^2.6.1", "gulp-csso": "^3.0.1", + "gulp-file-include": "^2.1.1", "gulp-filter": "^6.0.0", "gulp-htmlmin": "^5.0.1", "gulp-replace": "^1.0.0", diff --git a/src/html/background.html b/src/html/background.html new file mode 100644 index 00000000..990348b4 --- /dev/null +++ b/src/html/background.html @@ -0,0 +1,4 @@ +
+
+
+
diff --git a/src/html/layout.html b/src/html/layout.html new file mode 100644 index 00000000..49b121c1 --- /dev/null +++ b/src/html/layout.html @@ -0,0 +1,89 @@ +
+ +
+
+
+
+
+
+
+

+
+
+
+
+

+
+
+
+
+

+
+
+
+
+

+
+
+ +
+
+
+
+ + +
+
+ +
    +
  • + +
  • +
  • + +
  • +
+
+
+
+
+
+
+
+
+ + +
+
+ + +
+
+
+
+
+
+ +
+
+
+
+
+ + + +
diff --git a/src/html/link-css.html b/src/html/link-css.html new file mode 100644 index 00000000..dd00a12a --- /dev/null +++ b/src/html/link-css.html @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/html/menu.html b/src/html/menu.html new file mode 100644 index 00000000..07e9b37a --- /dev/null +++ b/src/html/menu.html @@ -0,0 +1,29 @@ + diff --git a/src/html/menu/menu-content/background.html b/src/html/menu/menu-content/background.html new file mode 100644 index 00000000..96554fe8 --- /dev/null +++ b/src/html/menu/menu-content/background.html @@ -0,0 +1,140 @@ + diff --git a/src/html/menu/menu-content/bookmarks.html b/src/html/menu/menu-content/bookmarks.html new file mode 100644 index 00000000..4448f570 --- /dev/null +++ b/src/html/menu/menu-content/bookmarks.html @@ -0,0 +1,369 @@ + diff --git a/src/html/menu/menu-content/coffee.html b/src/html/menu/menu-content/coffee.html new file mode 100644 index 00000000..0251e19f --- /dev/null +++ b/src/html/menu/menu-content/coffee.html @@ -0,0 +1,19 @@ + diff --git a/src/html/menu/menu-content/data.html b/src/html/menu/menu-content/data.html new file mode 100644 index 00000000..34f268ec --- /dev/null +++ b/src/html/menu/menu-content/data.html @@ -0,0 +1,50 @@ + diff --git a/src/html/menu/menu-content/groups.html b/src/html/menu/menu-content/groups.html new file mode 100644 index 00000000..f70a1d52 --- /dev/null +++ b/src/html/menu/menu-content/groups.html @@ -0,0 +1,83 @@ + diff --git a/src/html/menu/menu-content/header.html b/src/html/menu/menu-content/header.html new file mode 100644 index 00000000..2b5c2f77 --- /dev/null +++ b/src/html/menu/menu-content/header.html @@ -0,0 +1,684 @@ + diff --git a/src/html/menu/menu-content/layout.html b/src/html/menu/menu-content/layout.html new file mode 100644 index 00000000..5a4124b8 --- /dev/null +++ b/src/html/menu/menu-content/layout.html @@ -0,0 +1,168 @@ + diff --git a/src/html/menu/menu-content/nightTab.html b/src/html/menu/menu-content/nightTab.html new file mode 100644 index 00000000..705794cc --- /dev/null +++ b/src/html/menu/menu-content/nightTab.html @@ -0,0 +1,21 @@ + diff --git a/src/html/menu/menu-content/theme.html b/src/html/menu/menu-content/theme.html new file mode 100644 index 00000000..3a75e33b --- /dev/null +++ b/src/html/menu/menu-content/theme.html @@ -0,0 +1,434 @@ + diff --git a/src/html/menu/menu-nav.html b/src/html/menu/menu-nav.html new file mode 100644 index 00000000..1f33d54d --- /dev/null +++ b/src/html/menu/menu-nav.html @@ -0,0 +1,16 @@ + diff --git a/src/html/script-js.html b/src/html/script-js.html new file mode 100644 index 00000000..dfce2ead --- /dev/null +++ b/src/html/script-js.html @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/index.html b/src/index.html index aa1e4ae7..34c25746 100644 --- a/src/index.html +++ b/src/index.html @@ -6,2178 +6,21 @@ New Tab - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@include("./html/link-css.html") + -
-
-
-
+ @@include("./html/background.html") -
+ @@include("./html/layout.html") -
-
-
-
-
-
-
-

-
-
-
-
-

-
-
-
-
-

-
-
-
-
-

-
-
- -
-
-
-
- - -
-
- -
    -
  • - -
  • -
  • - -
  • -
-
-
-
-
-
-
-
-
- - -
-
- - -
-
-
-
-
-
- -
-
-
-
-
+ @@include("./html/menu.html") - - -
- - + @@include("./html/script-js.html") - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/js/version.js b/src/js/version.js index cdfce390..929ed717 100644 --- a/src/js/version.js +++ b/src/js/version.js @@ -1,6 +1,6 @@ var version = (function() { - var current = "4.33.0"; + var current = "4.34.0"; var name = "Naughty Goose"; diff --git a/src/manifest.json b/src/manifest.json index a22c7125..22ee99b9 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "name": "nightTab", "short_name": "nightTab", "description": "A neutral new tab page accented with a chosen colour. Customise the layout, style, background and bookmarks in nightTab.", - "version": "4.33.0", + "version": "4.34.0", "manifest_version": 2, "chrome_url_overrides": { "newtab": "index.html"