underpost 2.7.7 → 2.7.8

package/.github/workflows/ghpkg.yml

@@ -0,0 +1,75 @@
+name: Update github repo package
+on:
+  push:
+    branches: ['master']
+  pull_request:
+    branches: ['master']
+permissions:
+  contents: write
+  packages: write
+  id-token: write
+jobs:
+  test:
+    if: github.repository == 'underpostnet/pwa-microservices-template'
+    name: Update github repo package Jobs
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      packages: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22.x'
+
+        # - name: Get npm root
+        #   run: sudo npm root -g
+
+        # - run: npm ci
+
+        # - name: Install underpost cli
+        #   run: sudo npm install -g underpost
+
+        # usage: git remote set-url [--push] <name> <newurl> [<oldurl>]
+        #    or: git remote set-url --add <name> <newurl>
+        #    or: git remote set-url --delete <name> <url>
+        #     --[no-]push           manipulate push URLs
+        #     --[no-]add            add URL
+        #     --[no-]delete         delete URLs
+
+      - name: Install dependencies and set repo configuration
+        run: |
+          npm install
+          node ./bin/deploy rename-package @underpostnet/underpost
+          node ./bin/deploy set-repo underpostnet/pwa-microservices-template-ghpkg
+
+      - name: Clone github package repository
+        run: |
+          git clone https://github.com/underpostnet/pwa-microservices-template-ghpkg.git
+          rm -rf ./.git
+          cp -a  ./pwa-microservices-template-ghpkg/.git ./.git
+          rm -rf ./pwa-microservices-template-ghpkg
+
+      - name: Set git credentials
+        run: |
+          git config --global credential.helper ""
+          git config credential.helper ""
+          git config --global user.name 'underpostnet'
+          git config --global user.email 'fcoverdugoa@underpost.net'
+          git config --global credential.interactive always
+          git config user.name 'underpostnet'
+          git config user.email 'fcoverdugoa@underpost.net'
+          git config credential.interactive always
+
+      - name: Push to github package repository
+        run: |
+          pwd
+          git status
+          git remote set-url origin git@github.com:underpostnet/pwa-microservices-template-ghpkg.git
+          git add .       
+          git commit -m "Update github repo package"
+          git push https://${{ secrets.GIT_AUTH_TOKEN }}@github.com/underpostnet/pwa-microservices-template-ghpkg.git
+
+# git push -u origin https://${{ secrets.GIT_AUTH_TOKEN }}@github.com/underpostnet/pwa-microservices-template-ghpkg.git
+# git push -u origin master

package/.github/workflows/publish.yml

@@ -34,7 +34,27 @@ jobs:
         name: Publish to npm
         run: npm publish --provenance --access public
 
-        # Publish to npm
+      - name: Clone github package repository
+        run: |
+          git clone https://github.com/underpostnet/pwa-microservices-template-ghpkg.git
+          rm -rf ./.git
+          cp -a  ./pwa-microservices-template-ghpkg/.git ./.git
+          rm -rf ./pwa-microservices-template-ghpkg
+          node ./bin/deploy rename-package @underpostnet/underpost
+          node ./bin/deploy set-repo underpostnet/pwa-microservices-template-ghpkg
+
+      - name: Set git credentials
+        run: |
+          git config --global credential.helper ""
+          git config credential.helper ""
+          git config --global user.name 'underpostnet'
+          git config --global user.email 'fcoverdugoa@underpost.net'
+          git config --global credential.interactive always
+          git config user.name 'underpostnet'
+          git config user.email 'fcoverdugoa@underpost.net'
+          git config credential.interactive always
+
+      # Publish to npm git hub package
       - uses: actions/setup-node@v4
         with:
           node-version: '22.x'
@@ -45,7 +65,6 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         name: Publish to npm
         run: |
-          node ./bin/deploy rename-package @underpostnet/underpost
           npm publish --provenance --access public
 
       # Publish to GitHub Packages
@@ -58,7 +77,6 @@ jobs:
           scope: '@underpostnet'
 
       - run: |
-          node ./bin/deploy rename-package @underpostnet/underpost
           npm config set //npm.pkg.github.com/:_authToken=${{ secrets.GIT_AUTH_TOKEN }}
           echo "//npm.pkg.github.com/:_authToken=${{ secrets.GIT_AUTH_TOKEN }}" > ~/.npmrc
           echo "@underposnet:registry=https://npm.pkg.github.com" >> ~/.npmrc

package/.github/workflows/pwa-microservices-template.test.yml

