From b62a56ffe96c8488ca1ebb2cea7b0ca83c32f274 Mon Sep 17 00:00:00 2001 From: saurabhdaware Date: Thu, 26 Nov 2020 21:29:24 +0530 Subject: [PATCH 1/6] 0.9.0-alpha.1 - ignoreInOutput configuration --- CHANGELOG.md | 15 +++++++++++++++ package.json | 4 ++-- src/utils/generate-site.js | 5 ++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22432db7..a1d92a3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog +## v0.9.0-alpha.1 `abell@next` + +Adds `ignoreInOutput` configuration again (It was possible in earlier Abell versions) + +You can pass an array of file/folder which should be ignored when generating output. + +If there are files that output some other file. You can use this to ignore source files. + +```js +// abell.config.js +module.exports = { + ignoreInOutput: ['styles.scss'] +}; +``` + ## v0.8.0 `abell@latest` - Add `Abell.programInfo` variable with information about paths and abell process. diff --git a/package.json b/package.json index 9c2c992f..d621058b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "abell", - "version": "0.8.0", + "version": "0.9.0-alpha.1", "description": "Abell is a static blog generator that generates blog in Vanilla JavaScript", "funding": { "type": "patreon", @@ -63,4 +63,4 @@ "pre-commit": "npm run prettier && eslint . --fix && npm run eslint" } } -} +} \ No newline at end of file diff --git a/src/utils/generate-site.js b/src/utils/generate-site.js index d9f05866..9f7c5356 100644 --- a/src/utils/generate-site.js +++ b/src/utils/generate-site.js @@ -233,7 +233,10 @@ async function generateSite(programInfo) { const ignoreCopying = [ ...importedFiles, - ...recursiveFindFiles(programInfo.abellConfig.themePath, '.abell') + ...recursiveFindFiles(programInfo.abellConfig.themePath, '.abell'), + ...(programInfo.abellConfig.ignoreInOutput || []).map((pathToIgnore) => + path.join(programInfo.abellConfig.themePath, pathToIgnore) + ) ]; // Copy everything from src to dist except the ones mentioned in ignoreCopying. From ab980f53bfe31999623b0ddf81042e74ee485bec Mon Sep 17 00:00:00 2001 From: saurabhdaware Date: Thu, 3 Dec 2020 20:23:17 +0530 Subject: [PATCH 2/6] static files built added to logs --- CHANGELOG.md | 7 +++++-- package.json | 2 +- src/utils/generate-site.js | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1d92a3e..2be812fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ # Changelog -## v0.9.0-alpha.1 `abell@next` +## v0.9.0-alpha.2 `abell@next` -Adds `ignoreInOutput` configuration again (It was possible in earlier Abell versions) +- **ignoreInOutput** + Adds `ignoreInOutput` configuration again (It was possible in earlier Abell versions) You can pass an array of file/folder which should be ignored when generating output. @@ -15,6 +16,8 @@ module.exports = { }; ``` +- "Built Static Files" Added to Logs. + ## v0.8.0 `abell@latest` - Add `Abell.programInfo` variable with information about paths and abell process. diff --git a/package.json b/package.json index d621058b..60e0bbdc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "abell", - "version": "0.9.0-alpha.1", + "version": "0.9.0-alpha.2", "description": "Abell is a static blog generator that generates blog in Vanilla JavaScript", "funding": { "type": "patreon", diff --git a/src/utils/generate-site.js b/src/utils/generate-site.js index 9f7c5356..4aa724ab 100644 --- a/src/utils/generate-site.js +++ b/src/utils/generate-site.js @@ -245,6 +245,10 @@ async function generateSite(programInfo) { programInfo.abellConfig.outputPath, ignoreCopying ); + + if (programInfo.logs === 'complete') { + console.log(`...Built Static Files`); + } } module.exports = { createHTMLFile, generateSite }; From 47a19b727494b2af89baddf6282c5eb32970b63c Mon Sep 17 00:00:00 2001 From: saurabhdaware Date: Tue, 29 Dec 2020 19:40:28 +0530 Subject: [PATCH 3/6] fix(dev-server): changes not reflecting in multiple devices connected --- CHANGELOG.md | 11 +++++++---- package.json | 2 +- src/abell-dev-server/index.js | 15 +++++++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2be812fb..7be42739 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ # Changelog -## v0.9.0-alpha.2 `abell@next` +## v0.9.0-alpha.3 `abell@next` -- **ignoreInOutput** - Adds `ignoreInOutput` configuration again (It was possible in earlier Abell versions) +1. **feat: ignoreInOutput** + Adds `ignoreInOutput` configuration again (It was possible in earlier Abell versions) You can pass an array of file/folder which should be ignored when generating output. @@ -16,7 +16,10 @@ module.exports = { }; ``` -- "Built Static Files" Added to Logs. +2. **fix: dev-server changes not reflecting in multiple devices** + If you connect to dev-server from multiple devices, your changes will now reflect in all of them without manual reload. + +3. "Built Static Files" Added to Logs. ## v0.8.0 `abell@latest` diff --git a/package.json b/package.json index 60e0bbdc..00f4569f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "abell", - "version": "0.9.0-alpha.2", + "version": "0.9.0-alpha.3", "description": "Abell is a static blog generator that generates blog in Vanilla JavaScript", "funding": { "type": "patreon", diff --git a/src/abell-dev-server/index.js b/src/abell-dev-server/index.js index f7b3d36f..494896dd 100644 --- a/src/abell-dev-server/index.js +++ b/src/abell-dev-server/index.js @@ -1,6 +1,6 @@ const WebSocket = require('ws'); const { createServer } = require('./http-server.js'); -let socketServer; +const socketServers = {}; /** * Creates socketServer @@ -11,9 +11,10 @@ async function create(options) { const httpServer = await createServer(options); const wss = new WebSocket.Server({ server: httpServer }); console.log('Socket Server Listening...'); - wss.on('connection', (ws) => { - if (!socketServer) console.log('>> Watcher Connected'); - socketServer = ws; + wss.on('connection', (ws, req) => { + const remoteAddress = req.connection.remoteAddress; + if (!socketServers[remoteAddress]) console.log('>> Watcher Connected'); + socketServers[remoteAddress] = ws; }); return { httpServer, wss }; } @@ -22,8 +23,10 @@ async function create(options) { * Reloads the page */ function reload() { - if (socketServer) { - socketServer.send('abell-dev-server-reload'); + if (Object.keys(socketServers).length > 0) { + for (const socketServer of Object.values(socketServers)) { + socketServer.send('abell-dev-server-reload'); + } } } From 71f3c93873d7e0dcd19104bda199570878a9c029 Mon Sep 17 00:00:00 2001 From: saurabhdaware Date: Tue, 5 Jan 2021 21:54:22 +0530 Subject: [PATCH 4/6] fix(dev-server): ignore reloading iframes in page --- package.json | 2 +- src/abell-dev-server/http-server.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 00f4569f..c58b147a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "abell", - "version": "0.9.0-alpha.3", + "version": "0.9.0-alpha.4", "description": "Abell is a static blog generator that generates blog in Vanilla JavaScript", "funding": { "type": "patreon", diff --git a/src/abell-dev-server/http-server.js b/src/abell-dev-server/http-server.js index ae0a9b97..dd8051e6 100644 --- a/src/abell-dev-server/http-server.js +++ b/src/abell-dev-server/http-server.js @@ -124,6 +124,8 @@ async function createServer(options, retry) { const port = (retry && retry.nextPort) || (options && options.port) || 5000; const socketCode = /* html */ ` `; let httpServer; From 295ce3174cb135bed9a4efebc83e9bf140494549 Mon Sep 17 00:00:00 2001 From: saurabhdaware Date: Sun, 17 Jan 2021 16:36:30 +0530 Subject: [PATCH 5/6] upgrade abell-renderer --- CHANGELOG.md | 3 ++- package-lock.json | 14 +++++++------- package.json | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7be42739..4728fcd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## v0.9.0-alpha.3 `abell@next` +## v0.9.0-alpha.4 `abell@next` 1. **feat: ignoreInOutput** Adds `ignoreInOutput` configuration again (It was possible in earlier Abell versions) @@ -20,6 +20,7 @@ module.exports = { If you connect to dev-server from multiple devices, your changes will now reflect in all of them without manual reload. 3. "Built Static Files" Added to Logs. +4. Upgrade abell-renderer. (Removes scopedSelector is declared bug) ## v0.8.0 `abell@latest` diff --git a/package-lock.json b/package-lock.json index 4e6faf6d..aa4c614e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "abell", - "version": "0.8.0", + "version": "0.9.0-alpha.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -777,9 +777,9 @@ "dev": true }, "abell-renderer": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/abell-renderer/-/abell-renderer-0.4.0.tgz", - "integrity": "sha512-aWXnq68aJkAIZJeH3zEcoF40IWxfHHS30870AapquV4BJNiGn0dTY2hrthLLpJf7J6KByUGwGSkekpZUm4/PNQ==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/abell-renderer/-/abell-renderer-0.4.1.tgz", + "integrity": "sha512-9LsiO9QjztsHV6/DfgdIb4IsjG4dYPBonkHIvoLfDuwyZmKG7ZrmGKeARdjhIssOtcDpzz7urouZYxKRyX3uog==", "requires": { "acorn": "^8.0.1", "postcss-selector-parser": "^6.0.2", @@ -5327,9 +5327,9 @@ "dev": true }, "stylis": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.3.tgz", - "integrity": "sha512-iAxdFyR9cHKp4H5M2dJlDnvcb/3TvPprzlKjvYVbH7Sh+y8hjY/mUu/ssdcvVz6Z4lKI3vsoS0jAkMYmX7ozfA==" + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.6.tgz", + "integrity": "sha512-1igcUEmYFBEO14uQHAJhCUelTR5jPztfdVKrYxRnDa5D5Dn3w0NxXupJNPr/VV/yRfZYEAco8sTIRZzH3sRYKg==" }, "supports-color": { "version": "5.5.0", diff --git a/package.json b/package.json index c58b147a..197c7a62 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "abell", - "version": "0.9.0-alpha.4", + "version": "0.9.0-alpha.5", "description": "Abell is a static blog generator that generates blog in Vanilla JavaScript", "funding": { "type": "patreon", @@ -41,7 +41,7 @@ }, "homepage": "https://abelljs.org", "dependencies": { - "abell-renderer": "^0.4.0", + "abell-renderer": "^0.4.1", "chokidar": "^3.4.0", "commander": "^5.0.0", "remarkable": "^2.0.0", @@ -63,4 +63,4 @@ "pre-commit": "npm run prettier && eslint . --fix && npm run eslint" } } -} \ No newline at end of file +} From 68e6f1d8de26c0ca3df796a49ab27abb7c711421 Mon Sep 17 00:00:00 2001 From: saurabhdaware Date: Sat, 23 Jan 2021 14:49:24 +0530 Subject: [PATCH 6/6] v0.9.0 --- CHANGELOG.md | 2 +- package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4728fcd5..f4e0bc62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## v0.9.0-alpha.4 `abell@next` +## v0.9.0 `abell@latest` 1. **feat: ignoreInOutput** Adds `ignoreInOutput` configuration again (It was possible in earlier Abell versions) diff --git a/package.json b/package.json index 197c7a62..8ea3af5d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "abell", - "version": "0.9.0-alpha.5", + "version": "0.9.0", "description": "Abell is a static blog generator that generates blog in Vanilla JavaScript", "funding": { "type": "patreon", @@ -63,4 +63,4 @@ "pre-commit": "npm run prettier && eslint . --fix && npm run eslint" } } -} +} \ No newline at end of file