johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-11 22:14:05 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging-render' into niwinz-develop-merge

Browse Source
This commit is contained in:
Andrey Antukh
2025-12-10 13:53:15 +01:00
parent 0956b66281 a78477592b
commit eb1eeb4750
26 changed files with 784 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/scripts/_helpers.js
View File

@@ -181,8 +181,8 @@ export async function watch(baseDir, predicate, callback) {
});
}
async function readManifestFile() {
const manifestPath = "resources/public/js/manifest.json";
async function readManifestFile(resource) {
const manifestPath = "resources/public/" + resource;
let content = await fs.readFile(manifestPath, { encoding: "utf8" });
return JSON.parse(content);
}

4
frontend/scripts/build
View File

@@ -29,7 +29,7 @@ rm -rf target/dist;
mkdir -p resources/public;
mkdir -p target/dist;
yarn run build:app:main $EXTRA_PARAMS || exit 1
yarn run build:app:main $EXTRA_PARAMS;
if [ "$INCLUDE_WASM" = "yes" ]; then
yarn run build:wasm || exit 1;
@@ -38,8 +38,6 @@ fi
yarn run build:app:libs || exit 1;
yarn run build:app:assets || exit 1;
sed -i "s/render-wasm.js/render-wasm.js?version=$CURRENT_VERSION/g" ./resources/public/js/worker/main.js;
rsync -avr resources/public/ target/dist/;
if [ "$INCLUDE_STORYBOOK" = "yes" ]; then