@silexlabs/silex 3.7.0 → 3.9.0-canary.2

package/dist/{plugins/server/plugins/server → server/server/plugins}/GitlabHostingConnector.js

@@ -1,59 +1,26 @@
 "use strict";
-/*
- * Silex website builder, free/libre no-code tool for makers.
- * Copyright (c) 2023 lexoyo and Silex Labs foundation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * Gitlab hosting connector
- * @fileoverview Gitlab hosting connector for Silex, connect to the user's Gitlab account to host websites with .gitlab-ci.yml file template for plain html by default
- * @see https://docs.gitlab.com/ee/api/oauth2.html
- * @see https://docs.gitlab.com/ee/user/project/pages/getting_started/pages_ci_cd_template.html
- */
 const dedent_1 = __importDefault(require("dedent"));
-const GitlabConnector_1 = __importDefault(require("./GitlabConnector"));
-const types_1 = require("../../types");
+const GitlabConnector_js_1 = __importDefault(require("./GitlabConnector.js"));
+const types_js_1 = require("../../common/types.js");
 const promises_1 = require("timers/promises");
-const waitTimeOut = 5000; /* for wait loop waiting for job to appear */
-const jobPollInterval = 10000; /* poll job status every 10 seconds */
-const jobCompletionTimeOut = 45 * 60 * 1000; /* 45 minutes max for job completion */
+const waitTimeOut = 5000;
+const jobPollInterval = 10000;
+const jobCompletionTimeOut = 45 * 60 * 1000;
 const SILEX_OVERWRITE_NOTICE = '# silexOverwrite: true';
-// GitLab job statuses that indicate the job is still running
 const GITLAB_RUNNING_STATUSES = ['created', 'waiting_for_resource', 'preparing', 'pending', 'running'];
-// GitLab job statuses that indicate success
 const GITLAB_SUCCESS_STATUSES = ['success'];
-// GitLab job statuses that indicate failure
 const GITLAB_FAILED_STATUSES = ['failed', 'canceled', 'skipped'];
