Skip to content

Lazy serve: Fix improper handling of incomplete active urls #1532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxwxwxwx9 merged 1 commit into from
Apr 2, 2021
Merged

Lazy serve: Fix improper handling of incomplete active urls #1532

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions packages/cli/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@ program
const addHandler = (filePath) => {
logger.info(`[${new Date().toLocaleTimeString()}] Reload for file add: ${filePath}`);
logger.info('Synchronizing opened pages list before reload');
const normalizedActiveUrls = liveServer.getActiveUrls().map(url => fsUtil.removeExtension(url));
const normalizedActiveUrls = liveServer.getActiveUrls().map((url) => {
const completeUrl = path.extname(url) === '' ? path.join(url, 'index') : url;
return fsUtil.removeExtension(completeUrl);
});
site.changeCurrentOpenedPages(normalizedActiveUrls);
Promise.resolve('').then(() => {
if (site.isFilepathAPage(filePath) || site.isDependencyOfPage(filePath)) {
Expand All @@ -156,7 +159,10 @@ program
const changeHandler = (filePath) => {
logger.info(`[${new Date().toLocaleTimeString()}] Reload for file change: ${filePath}`);
logger.info('Synchronizing opened pages list before reload');
const normalizedActiveUrls = liveServer.getActiveUrls().map(url => fsUtil.removeExtension(url));
const normalizedActiveUrls = liveServer.getActiveUrls().map((url) => {
const completeUrl = path.extname(url) === '' ? path.join(url, 'index') : url;
return fsUtil.removeExtension(completeUrl);
});
site.changeCurrentOpenedPages(normalizedActiveUrls);
Promise.resolve('').then(() => {
if (path.basename(filePath) === SITE_CONFIG_NAME) {
Expand All @@ -174,7 +180,10 @@ program
const removeHandler = (filePath) => {
logger.info(`[${new Date().toLocaleTimeString()}] Reload for file deletion: ${filePath}`);
logger.info('Synchronizing opened pages list before reload');
const normalizedActiveUrls = liveServer.getActiveUrls().map(url => fsUtil.removeExtension(url));
const normalizedActiveUrls = liveServer.getActiveUrls().map((url) => {
const completeUrl = path.extname(url) === '' ? path.join(url, 'index') : url;
return fsUtil.removeExtension(completeUrl);
});
site.changeCurrentOpenedPages(normalizedActiveUrls);
Promise.resolve('').then(() => {
if (site.isFilepathAPage(filePath) || site.isDependencyOfPage(filePath)) {
Expand Down