@lvce-editor/shared-process 0.33.10 → 0.33.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.33.10",
+  "version": "0.33.12",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.3.0",
-    "@lvce-editor/extension-host-helper-process": "0.33.10",
+    "@lvce-editor/extension-host-helper-process": "0.33.12",
     "@lvce-editor/ipc": "^10.2.1",
     "@lvce-editor/json-rpc": "^3.0.0",
     "@lvce-editor/jsonc-parser": "^1.4.0",

package/src/parts/ContentSecurityPolicyDocument/ContentSecurityPolicyDocument.js

@@ -25,7 +25,7 @@ const getFrameAncestors = () => {
 export const value = GetContentSecurityPolicy.getContentSecurityPolicy([
     `default-src 'none'`,
     `font-src 'self'`,
-    `img-src 'self' https: data:`, // TODO maybe disallow https and data images
+    `img-src 'self' https: data: blob:`, // TODO maybe disallow https and data images
     `media-src 'self'`,
     `script-src 'self'`,
     `style-src 'self'`,

package/src/parts/ExportStatic/ExportStatic.js

@@ -73,21 +73,21 @@ const clean = async (root) => {
 /**
  * @param {string} root
  */
-const copyStaticFiles = async (root, commitHash) => {
-    await FileSystem.copy(Path.join(root, 'node_modules', '@lvce-editor', 'server', 'static'), Path.join(root, 'dist'));
+const copyStaticFiles = async (root, serverStaticPath) => {
+    await FileSystem.copy(serverStaticPath, Path.join(root, 'dist'));
 };
 const applyOverridesRendererProcess = async ({ root, commitHash, pathPrefix }) => {
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-process', 'dist', 'rendererProcessMain.js'), 'platform = Remote;', 'platform = Web');
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-process', 'dist', 'rendererProcessMain.js'), `/${commitHash}`, `${pathPrefix}/${commitHash}`);
 };
-const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
+const applyOverrides = async ({ root, commitHash, pathPrefix, serverStaticPath }) => {
     await applyOverridesRendererProcess({ root, commitHash, pathPrefix });
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'), 'platform = Remote;', 'platform = Web$1;');
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'), `/${commitHash}`, `${pathPrefix}/${commitHash}`);
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'), `return \`\${assetDir}/extensions/builtin.theme-\${colorThemeId}/color-theme.json\``, `return \`\${assetDir}/themes/\${colorThemeId}.json\``);
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'extension-host-worker', 'dist', 'extensionHostWorkerMain.js'), `/${commitHash}`, `${pathPrefix}/${commitHash}`);
     await replace(Path.join(root, 'dist', commitHash, 'packages', 'renderer-worker', 'dist', 'rendererWorkerMain.js'), `return \`\${assetDir}/extensions/builtin.\${iconThemeId}/icon-theme.json\``, `return \`\${assetDir}/icon-themes/\${iconThemeId}.json\``);
-    const extensionDirents = await FileSystem.readDir(Path.join(root, 'node_modules', '@lvce-editor', 'server', 'static', commitHash, 'extensions'));
+    const extensionDirents = await FileSystem.readDir(Path.join(serverStaticPath, commitHash, 'extensions'));
     const languageBasicsDirents = extensionDirents.filter(isLanguageBasics);
     const themeDirents = extensionDirents.filter(isTheme);
     const iconThemeDirents = extensionDirents.filter(isIconTheme);
@@ -115,7 +115,7 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
      * @param {string} dirent
      */
     const getManifestPath = (dirent) => {
-        return Path.join(root, 'node_modules', '@lvce-editor', 'server', 'static', commitHash, 'extensions', dirent, 'extension.json');
+        return Path.join(serverStaticPath, commitHash, 'extensions', dirent, 'extension.json');
     };
     const manifestPaths = languageBasicsDirents.map(getManifestPath);
     const manifests = await Promise.all(manifestPaths.map(readExtensionManifest));
@@ -124,17 +124,17 @@ const applyOverrides = async ({ root, commitHash, pathPrefix }) => {
     const webViews = manifests.flatMap(getWebViews);
     await JsonFile.writeJson(Path.join(root, 'dist', commitHash, 'config', 'webViews.json'), webViews);
     for (const languageBasicsDirent of languageBasicsDirents) {
-        await FileSystem.copy(Path.join(root, 'node_modules', '@lvce-editor', 'server', 'static', commitHash, 'extensions', languageBasicsDirent), Path.join(root, 'dist', commitHash, 'extensions', languageBasicsDirent));
+        await FileSystem.copy(Path.join(serverStaticPath, commitHash, 'extensions', languageBasicsDirent), Path.join(root, 'dist', commitHash, 'extensions', languageBasicsDirent));
     }
     for (const themeDirent of themeDirents) {
         const themeId = getThemeName(themeDirent);
-        await FileSystem.copy(Path.join(root, 'node_modules', '@lvce-editor', 'server', 'static', commitHash, 'extensions', themeDirent, 'color-theme.json'), Path.join(root, 'dist', commitHash, 'themes', `${themeId}.json`));
+        await FileSystem.copy(Path.join(serverStaticPath, commitHash, 'extensions', themeDirent, 'color-theme.json'), Path.join(root, 'dist', commitHash, 'themes', `${themeId}.json`));
     }
     const themeIds = mergeThemes(themeDirents.map(getThemeName), []);
     await JsonFile.writeJson(Path.join(root, 'dist', commitHash, 'config', 'themes.json'), themeIds);
     for (const iconThemeDirent of iconThemeDirents) {
         const iconThemeId = iconThemeDirent.slice('builtin.'.length);
-        await FileSystem.copy(Path.join(root, 'node_modules', '@lvce-editor', 'server', 'static', commitHash, 'extensions', iconThemeDirent, 'icon-theme.json'), Path.join(root, 'dist', commitHash, 'icon-themes', `${iconThemeId}.json`));
+        await FileSystem.copy(Path.join(serverStaticPath, commitHash, 'extensions', iconThemeDirent, 'icon-theme.json'), Path.join(root, 'dist', commitHash, 'icon-themes', `${iconThemeId}.json`));
     }
     await replace(Path.join(root, 'dist', 'index.html'), `/${commitHash}`, `${pathPrefix}/${commitHash}`);
     if (pathPrefix) {
@@ -340,36 +340,51 @@ const addTestFiles = async ({ testPath, commitHash, root, pathPrefix }) => {
     const testOverviewHtml = generateTestOverviewHtml(testFiles);
     await FileSystem.writeFile(`${root}/dist/tests/index.html`, testOverviewHtml);
 };
+const resolveServerStaticPath = (root) => {
+    const guessOne = Path.join(root, 'node_modules', '@lvce-editor', 'server', 'static');
+    if (existsSync(guessOne)) {
+        return guessOne;
+    }
+    const guessTwo = Path.join(root, 'packages', 'build', 'node_modules', '@lvce-editor', 'server', 'static');
+    if (existsSync(guessTwo)) {
+        return guessTwo;
+    }
+    throw new Error(`server static path not found`);
+};
 /**
  *
- * @param {{root:string, pathPrefix:string , extensionPath:string, testPath:string, useSimpleWebExtensionFile?:boolean }} param0
+ * @param {{root:string, pathPrefix:string , extensionPath:string, testPath:string, useSimpleWebExtensionFile?:boolean, serverStaticPath?:string }} param0
  */
-export const exportStatic = async ({ root, pathPrefix, extensionPath, testPath, useSimpleWebExtensionFile }) => {
+export const exportStatic = async ({ root, pathPrefix, extensionPath, testPath, useSimpleWebExtensionFile, serverStaticPath }) => {
     if (!existsSync(root)) {
         throw new Error(`root path does not exist: ${root}`);
     }
     if (!existsSync(extensionPath)) {
         throw new Error(`extension path does not exist: ${extensionPath}`);
     }
+    if (!serverStaticPath) {
+        serverStaticPath = resolveServerStaticPath(root);
+    }
     if (pathPrefix === 'auto') {
         const extensionJson = await readExtensionManifest(Path.join(extensionPath, 'extension.json'));
         const { id } = extensionJson;
         const [author, name] = id.split('.');
         pathPrefix = `/${name}`;
     }
-    const dirents = await FileSystem.readDir(Path.join(root, 'node_modules', '@lvce-editor', 'server', 'static'));
+    const dirents = await FileSystem.readDir(serverStaticPath);
     const commitHash = dirents.find(isCommitHash) || '';
     console.time('clean');
     await clean(root);
     console.timeEnd('clean');
     console.time('copyStaticFiles');
-    await copyStaticFiles(root, commitHash);
+    await copyStaticFiles(root, serverStaticPath);
     console.timeEnd('copyStaticFiles');
     console.time('applyOverrides');
     await applyOverrides({
         root,
         commitHash,
         pathPrefix,
+        serverStaticPath,
     });
     console.timeEnd('applyOverrides');
     console.time('addExtension');

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.33.10';
-export const commit = '65becc8';
-export const date = '2024-09-07T20:14:21.000Z';
+export const version = '0.33.12';
+export const commit = 'd8ce5d8';
+export const date = '2024-09-08T19:48:59.000Z';
 export const getVersion = () => {
     return version;
 };