@@ -0,0 +1,30 @@
+name: Test
+on: [push]
+jobs:
+  test:
+    if: (github.repository == 'underpostnet/pwa-microservices-template') || (github.repository == 'underpostnet/pwa-microservices-template-ghpkg')
+    name: Node ${{ matrix.node }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        node-version: [21.x]
+        os: [ubuntu-latest]
+      #  os: [ubuntu-latest, windows-latest]
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
+
+      - name: Set Node.js version
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: Get npm root
+        run: sudo npm root -g
+
+      - name: Install underpost cli
+        run: sudo npm install -g underpost
+
+      - name: Run test
+        run: sudo underpost test

package/bin/deploy.js

@@ -502,6 +502,17 @@ try {
       break;
     }
 
+    case 'set-repo': {
+      const originPackage = JSON.parse(fs.readFileSync(`./package.json`, 'utf8'));
+      originPackage.repository = {
+        type: 'git',
+        url: `git+https://github.com/${process.argv[3]}.git`,
+      };
+      fs.writeFileSync(`./package.json`, JSON.stringify(originPackage, null, 4), 'utf8');
+
+      break;
+    }
+
     case 'update-version':
       {
         const newVersion = process.argv[3];
@@ -553,9 +564,9 @@ try {
         );
 
         fs.writeFileSync(
-          `./src/client/ssr/body-components/CacheControl.js`,
+          `./src/client/ssr/components/body/CacheControl.js`,
           fs
-            .readFileSync(`./src/client/ssr/body-components/CacheControl.js`, 'utf8')
+            .readFileSync(`./src/client/ssr/components/body/CacheControl.js`, 'utf8')
             .replaceAll(`v${version}`, `v${newVersion}`),
           'utf8',
         );

package/bin/index.js

@@ -19,7 +19,7 @@ const globalBinFolder = `${shellExec(`npm root -g`, {
 
 const program = new Command();
 
-const version = '2.7.7';
+const version = '2.7.8';
 
 program.name('underpost').description(`underpost.net ci/cd cli ${version}`).version(version);
 

package/docker-compose.yml

@@ -58,7 +58,7 @@ services:
           cpus: '0.25'
           memory: 20M
     labels: # labels in Compose file instead of Dockerfile
-      engine.version: '2.7.7'
+      engine.version: '2.7.8'
     networks:
       - load-balancer
 

package/package.json

@@ -2,7 +2,7 @@
     "type": "module",
     "main": "src/index.js",
     "name": "underpost",
-    "version": "2.7.7",
+    "version": "2.7.8",
     "description": "pwa api rest template",
     "scripts": {
         "start": "env-cmd -f .env.production node --max-old-space-size=8192 src/server",

package/src/client/components/core/Css.js

@@ -31,228 +31,6 @@ const Css = {
   Init: async function (options) {
     if (!options) options = ThemesScope[0];
     const { theme } = options;
-    append(
-      'body',
-      html`
-        <style>
-          html {
-            scroll-behavior: smooth;
-          }
-
-          body {
-            /* overscroll-behavior: contain; */
-            /* box-sizing: border-box; */
-            padding: 0px;
-            margin: 0px;
-          }
-
-          .fl {
-            position: relative;
-            display: flow-root;
-          }
-
-          .abs,
-          .in {
-            display: block;
-          }
-
-          .fll {
-            float: left;
-          }
-
-          .flr {
-            float: right;
-          }
-
-          .abs {
-            position: absolute;
-          }
-
-          .in,
-          .inl {
-            position: relative;
-          }
-
-          .inl {
-            display: inline-table;
-            display: -webkit-inline-table;
-            display: -moz-inline-table;
-            display: -ms-inline-table;
-            display: -o-inline-table;
-          }
-
-          .fix {
-            position: fixed;
-            display: block;
-          }
-
-          .stq {
-            position: sticky;
-            /* require defined at least top, bottom, left o right */
-          }
-
-          .wfa {
-            width: available;
-            width: -webkit-available;
-            width: -moz-available;
-            width: -ms-available;
-            width: -o-available;
-
-            width: fill-available;
-            width: -webkit-fill-available;
-            width: -moz-fill-available;
-            width: -ms-fill-available;
-            width: -o-fill-available;
-          }
-
-          .wft {
-            width: fit-content;
-            width: -webkit-fit-content;
-            width: -moz-fit-content;
-            width: -ms-fit-content;
-            width: -o-fit-content;
-          }
-
-          .wfm {
-            width: max-content;
-            width: -webkit-max-content;
-            width: -moz-max-content;
-            width: -ms-max-content;
-            width: -o-max-content;
-          }
-
-          .negative-color {
-            filter: invert(1);
-            -webkit-filter: invert(1);
-            -moz-filter: invert(1);
-            -ms-filter: invert(1);
-            -o-filter: invert(1);
-          }
-
-          .no-drag {
-            user-drag: none;
-            -webkit-user-drag: none;
-            -moz-user-drag: none;
-            -ms-user-drag: none;
-            -o-user-drag: none;
-            user-select: none;
-            -webkit-user-select: none;
-            -moz-user-select: none;
-            -ms-user-select: none;
-            -o-user-select: none;
-          }
-
-          .center {
-            transform: translate(-50%, -50%);
-            top: 50%;
-            left: 50%;
-            width: 100%;
-            text-align: center;
-          }
-
-          input {
-            outline: none !important;
-            border: none;
-            padding-block: 0;
-            padding-inline: 0;
-          }
-          input::file-selector-button {
-            outline: none !important;
-            border: none;
-          }
-
-          .hide {
-            display: none !important;
-          }
-          /*
-
-          placeholder
-
-          */
-
-          ::placeholder {
-            color: black;
-            opacity: 1;
-            /* Firefox */
-            background: none;
-          }
-
-          :-ms-input-placeholder {
-            /* Internet Explorer 10-11 */
-            color: black;
-            background: none;
-          }
-
-          ::-ms-input-placeholder {
-            /* Microsoft Edge */
-            color: black;
-            background: none;
-          }
-
-          /*
-
-          selection
-
-          */
-
-          ::-moz-selection {
-            /* Code for Firefox */
-            color: black;
-            background: rgb(208, 208, 208);
-          }
-
-          ::selection {
-            color: black;
-            background: rgb(208, 208, 208);
-          }
-
-          .lowercase {
-            text-transform: lowercase;
-          }
-          .uppercase {
-            text-transform: uppercase;
-          }
-          .capitalize {
-            text-transform: capitalize;
-          }
-
-          .bold {
-            font-weight: bold;
-          }
-
-          .m {
-            font-family: monospace;
-          }
-
-          .gray {
-            filter: grayscale(1);
-          }
-        </style>
-        <div class="session">
-          <style>
-            .session-in-log-out {
-              display: block;
-            }
-            .session-inl-log-out {
-              display: inline-table;
-            }
-            .session-fl-log-out {
-              display: flow-root;
-            }
-            .session-in-log-in {
-              display: none;
-            }
-            .session-inl-log-in {
-              display: none;
-            }
-            .session-fl-log-in {
-              display: none;
-            }
-          </style>
-        </div>
-        <div class="theme"></div>
-      `,
-    );
     return await Themes[theme](options);
   },
   RenderSetting: async function () {

package/src/client/components/core/Docs.js

@@ -63,7 +63,7 @@ const Docs = {
       icon: html`<i class="fa-brands fa-osi"></i>`,
       text: 'Source Docs',
       url: function () {
-        return `${getProxyPath()}docs/engine/2.7.7`;
+        return `${getProxyPath()}docs/engine/2.7.8`;
       },
     },
     {

package/src/client/components/core/Translate.js

@@ -1,7 +1,7 @@
 import { newInstance, getId, cap, capFirst } from './CommonJs.js';
 import { DropDown } from './DropDown.js';
 import { loggerFactory } from './Logger.js';
-import { s, htmls } from './VanillaJs.js';
+import { s, htmls, getLang } from './VanillaJs.js';
 
 const logger = loggerFactory(import.meta);
 
@@ -66,7 +66,11 @@ const Translate = {
 
 const TranslateCore = {
   Init: async function () {
-    if (localStorage.getItem('lang')) s('html').lang = localStorage.getItem('lang');
+    s('html').lang = localStorage.getItem('lang')
+      ? localStorage.getItem('lang')
+      : getLang() && getLang().match('es')
+      ? 'es'
+      : 'en';
     Translate.Data = {
       ...Translate.Data,
       isEmpty: {

package/src/client/components/core/Worker.js

@@ -90,14 +90,24 @@ const Worker = {
     if (isInstall) {
       const cacheNames = await caches.keys();
       for (const cacheName of cacheNames) {
-        if (cacheName.match('components/') || cacheName.match('services/') || cacheName.match('.index.js')) {
+        if (
+          cacheName.match('components/') ||
+          cacheName.match('services/') ||
+          cacheName.match('.index.js') ||
+          cacheName.match('offline.')
+        ) {
           await caches.delete(cacheName);
         }
       }
-      this.updateServiceWorker();
+      await this.updateServiceWorker();
+      try {
+        await fetch('/offline.html');
+      } catch (error) {
+        logger.error('error');
+      }
     }
   },
-  updateServiceWorker: function () {},
+  updateServiceWorker: async function () {},
   status: function () {
     let status = false;
     return new Promise((resolve, reject) => {
@@ -110,7 +120,7 @@ const Worker = {
               else if (registration.waiting) logger.info('waiting', registration);
               else if (registration.active) {
                 logger.info('active', registration);
-                this.updateServiceWorker = () => registration.update();
+                this.updateServiceWorker = async () => await registration.update();
               }
             }
             if (registrations.length > 0) status = true;