Merge pull request #5 from flameshikari/dev

merge dev into master

Dockerfile

@@ -5,9 +5,13 @@ RUN npm install -d --no-package-lock
 COPY . .
 RUN npm run build
 
-FROM erseco/alpine-php-webserver:latest AS release
-RUN rm -rf /var/www/html/* && \
-    echo 'short_open_tag = On' >> /etc/php83/conf.d/custom.ini && \
-    sed -i 's|$uri/|$uri/ $uri.html|; s|fastcgi_index.*|expires 7d;|; s/ico|xml/ico|xml|txt/' /etc/nginx/nginx.conf
-
+FROM erseco/alpine-php-webserver:3.20.4 AS release
+USER root
+RUN apk add --no-cache bash && \
+    rm -rf /var/www/html/*
+COPY ./docker/docker_setup.sh /setup.sh
+COPY ./docker/populate_cache.sh /usr/bin/populate
+RUN bash /setup.sh && \
+    chmod +x /usr/bin/populate
 COPY --chown=nobody:nobody --from=build /app/public/. /var/www/html
+USER nobody

client/index.html

@@ -43,7 +43,7 @@
                 </fieldset>
 
                 <fieldset class="col-12 cell glyphs">
-                    <legend>Glyphs <span id="company-legend"></span></legend>
+                    <legend>Glyphs <span id="dev-legend"></span></legend>
                     <img id="uppercase">
                     <br>
                     <img id="lowercase">

client/index.js

@@ -32,22 +32,25 @@ const esbuildOpts = {
     bundle: true,
     treeShaking: true,
     write: true,
+    legalComments: 'none',
     assetNames: '[name]',
     chunkNames: 'assets/[name]-[hash]',
 };
 
 const minifyOptions = {
-    collapseBooleanAttributes: true,
-    collapseWhitespace: true,
-    decodeEntities: true,
-    html5: false,
-    minifyURLs: true,
-    removeComments: true,
-    removeAttributeQuotes: true,
+    normalizeAttributeValues: true,
     removeEmptyAttributes: true,
-    removeRedundantAttributes: true,
-    sortClassName: true,
+    collapseAttributeWhitespace: true,
+    removeRedundantAttributes: false,
+    deduplicateAttributeValues: true,
+    minifyUrls: true,
     sortAttributes: true,
+    sortAttributesWithLists: 'alphabetical',
+    collapseWhitespace: 'conservative',
+    removeComments: 'safe',
+    minifyConditionalComments: true,
+    removeOptionalTags: true,
+    removeAttributeQuotes: true,
 };