-/**
- * Filter GitLab trace to remove technical noise
- * Returns an array of meaningful log lines
- */
 function filterTraceLines(trace) {
-    // eslint-disable-next-line no-control-regex
     const ansiEscape = /\x1b\[[0-9;?]*[a-zA-Z]/g;
     return trace.split('\n')
         .map(l => l.replace(ansiEscape, '').trim())
         .filter(l => l.length > 0)
-        // Remove GitLab internal markers
         .filter(l => !l.match(/^section_/))
-        // Remove timestamps at the beginning of lines
         .map(l => l.replace(/^\d{4}-\d{2}-\d{2}T[\d:.]+Z\s*\d*O?\s*/, ''))
-        // Remove Docker/Git setup noise
         .filter(l => !l.includes('Using Docker executor'))
         .filter(l => !l.includes('Pulling docker image'))
         .filter(l => !l.includes('Fetching changes'))
@@ -63,22 +30,15 @@ function filterTraceLines(trace) {
         .filter(l => !l.includes('Executing "step_script"'))
         .filter(l => !l.includes('Restoring cache'))
         .filter(l => !l.includes('Saving cache'))
-        .filter(l => !l.match(/^\s*\$\s/)) // Remove shell command echoes
+        .filter(l => !l.match(/^\s*\$\s/))
         .filter(l => !l.match(/^Running with gitlab-runner/))
         .filter(l => !l.match(/^Preparing the .* executor/))
         .filter(l => !l.match(/^Using .* as base image/))
-        // Keep non-empty lines after filtering
         .filter(l => l.trim().length > 0);
 }
-/**
- * Parse GitLab/11ty job logs to extract meaningful status
- * Returns a short user-friendly status message
- */
 function parseJobTrace(trace) {
     const lines = filterTraceLines(trace);
-    // Look for 11ty build progress
     if (trace.includes('[11ty]')) {
-        // Look for 11ty completion first
         if (trace.includes('[11ty] Wrote') || trace.includes('[11ty] Copied')) {
             const wroteMatch = trace.match(/\[11ty\] Wrote (\d+)/i);
             const copiedMatch = trace.match(/\[11ty\] Copied (\d+)/i);
@@ -90,55 +50,45 @@ function parseJobTrace(trace) {
             if (parts.length)
                 return parts.join(', ');
         }
-        // Look for 11ty processing
         const eleventyMatch = trace.match(/\[11ty\].*?(\d+)\s+files?/i);
         if (eleventyMatch) {
             return `Generating ${eleventyMatch[1]} pages...`;
         }
         return 'Building pages...';
     }
-    // Look for npm/npx installing
     if (trace.includes('npm') && trace.includes('install')) {
         return 'Installing dependencies...';
     }
-    // Look for npx running eleventy
     if (trace.includes('npx') && trace.includes('eleventy')) {
         return 'Running page generator...';
     }
-    // Look for artifact upload
     if (trace.includes('Uploading artifacts')) {
         return 'Preparing files for deployment...';
     }
-    // Look for pages deployment
     if (trace.includes('CI_PAGES_URL') || trace.includes('will be deployed')) {
         return 'Finalizing deployment...';
     }
-    // Look for job completion
     if (trace.includes('Job succeeded')) {
         return 'Build complete';
     }
-    // Look for errors
     const errorMatch = trace.match(/error[:\s]+(.{0,100})/i);
     if (errorMatch) {
         const errorMsg = errorMatch[1].trim().substring(0, 60);
         return `Error: ${errorMsg}${errorMsg.length >= 60 ? '...' : ''}`;
     }
-    // Return empty string to avoid showing technical noise
     return '';
 }
-class GitlabHostingConnector extends GitlabConnector_1.default {
+class GitlabHostingConnector extends GitlabConnector_js_1.default {
     displayName = 'Gitlab hosting';
-    connectorType = types_1.ConnectorType.HOSTING;
+    connectorType = types_js_1.ConnectorType.HOSTING;
     constructor(config, opts) {
         super(config, opts);
-        // public directory for standard gitlab pages
         this.options.assetsFolder = 'public';
     }
     async publish(session, websiteId, files, { startJob, jobSuccess, jobError }) {
         const job = startJob(`Publishing to ${this.displayName}`);
         job.logs = [[`Publishing to ${this.displayName}`]];
         job.errors = [[]];
-        /* Configuration file .gitlab-ci.yml contains template for plain html Gitlab pages*/
         const pathYml = '.gitlab-ci.yml';
         const contentYml = (0, dedent_1.default) `
       ${SILEX_OVERWRITE_NOTICE}
@@ -173,7 +123,6 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
             }
         }
         catch (e) {
-            // If the file .gitlab-ci.yml does not exist, create it, otherwise do nothing (do not overwriting existing one)
             if (e.statusCode === 404 || e.httpStatusCode === 404 || e.message.endsWith('A file with this name doesn\'t exist')) {
                 job.message = `Creating ${pathYml}...`;
                 job.logs[0].push(job.message);
@@ -183,16 +132,10 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                 jobError(job.jobId, e.message);
             }
         }
-        // publishing all files for website
-        // Do not await for the result, return the job and continue the publication in the background
-        //this .startPublicationJob(session, websiteId, files, job, () => this.endPublicationJob(session, websiteId, job))
         this.writeAssets(session, websiteId, files, async ({ status, message }) => {
-            // Update the job status
-            if (status === types_1.JobStatus.SUCCESS) {
-                /* Squash and tag the commits */
+            if (status === types_js_1.JobStatus.SUCCESS) {
                 const successTag = await this.createTag(session, websiteId, job, { startJob, jobSuccess, jobError });
                 if (!successTag) {
-                    // jobError will have been called in createTag
                     return;
                 }
                 try {
@@ -208,7 +151,6 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                     job.logs[0].push(job.message);
                     const pageUrl = await this.getPageUrl(session, websiteId, adminUrl);
                     job.logs[0].push(`Page URL: ${pageUrl}`);
-                    // Wait for the GitLab job to complete
                     job.message = 'Starting build...';
                     job.logs[0].push(job.message);
                     const result = await this.waitForGitlabJobCompletion(session, websiteId, job, adminUrl, successTag, gitlabUrl, pageUrl);
@@ -224,12 +166,11 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                     jobError(job.jobId, `Failed to get the website URLs: ${error.message}`);
                 }
             }
-            else if (status === types_1.JobStatus.ERROR) {
+            else if (status === types_js_1.JobStatus.ERROR) {
                 job.errors[0].push(message);
                 jobError(job.jobId, message);
             }
             else {
-                // Update the job status while uploading files
                 job.status = status;
                 job.message = message;
                 job.logs[0].push(message);
@@ -241,43 +182,6 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
         });
         return job;
     }
-    // async startPublicationJob(session: GitlabSession, websiteId: WebsiteId, files: ConnectorFile[], job: PublicationJobData, endJob: () => void) {
-    //   job.message = `Preparing ${files.length} files...`
-    //   job.logs[0].push(job.message)
-    //   job.status = JobStatus.IN_PROGRESS
-    //   job.startTime = Date.now()
-    //   // List all the files in assets folder
-    //   const existingFiles = await this.ls({
-    //     session,
-    //     websiteId,
-    //     recursive: false,
-    //     path: this.options.assetsFolder,
-    //   })
-    //   // Create the actions for the batch
-    //   const filesToUpload = [] as GitlabAction[]
-    //   for (const file of files) {
-    //     const filePath = this.getAssetPath(file.path, false)
-    //     const content = (await contentToBuffer(file.content)).toString('base64')
-    //     const existingSha = existingFiles.get(filePath)
-    //     const newSha = computeGitBlobSha(content, true)
-    //     if (existingSha) {
-    //       if (existingSha !== newSha) {
-    //         filesToUpload.push({
-    //           action: 'update',
-    //           file_path: filePath,
-    //           content,
-    //           encoding: 'base64',
-    //         })
-    //       } // else: skip unchanged file
-    //     } else {
-    //       filesToUpload.push({
-    //         action: 'create',
-    //         file_path: filePath,
-    //         content,
-    //         encoding: 'base64',
-    //       })
-    //     }
-    /* Get and return Url Gitlab Pages */
     async getUrl(session, websiteId) {
         const response = await this.callApi({
             session,
@@ -297,15 +201,10 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
     async getPageUrl(session, websiteId, projectUrl) {
         return `${projectUrl}/pages`;
     }
-    /**
-     * Wait for the GitLab CI/CD job to complete
-     * Polls the job status and updates the Silex job with progress
-     */
     async waitForGitlabJobCompletion(session, websiteId, job, projectUrl, tag, gitlabUrl, pageUrl) {
         const t0 = Date.now();
         let gitlabJobId = null;
         let gitlabJobLogsUrl = null;
-        // First, wait for the job to appear
         while (!gitlabJobId && (Date.now() - t0) < this.options.timeOut) {
             try {
                 const jobs = await this.callApi({
@@ -333,7 +232,6 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                 await (0, promises_1.setTimeout)(waitTimeOut);
             }
         }
-        // If job never appeared, handle the error
         if (!gitlabJobId) {
             let errorMessage = 'Could not start the build. The server may be busy or unavailable.';
             if (this.isUsingOfficialInstance()) {
@@ -346,18 +244,15 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
             }
             return { success: false, message: errorMessage };
         }
-        // Now poll the job status until it completes
         let lastTraceLength = 0;
         while ((Date.now() - t0) < jobCompletionTimeOut) {
             try {
-                // Get job status
                 const gitlabJob = await this.callApi({
                     session,
                     path: `api/v4/projects/${websiteId}/jobs/${gitlabJobId}`,
                     method: 'GET'
                 });
                 const jobStatus = gitlabJob.status;
-                // Try to get job trace (logs) for progress info
                 let traceInfo = '';
                 try {
                     const trace = await this.callApi({
@@ -366,23 +261,18 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                         method: 'GET'
                     });
                     if (typeof trace === 'string' && trace.length > lastTraceLength) {
-                        // Parse the new portion of the trace
                         const newTrace = trace.substring(lastTraceLength);
                         traceInfo = parseJobTrace(newTrace);
                         lastTraceLength = trace.length;
-                        // Add filtered log lines to the job logs for the <details> section
                         const filteredLines = filterTraceLines(newTrace);
                         if (filteredLines.length > 0) {
-                            // Limit to last 50 lines to avoid overwhelming the logs
                             const linesToAdd = filteredLines.slice(-50);
                             job.logs[0].push(...linesToAdd);
                         }
                     }
                 }
                 catch (e) {
-                    // Trace might not be available yet, that's OK
                 }
-                // Map GitLab status to user-friendly status
                 const statusMap = {
                     'created': 'Starting',
                     'waiting_for_resource': 'Waiting for server',
@@ -402,9 +292,7 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
             <a href="${gitlabJobLogsUrl}" target="_blank" class="silex-button silex-button--secondary">View build logs</a>
           </div>
         `;
-                // Check if job completed
                 if (GITLAB_SUCCESS_STATUSES.includes(jobStatus)) {
-                    // Fetch final trace to include in logs
                     try {
                         const finalTrace = await this.callApi({
                             session,
@@ -413,13 +301,11 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                         });
                         if (typeof finalTrace === 'string') {
                             const allFilteredLines = filterTraceLines(finalTrace);
-                            // Add last 30 lines as summary
                             job.logs[0].push('--- Build Summary ---');
                             job.logs[0].push(...allFilteredLines.slice(-30));
                         }
                     }
                     catch (e) {
-                        // Ignore trace fetch errors
                     }
                     const message = `
             <p><strong>Your website is now live!</strong></p>
@@ -433,7 +319,6 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                 }
                 if (GITLAB_FAILED_STATUSES.includes(jobStatus)) {
                     const failureReason = gitlabJob.failure_reason || 'Build error';
-                    // Fetch final trace to include error details in logs
                     try {
                         const finalTrace = await this.callApi({
                             session,
@@ -442,13 +327,11 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                         });
                         if (typeof finalTrace === 'string') {
                             const allFilteredLines = filterTraceLines(finalTrace);
-                            // Add last 50 lines to help debug the error
                             job.logs[0].push('--- Error Details ---');
                             job.logs[0].push(...allFilteredLines.slice(-50));
                         }
                     }
                     catch (e) {
-                        // Ignore trace fetch errors
                     }
                     const message = `
             <p><strong>Build failed:</strong> ${failureReason}</p>
@@ -460,16 +343,13 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
                     job.logs[0].push(`Build failed: ${failureReason}`);
                     return { success: false, message };
                 }
-                // Job still running, wait before next poll
                 await (0, promises_1.setTimeout)(jobPollInterval);
             }
             catch (e) {
                 console.error('Error polling GitLab job status:', e.message);
-                // Don't fail immediately, just wait and retry
                 await (0, promises_1.setTimeout)(jobPollInterval);
             }
         }
-        // Timeout reached
         const message = `
       <p><strong>Build is taking longer than expected</strong></p>
       <p>Your website may still be published successfully.</p>
@@ -482,9 +362,8 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
         return { success: false, message };
     }
     async createTag(session, websiteId, job, { startJob, jobSuccess, jobError }) {
-        const projectId = websiteId; // Assuming websiteId corresponds to GitLab project ID
+        const projectId = websiteId;
         const newTag = '_silex_' + Date.now();
-        // Create a new tag to trigger the build
         try {
             job.message = 'Triggering build...';
             job.logs[0].push(job.message);
@@ -504,9 +383,7 @@ class GitlabHostingConnector extends GitlabConnector_1.default {
             jobError(job.jobId, `Failed to start build: ${error.message}`);
             return null;
         }
-        // Return new tag
         return newTag;
     }
 }
 exports.default = GitlabHostingConnector;
-//# sourceMappingURL=GitlabHostingConnector.js.map

package/dist/server/server/plugins/PublicationOptimizer.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/{plugins/server/plugins/server → server/server/plugins}/SslPlugin.js

@@ -1,20 +1,4 @@
 "use strict";
-/*
- * Silex website builder, free/libre no-code tool for makers.
- * Copyright (c) 2023 lexoyo and Silex Labs foundation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -24,29 +8,18 @@ const express_1 = __importDefault(require("express"));
 const fs_1 = require("fs");
 const https_1 = require("https");
 const express_force_ssl_1 = __importDefault(require("express-force-ssl"));
-const events_1 = require("../../server/events");
-// interface SslOptions {
-//   forceHttps?: boolean
-//   trustXFPHeader?: boolean
-//   privateKey?: string
-//   certificate?: string
-//   sslPort?: string
-// }
+const events_js_1 = require("../events.js");
 async function default_1(config, opts = {}) {
-    // Options with defaults
     const options = {
         forceHttps: process.env.SILEX_FORCE_HTTPS === 'true',
         trustXFPHeader: process.env.SILEX_FORCE_HTTPS_TRUST_XFP_HEADER === 'true',
         privateKey: process.env.SILEX_SSL_PRIVATE_KEY,
         certificate: process.env.SILEX_SSL_CERTIFICATE,
-        sslPort: process.env.SSL_PORT || '443',
+        sslPort: process.env.SILEX_SSL_PORT || process.env.SSL_PORT || '443',
         ...opts,
     };
-    // Add routes on silex startup
-    config.on(events_1.ServerEvent.STARTUP_START, ({ app }) => {
+    config.on(events_js_1.ServerEvent.STARTUP_START, ({ app }) => {
         const router = express_1.default.Router();
-        // SSL
-        // force ssl if the env var SILEX_FORCE_HTTPS is set
         if (options.forceHttps) {
             console.info('> [SslPlugin] Force SSL option is enabled');
             app.set('forceSSLOptions', {
@@ -57,7 +30,6 @@ async function default_1(config, opts = {}) {
         else {
             console.info('> [SslPlugin] Force SSL option is disabled, env var SILEX_FORCE_HTTPS not set');
         }
-        // SSL certificate
         if (options.privateKey && options.certificate) {
             console.info('> [SslPlugin] SSL certificate is enabled, found certificate:', options.certificate);
             try {
@@ -83,4 +55,3 @@ async function default_1(config, opts = {}) {
         app.use(router);
     });
 }
-//# sourceMappingURL=SslPlugin.js.map

package/dist/{plugins/server/plugins/server → server/server/plugins}/StaticPlugin.js

@@ -1,20 +1,4 @@
 "use strict";
-/*
- * Silex website builder, free/libre no-code tool for makers.
- * Copyright (c) 2023 lexoyo and Silex Labs foundation
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -22,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const express_1 = __importDefault(require("express"));
 const serve_static_1 = __importDefault(require("serve-static"));
-const Cache_1 = require("./Cache");
-const events_1 = require("../../server/events");
+const Cache_js_1 = require("./Cache.js");
+const events_js_1 = require("../events.js");
 async function default_1(config, options = { routes: [] }) {
     if (!options.routes)
         throw new Error('The config for static module has no `routes` attribute');
     console.info(`> [StaticPlugin] Serving ${options.routes.length} static files`);
-    config.on(events_1.ServerEvent.STARTUP_START, ({ app }) => {
+    config.on(events_js_1.ServerEvent.STARTUP_START, ({ app }) => {
         const router = express_1.default.Router();
         options.routes
             .forEach(folder => {
@@ -39,7 +23,6 @@ async function default_1(config, options = { routes: [] }) {
             console.info(`> [StaticPlugin] Serving static files from ${folder.path} on ${folder.route}`);
             router.use(folder.route, (0, serve_static_1.default)(folder.path));
         });
-        app.use(Cache_1.withCache, router);
+        app.use(Cache_js_1.withCache, router);
     });
 }
-//# sourceMappingURL=StaticPlugin.js.map

package/dist/server/server/utils/BackwardCompat.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/server/server/utils/websiteDataSerialization.js

@@ -4,9 +4,9 @@ exports.stringify = stringify;
 exports.split = split;
 exports.merge = merge;
 exports.getPagesFolder = getPagesFolder;
-const types_1 = require("../../types");
-const page_1 = require("../../page");
-const constants_1 = require("../../constants");
+const types_js_1 = require("../../common/types.js");
+const page_js_1 = require("../../common/page.js");
+const constants_js_1 = require("../../common/constants.js");
 function stringify(data) {
     return JSON.stringify(data, sortKeys, 2);
 }
@@ -22,10 +22,10 @@ function sortKeys(key, value) {
 }
 function split(websiteData) {
     const files = [];
-    const pagesFolder = websiteData.pagesFolder || constants_1.LEGACY_WEBSITE_PAGES_FOLDER;
+    const pagesFolder = websiteData.pagesFolder || constants_js_1.LEGACY_WEBSITE_PAGES_FOLDER;
     const pages = websiteData.pages?.map((page) => {
         const pageName = getPageName(page);
-        const slug = (0, page_1.getPageSlug)(pageName);
+        const slug = (0, page_js_1.getPageSlug)(pageName);
         const fileName = `${slug}-${page.id}.json`;
         const filePath = `${pagesFolder}/${fileName}`;
         if (!page.id)
@@ -39,21 +39,21 @@ function split(websiteData) {
             id: page.id,
             isFile: true,
         };
-    }) || types_1.EMPTY_PAGES;
+    }) || types_js_1.EMPTY_PAGES;
     const websiteDataLinkedPages = {
         ...websiteData,
         pagesFolder,
         pages,
     };
     files.push({
-        path: constants_1.WEBSITE_DATA_FILE,
+        path: constants_js_1.WEBSITE_DATA_FILE,
         content: stringify(websiteDataLinkedPages)
     });
     return files;
 }
 async function merge(websiteDataContent, pageLoader) {
     const websiteData = JSON.parse(websiteDataContent);
-    const pagesFolder = websiteData.pagesFolder || constants_1.LEGACY_WEBSITE_PAGES_FOLDER;
+    const pagesFolder = websiteData.pagesFolder || constants_js_1.LEGACY_WEBSITE_PAGES_FOLDER;
     if (!websiteData.pages || websiteData.pages.length === 0) {
         return websiteData;
     }
@@ -63,7 +63,7 @@ async function merge(websiteDataContent, pageLoader) {
     const pages = await Promise.all(websiteData.pages.map(async (pageRef) => {
         if (pageRef.isFile) {
             const pageName = pageRef.name;
-            const slug = (0, page_1.getPageSlug)(pageName);
+            const slug = (0, page_js_1.getPageSlug)(pageName);
             const fileName = `${slug}-${pageRef.id}.json`;
             const filePath = `${pagesFolder}/${fileName}`;
             try {
@@ -83,7 +83,7 @@ async function merge(websiteDataContent, pageLoader) {
     };
 }
 function getPagesFolder(websiteData) {
-    return websiteData.pagesFolder || constants_1.LEGACY_WEBSITE_PAGES_FOLDER;
+    return websiteData.pagesFolder || constants_js_1.LEGACY_WEBSITE_PAGES_FOLDER;
 }
 function getPageName(page) {
     return page.getName ? page.getName() : page.name;

package/{src/ts/client → editor}/api.ts

@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { API_CONNECTOR_LIST, API_CONNECTOR_USER, API_CONNECTOR_LOGOUT, API_CONNECTOR_PATH, API_PATH, API_PUBLICATION_PATH, API_PUBLICATION_PUBLISH, API_PUBLICATION_STATUS, API_WEBSITE_ASSET_READ, API_WEBSITE_ASSETS_WRITE, API_WEBSITE_DELETE, API_WEBSITE_LIST, API_WEBSITE_PATH, API_WEBSITE_READ, API_WEBSITE_WRITE, API_WEBSITE_META_READ, API_WEBSITE_META_WRITE, API_WEBSITE_CREATE, API_WEBSITE_DUPLICATE, API_WEBSITE_FORK } from '../constants'
-import { ApiPublicationPublishBody, ApiPublicationPublishQuery, ApiPublicationPublishResponse, ApiPublicationStatusQuery, ApiPublicationStatusResponse, ConnectorId, JobData, JobId, PublicationJobData, WebsiteId, ApiConnectorListResponse, ApiConnectorListQuery, ConnectorData, ConnectorType, ApiWebsiteReadQuery, ApiWebsiteReadResponse, WebsiteData, ApiWebsiteWriteQuery, ApiWebsiteWriteBody, ApiWebsiteWriteResponse, ApiWebsiteDeleteQuery, ApiWebsiteAssetsReadQuery, ApiWebsiteAssetsReadResponse, ApiWebsiteAssetsWriteQuery, ApiWebsiteAssetsWriteBody, ApiWebsiteAssetsWriteResponse, ClientSideFile, PublicationData, ApiConnectorUserResponse, ConnectorUser, WebsiteMeta, ApiConnectorLogoutQuery, ApiConnectorUserQuery, ApiWebsiteListResponse, ApiWebsiteListQuery, WebsiteMetaFileContent, ApiWebsiteCreateQuery, ApiWebsiteCreateBody, ApiWebsiteCreateResponse, ApiWebsiteMetaWriteQuery, ApiWebsiteMetaWriteBody, ApiWebsiteMetaWriteResponse, ApiWebsiteMetaReadQuery, ApiWebsiteMetaReadResponse, ConnectorOptions, ApiError, ApiWebsiteDuplicateQuery, ApiWebsiteForkQuery, ApiWebsiteForkBody, ApiWebsiteForkResponse } from '../types'
+import { API_CONNECTOR_LIST, API_CONNECTOR_USER, API_CONNECTOR_LOGOUT, API_CONNECTOR_PATH, API_PATH, API_PUBLICATION_PATH, API_PUBLICATION_PUBLISH, API_PUBLICATION_STATUS, API_WEBSITE_ASSET_READ, API_WEBSITE_ASSETS_WRITE, API_WEBSITE_DELETE, API_WEBSITE_LIST, API_WEBSITE_PATH, API_WEBSITE_READ, API_WEBSITE_WRITE, API_WEBSITE_META_READ, API_WEBSITE_META_WRITE, API_WEBSITE_CREATE, API_WEBSITE_DUPLICATE, API_WEBSITE_FORK } from '~/common/constants'
+import { ApiPublicationPublishBody, ApiPublicationPublishQuery, ApiPublicationPublishResponse, ApiPublicationStatusQuery, ApiPublicationStatusResponse, ConnectorId, JobData, JobId, PublicationJobData, WebsiteId, ApiConnectorListResponse, ApiConnectorListQuery, ConnectorData, ConnectorType, ApiWebsiteReadQuery, ApiWebsiteReadResponse, WebsiteData, ApiWebsiteWriteQuery, ApiWebsiteWriteBody, ApiWebsiteWriteResponse, ApiWebsiteDeleteQuery, ApiWebsiteAssetsReadQuery, ApiWebsiteAssetsReadResponse, ApiWebsiteAssetsWriteQuery, ApiWebsiteAssetsWriteBody, ApiWebsiteAssetsWriteResponse, ClientSideFile, PublicationData, ApiConnectorUserResponse, ConnectorUser, WebsiteMeta, ApiConnectorLogoutQuery, ApiConnectorUserQuery, ApiWebsiteListResponse, ApiWebsiteListQuery, WebsiteMetaFileContent, ApiWebsiteCreateQuery, ApiWebsiteCreateBody, ApiWebsiteCreateResponse, ApiWebsiteMetaWriteQuery, ApiWebsiteMetaWriteBody, ApiWebsiteMetaWriteResponse, ApiWebsiteMetaReadQuery, ApiWebsiteMetaReadResponse, ConnectorOptions, ApiError, ApiWebsiteDuplicateQuery, ApiWebsiteForkQuery, ApiWebsiteForkBody, ApiWebsiteForkResponse } from '~/common/types'
 
 export enum ApiRoute {
   PUBLICATION_PUBLISH = API_PATH + API_PUBLICATION_PATH + API_PUBLICATION_PUBLISH,