Skip to content

Commit 688b7c5

Browse files
jh-488jh-488
committed
Merge remote-tracking branch 'origin/feat/lib' - resolved conflicts in dist/
2 parents 0307db6 + 7f5d68e commit 688b7c5

27 files changed

Lines changed: 278 additions & 107 deletions

‎Dockerfile‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Android builds currently work well with JDK 17 for modern AGP
2-
FROM eclipse-temurin:17-jdk-jammy
2+
FROM eclipse-temurin:21-jdk-jammy
33

44
ARG ANDROID_SDK_ROOT=/opt/android-sdk
55
ENV ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT}
@@ -54,10 +54,28 @@ RUN apt-get update && apt-get install -y \
5454
xdg-utils \
5555
&& rm -rf /var/lib/apt/lists/*
5656

57-
# Install prod deps
57+
# Set working directory
58+
WORKDIR /app
59+
60+
# Install production dependencies
5861
COPY package.json package-lock.json* ./
5962
RUN npm ci --omit=dev
6063

64+
# Pre-cache Capacitor dependencies for Android builds
65+
RUN mkdir -p /tmp/capacitor-cache && \
66+
cd /tmp/capacitor-cache && \
67+
echo '{"dependencies":{"@capacitor/cli":"^8.0.0","@capacitor-community/text-to-speech":"git+https://github.com/capacitor-community/text-to-speech.git#v8.0.0","@capacitor/android":"^8.0.0","@capacitor/assets":"^3.0.5","@capacitor/core":"^8.0.0"}}' > package.json && \
68+
npm install && \
69+
cd / && \
70+
rm -rf /tmp/capacitor-cache
71+
72+
# Copy the dist folder
73+
COPY dist/ ./dist/
74+
75+
# Create symlink for server public folder at expected path
76+
RUN mkdir -p /app/liascript-exporter/server && \
77+
ln -s /app/dist/server/public /app/liascript-exporter/server/public
78+
6179
# Install Puppeteer's Chrome explicitly
6280
RUN npx puppeteer browsers install chrome
6381

@@ -67,12 +85,10 @@ RUN CHROME_PATH=$(find /root/.cache/puppeteer -name chrome -type f | head -n 1)
6785
echo "Chrome installed at: $CHROME_PATH" && \
6886
chmod +x /etc/profile.d/puppeteer.sh
6987

70-
COPY dist/ liascript-exporter/
71-
7288
# Create entrypoint script that sources the environment
7389
RUN echo '#!/bin/sh\n\
7490
export PUPPETEER_EXECUTABLE_PATH=$(find /root/.cache/puppeteer -name chrome -type f | head -n 1)\n\
75-
exec node liascript-exporter/index.js "$@"' > /entrypoint.sh && \
91+
exec node /app/dist/index.js "$@"' > /entrypoint.sh && \
7692
chmod +x /entrypoint.sh
7793

7894
EXPOSE 4000

‎dist/assets/capacitor/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html><html lang=en><script type=importmap>{"imports":{"1cUsp":"./Worker.ca225a04.js","2bBfb":"./Edrys.29c3108c.js","4cODj":"./jszip.min.14ce2132.js","5Mlcg":"./pako.esm.4aa9df4d.js","7KKua":"./trystero-ipfs.min.4ceb3ddb.js","8kvJf":"./Gun.87d52077.js","cTsu0":"./PubNub.36bb6b10.js","cx0Il":"./P2PT.fef6d8bd.js","gMhJI":"./trystero-nostr.min.8a4beacb.js","gUkTw":"./trystero-mqtt.min.09aa6020.js","h2gA3":"./trystero-torrent.min.b81c5562.js","ikUA4":"./node.f07ef7eb.js","jG5Jg":"./Edrys.fbbcda8c.js","jffyJ":"./Browser.a6089593.js","kI8zr":"./Trystero.f2f39d42.js"}}</script><link rel=stylesheet href=indexeddb.75877dff.css><title>Lia</title><meta charset=utf-8><meta name=viewport content="width=device-width, initial-scale=1, shrink-to-fit=no"><script src=indexeddb.1ce337c6.js></script><script defer type=module src=indexeddb.4a5ca6ea.js></script><script defer type=module src=indexeddb.59a2ad1a.js></script><script defer type=module src=indexeddb.e7937501.js></script><script defer type=module src=indexeddb.7e6f5d23.js></script><script defer type=module src=indexeddb.5f81c79a.js></script><script defer type=module src=indexeddb.ab51fb6d.js></script><script defer type=module src=indexeddb.1cea18e0.js></script><script defer type=module src=indexeddb.14ab8e56.js></script><script defer type=module src=indexeddb.4071d674.js></script><script>"serviceWorker"in navigator&&window.addEventListener("load",function(){try{navigator.serviceWorker.register("./sw.js").then(console.log).catch(console.error)}catch(e){console.warn("sw: ",e)}});</script><link rel="icon shortcut" sizes=192x192 href=logo_192.787d10c9.png><meta name=mobile-web-app-capable content=yes><meta name=application-name content=Lia><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black-translucent><meta name=apple-mobile-web-app-title content=LiaScript><meta name=msapplication-TileImage content=logo_192.787d10c9.png><meta name=msapplication-TileColor content=#0071c5><meta name=msapplication-tap-highlight content=no><meta name=theme-color content=#000000><meta name=description content="LiaScript is a service for running free and interactive online courses, build with its own Markup-language. So check out the following course ;-)"><link rel=apple-touch-icon href=logo.91c6be09.png><link rel=icon href=logo.91c6be09.png type=image/png><style>.lds-dual-ring{width:150px;height:150px;display:inline-block}.lds-dual-ring:after{content:" ";border:5px solid #000;border-color:#000 #0000;border-radius:50%;width:128px;height:128px;margin:1px;animation:1.2s linear infinite lds-dual-ring;display:block}@keyframes lds-dual-ring{0%{transform:rotate(0)}to{transform:rotate(360deg)}}</style><link rel=stylesheet href=indexeddb.78f51898.css media=none onload="if (media != 'all') media = 'all'"><link rel=stylesheet href=indexeddb.d3eae2fb.css><body>
1+
<!DOCTYPE html><html lang=en><script type=importmap>{"imports":{"1cUsp":"./Worker.ca225a04.js","2bBfb":"./Edrys.29c3108c.js","4cODj":"./jszip.min.14ce2132.js","5Mlcg":"./pako.esm.4aa9df4d.js","7KKua":"./trystero-ipfs.min.4ceb3ddb.js","8kvJf":"./Gun.87d52077.js","cTsu0":"./PubNub.36bb6b10.js","cx0Il":"./P2PT.fef6d8bd.js","gMhJI":"./trystero-nostr.min.8a4beacb.js","gUkTw":"./trystero-mqtt.min.09aa6020.js","h2gA3":"./trystero-torrent.min.b81c5562.js","ikUA4":"./node.f07ef7eb.js","jG5Jg":"./Edrys.fbbcda8c.js","jffyJ":"./Browser.a6089593.js","kI8zr":"./Trystero.f2f39d42.js"}}</script><link rel=stylesheet href=indexeddb.75877dff.css><title>Lia</title><meta charset=utf-8><meta name=viewport content="width=device-width, initial-scale=1, shrink-to-fit=no"><script src=indexeddb.1ce337c6.js></script><script defer type=module src=indexeddb.4a5ca6ea.js></script><script defer type=module src=indexeddb.59a2ad1a.js></script><script defer type=module src=indexeddb.e7937501.js></script><script defer type=module src=indexeddb.84f6611a.js></script><script defer type=module src=indexeddb.5f81c79a.js></script><script defer type=module src=indexeddb.ab51fb6d.js></script><script defer type=module src=indexeddb.1cea18e0.js></script><script defer type=module src=indexeddb.14ab8e56.js></script><script defer type=module src=indexeddb.4071d674.js></script><script>"serviceWorker"in navigator&&window.addEventListener("load",function(){try{navigator.serviceWorker.register("./sw.js").then(console.log).catch(console.error)}catch(e){console.warn("sw: ",e)}});</script><link rel="icon shortcut" sizes=192x192 href=logo_192.787d10c9.png><meta name=mobile-web-app-capable content=yes><meta name=application-name content=Lia><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black-translucent><meta name=apple-mobile-web-app-title content=LiaScript><meta name=msapplication-TileImage content=logo_192.787d10c9.png><meta name=msapplication-TileColor content=#0071c5><meta name=msapplication-tap-highlight content=no><meta name=theme-color content=#000000><meta name=description content="LiaScript is a service for running free and interactive online courses, build with its own Markup-language. So check out the following course ;-)"><link rel=apple-touch-icon href=logo.91c6be09.png><link rel=icon href=logo.91c6be09.png type=image/png><style>.lds-dual-ring{width:150px;height:150px;display:inline-block}.lds-dual-ring:after{content:" ";border:5px solid #000;border-color:#000 #0000;border-radius:50%;width:128px;height:128px;margin:1px;animation:1.2s linear infinite lds-dual-ring;display:block}@keyframes lds-dual-ring{0%{transform:rotate(0)}to{transform:rotate(360deg)}}</style><link rel=stylesheet href=indexeddb.1186ce17.css media=none onload="if (media != 'all') media = 'all'"><link rel=stylesheet href=indexeddb.d3eae2fb.css><body>
22
<noscript> This page requires JavaScript to be enabled! </noscript>
33

44
<div id=IE-message hidden=true>

dist/assets/capacitor/indexeddb.78f51898.css renamed to dist/assets/capacitor/indexeddb.1186ce17.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/capacitor/indexeddb.7e6f5d23.js renamed to dist/assets/capacitor/indexeddb.84f6611a.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/indexeddb/index.7a84f1c0.js renamed to dist/assets/indexeddb/index.01453095.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/indexeddb/index.62ac063f.js renamed to dist/assets/indexeddb/index.267cc4e0.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/assets/indexeddb/index.html‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
<!DOCTYPE html><html lang="en"><head><title>Lia</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><script src="index.4fa9e2a8.js"></script><script defer type="module" src="index.00e98385.js"></script><script defer src="index.deae52fe.js" nomodule></script><script defer type="module" src="index.06137027.js"></script><script defer src="index.6f7eabf7.js" nomodule></script><script defer type="module" src="index.616e5487.js"></script><script defer src="index.90798388.js" nomodule></script><script defer type="module" src="index.d6fb39ad.js"></script><script defer src="index.435ebcee.js" nomodule></script><script defer type="module" src="index.cf6dd821.js"></script><script defer src="index.04cf4c29.js" nomodule></script><script defer type="module" src="index.59135e9b.js"></script><script defer src="index.cf9454a9.js" nomodule></script><script defer type="module" src="index.2e1efa5b.js"></script><script defer src="index.56b4a76b.js" nomodule></script><script defer type="module" src="index.1df2912f.js"></script><script defer src="index.02e1e0e7.js" nomodule></script><script defer type="module" src="index.dbe3fe41.js"></script><script defer src="index.1edbdfd2.js" nomodule></script><script>"serviceWorker"in navigator&&window.addEventListener("load",(function(){try{navigator.serviceWorker.register("./sw.js").then(console.log).catch(console.error)}catch(e){console.warn("sw: ",e)}}));</script><link rel="icon shortcut" sizes="192x192" href="up_/up_/assets/logo_192.png"><meta name="mobile-web-app-capable" content="yes"><meta name="application-name" content="Lia"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><meta name="apple-mobile-web-app-title" content="LiaScript"><meta name="msapplication-TileImage" content="up_/up_/assets/logo_192.png"><meta name="msapplication-TileColor" content="#0071c5"><meta name="msapplication-tap-highlight" content="no"><meta name="theme-color" content="#000000"><meta name="description" content="LiaScript is a service for running free and interactive online courses, build with its own Markup-language. So check out the following course ;-)"><link rel="apple-touch-icon" href="logo.8a716d9b.png"><link rel="icon" href="logo.8a716d9b.png" type="image/png"><style>.lds-dual-ring{width:150px;height:150px;display:inline-block}.lds-dual-ring:after{content:" ";width:128px;height:128px;border:5px solid #000;border-color:#000 transparent;border-radius:50%;margin:1px;-webkit-animation:1.2s linear infinite lds-dual-ring;-moz-animation:1.2s linear infinite lds-dual-ring;animation:1.2s linear infinite lds-dual-ring;display:block}@-webkit-keyframes lds-dual-ring{0%{-moz-transform:rotate(0);transform:rotate(0)}to{-moz-transform:rotate(360deg);transform:rotate(360deg)}}@-moz-keyframes lds-dual-ring{0%{-moz-transform:rotate(0);transform:rotate(0)}to{-moz-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes lds-dual-ring{0%{-moz-transform:rotate(0);transform:rotate(0)}to{-moz-transform:rotate(360deg);transform:rotate(360deg)}}</style><link rel="stylesheet" href="index.2590f330.css" media="none" onload="if(media!='all')media='all'"><link rel="stylesheet" href="index.72f1f2e6.css"></head><body> <noscript> This page requires JavaScript to be enabled! </noscript> <div id="IE-message" hidden> <h1>LiaScript - Problem</h1> <p> Hello! Welcome to LiaScript. This site is not fully supported in Internet Explorer 11 (and earlier) versions. </p> <p> As an alternative, you can use either of the options below to browse the site: </p> <ol> <li> Use Firefox browser. Here is the <a href="http://www.mozilla.org/en-US/firefox/new/">download link.</a> </li> <li> Use Google Chrome browser. Here is the <a href="https://support.google.com/chrome/answer/95346?hl=en">download link.</a> </li> </ol> <p>Thanks.</p> </div> <div style="width:100%;text-align:center;position:absolute;top:25%"> <h1>Loading</h1> <br> <div class="lds-dual-ring"></div> </div> </body></html>
3-
=======
4-
<!DOCTYPE html><html lang="en"><head><title>Lia</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><script src="index.4fa9e2a8.js"></script><script defer type="module" src="index.d026b7f5.js"></script><script defer src="index.4850ad50.js" nomodule></script><script defer type="module" src="index.40df2935.js"></script><script defer src="index.740c63b7.js" nomodule></script><script defer type="module" src="index.616e5487.js"></script><script defer src="index.90798388.js" nomodule></script><script defer type="module" src="index.7a84f1c0.js"></script><script defer src="index.62ac063f.js" nomodule></script><script defer type="module" src="index.ddf8a9e1.js"></script><script defer src="index.d5feb9a8.js" nomodule></script><script defer type="module" src="index.fe00c88d.js"></script><script defer src="index.818ded7e.js" nomodule></script><script defer type="module" src="index.a440c736.js"></script><script defer src="index.ac122055.js" nomodule></script><script defer type="module" src="index.1df2912f.js"></script><script defer src="index.02e1e0e7.js" nomodule></script><script defer type="module" src="index.c497fc87.js"></script><script defer src="index.36d5db33.js" nomodule></script><script>"serviceWorker"in navigator&&window.addEventListener("load",(function(){try{navigator.serviceWorker.register("./sw.js").then(console.log).catch(console.error)}catch(e){console.warn("sw: ",e)}}));</script><link rel="icon shortcut" sizes="192x192" href="up_/up_/assets/logo_192.png"><meta name="mobile-web-app-capable" content="yes"><meta name="application-name" content="Lia"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><meta name="apple-mobile-web-app-title" content="LiaScript"><meta name="msapplication-TileImage" content="up_/up_/assets/logo_192.png"><meta name="msapplication-TileColor" content="#0071c5"><meta name="msapplication-tap-highlight" content="no"><meta name="theme-color" content="#000000"><meta name="description" content="LiaScript is a service for running free and interactive online courses, build with its own Markup-language. So check out the following course ;-)"><link rel="apple-touch-icon" href="logo.8a716d9b.png"><link rel="icon" href="logo.8a716d9b.png" type="image/png"><style>.lds-dual-ring{width:150px;height:150px;display:inline-block}.lds-dual-ring:after{content:" ";width:128px;height:128px;border:5px solid #000;border-color:#000 transparent;border-radius:50%;margin:1px;-moz-animation:1.2s linear infinite lds-dual-ring;animation:1.2s linear infinite lds-dual-ring;display:block}@-moz-keyframes lds-dual-ring{0%{-moz-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0)}to{-moz-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes lds-dual-ring{0%{-moz-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0)}to{-moz-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg)}}</style><link rel="stylesheet" href="index.492b5352.css" media="none" onload="if(media!='all')media='all'"><link rel="stylesheet" href="index.17eb4915.css"></head><body> <noscript> This page requires JavaScript to be enabled! </noscript> <div id="IE-message" hidden> <h1>LiaScript - Problem</h1> <p> Hello! Welcome to LiaScript. This site is not fully supported in Internet Explorer 11 (and earlier) versions. </p> <p> As an alternative, you can use either of the options below to browse the site: </p> <ol> <li> Use Firefox browser. Here is the <a href="http://www.mozilla.org/en-US/firefox/new/">download link.</a> </li> <li> Use Google Chrome browser. Here is the <a href="https://support.google.com/chrome/answer/95346?hl=en">download link.</a> </li> </ol> <p>Thanks.</p> </div> <div style="width:100%;text-align:center;position:absolute;top:25%"> <h1>Loading</h1> <br> <div class="lds-dual-ring"></div> </div> </body></html>
5-
>>>>>>> 410a3fbc3126727b4b27258c6fbfbd848b1989a6
1+
<!DOCTYPE html><html lang="en"><head><title>Lia</title><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"><script src="index.4fa9e2a8.js"></script><script defer type="module" src="index.d026b7f5.js"></script><script defer src="index.4850ad50.js" nomodule></script><script defer type="module" src="index.40df2935.js"></script><script defer src="index.740c63b7.js" nomodule></script><script defer type="module" src="index.616e5487.js"></script><script defer src="index.90798388.js" nomodule></script><script defer type="module" src="index.01453095.js"></script><script defer src="index.267cc4e0.js" nomodule></script><script defer type="module" src="index.ddf8a9e1.js"></script><script defer src="index.d5feb9a8.js" nomodule></script><script defer type="module" src="index.fe00c88d.js"></script><script defer src="index.818ded7e.js" nomodule></script><script defer type="module" src="index.a440c736.js"></script><script defer src="index.ac122055.js" nomodule></script><script defer type="module" src="index.1df2912f.js"></script><script defer src="index.02e1e0e7.js" nomodule></script><script defer type="module" src="index.c497fc87.js"></script><script defer src="index.36d5db33.js" nomodule></script><script>"serviceWorker"in navigator&&window.addEventListener("load",(function(){try{navigator.serviceWorker.register("./sw.js").then(console.log).catch(console.error)}catch(e){console.warn("sw: ",e)}}));</script><link rel="icon shortcut" sizes="192x192" href="up_/up_/assets/logo_192.png"><meta name="mobile-web-app-capable" content="yes"><meta name="application-name" content="Lia"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"><meta name="apple-mobile-web-app-title" content="LiaScript"><meta name="msapplication-TileImage" content="up_/up_/assets/logo_192.png"><meta name="msapplication-TileColor" content="#0071c5"><meta name="msapplication-tap-highlight" content="no"><meta name="theme-color" content="#000000"><meta name="description" content="LiaScript is a service for running free and interactive online courses, build with its own Markup-language. So check out the following course ;-)"><link rel="apple-touch-icon" href="logo.8a716d9b.png"><link rel="icon" href="logo.8a716d9b.png" type="image/png"><style>.lds-dual-ring{width:150px;height:150px;display:inline-block}.lds-dual-ring:after{content:" ";width:128px;height:128px;border:5px solid #000;border-color:#000 transparent;border-radius:50%;margin:1px;-moz-animation:1.2s linear infinite lds-dual-ring;animation:1.2s linear infinite lds-dual-ring;display:block}@-moz-keyframes lds-dual-ring{0%{-moz-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0)}to{-moz-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes lds-dual-ring{0%{-moz-transform:rotate(0);-ms-transform:rotate(0);transform:rotate(0)}to{-moz-transform:rotate(360deg);-ms-transform:rotate(360deg);transform:rotate(360deg)}}</style><link rel="stylesheet" href="index.492b5352.css" media="none" onload="if(media!='all')media='all'"><link rel="stylesheet" href="index.17eb4915.css"></head><body> <noscript> This page requires JavaScript to be enabled! </noscript> <div id="IE-message" hidden> <h1>LiaScript - Problem</h1> <p> Hello! Welcome to LiaScript. This site is not fully supported in Internet Explorer 11 (and earlier) versions. </p> <p> As an alternative, you can use either of the options below to browse the site: </p> <ol> <li> Use Firefox browser. Here is the <a href="http://www.mozilla.org/en-US/firefox/new/">download link.</a> </li> <li> Use Google Chrome browser. Here is the <a href="https://support.google.com/chrome/answer/95346?hl=en">download link.</a> </li> </ol> <p>Thanks.</p> </div> <div style="width:100%;text-align:center;position:absolute;top:25%"> <h1>Loading</h1> <br> <div class="lds-dual-ring"></div> </div> </body></html>

dist/assets/indexeddb/jszip.min.4fbcc13f.js renamed to dist/assets/indexeddb/jszip.min.63142cc8.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/assets/scorm2004/jszip.min.eaecf580.js renamed to dist/assets/indexeddb/jszip.min.eaecf580.js

File renamed without changes.

dist/assets/scorm2004/index.e7ed43a8.js renamed to dist/assets/scorm2004/index.2eec91aa.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)