[REF] Updating dependencies.

.gitignore

@@ -12,4 +12,6 @@
 /functions/*
 !/functions/.gitkeep
 optimization-fix-this-file-is-ignored.js
-/.env
+/.env
+# Local Netlify folder
+.netlify

Dockerfile

@@ -1,33 +1,27 @@
-FROM dockershelf/node:16
+FROM dockershelf/node:18-bookworm
 LABEL maintainer "Luis Alejandro Martínez Faneyth <[email protected]>"
 
 ARG UID=1000
 ARG GID=1000
 
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
-ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/google-chrome-stable
+ENV PUPPETEER_EXECUTABLE_PATH /usr/bin/chromium
 
 RUN apt-get update && \
-    apt-get install gnupg dirmngr git sudo libpng-dev \
-                    build-essential autoconf automake gcc \
-                    ruby3.1 ruby3.1-dev python3.10-dev
+    apt-get install chromium gnupg dirmngr git sudo libpng-dev libtool \
+                    build-essential autoconf automake gcc pkg-config \
+                    ruby3.1 ruby3.1-dev python3-dev
 
 RUN dirmngr --debug-level guru
 
 RUN gpg --lock-never --no-default-keyring \
         --keyring /usr/share/keyrings/yarn.gpg \
         --keyserver hkp://keyserver.ubuntu.com:80 \
         --recv-keys 23E7166788B63E1E
-RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
-RUN gpg --lock-never --no-default-keyring \
-        --keyring /usr/share/keyrings/google-chrome.gpg \
-        --keyserver hkp://keyserver.ubuntu.com:80 \
-        --recv-keys 78BD65473CB3BD13
-RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] https://dl-ssl.google.com/linux/chrome/deb/ stable main" | tee /etc/apt/sources.list.d/google-chrome.list
+RUN echo "deb [signed-by=/usr/share/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 
 RUN apt-get update && \
-    apt-get install yarn google-chrome-stable
+    apt-get install yarn
 
 RUN gem install bundler
 

Gemfile.lock

@@ -21,6 +21,7 @@ GEM
     fastimage (2.2.6)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
+    google-protobuf (3.21.12)
     google-protobuf (3.21.12-x86_64-linux)
     html_press (0.8.2)
       htmlentities
@@ -66,6 +67,8 @@ GEM
       css_press
     multi_js (0.1.0)
       uglifier (~> 2)
+    nokogiri (1.14.3-aarch64-linux)
+      racc (~> 1.4)
     nokogiri (1.14.3-x86_64-linux)
       racc (~> 1.4)
     octopress-hooks (2.6.2)
@@ -78,14 +81,16 @@ GEM
       forwardable-extended (~> 2.6)
     public_suffix (5.0.1)
     racc (1.6.2)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
     rouge (4.0.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.57.1-x86_64-linux-gnu)
+    sass-embedded (1.57.1)
       google-protobuf (~> 3.21)
+      rake (>= 10.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     uglifier (2.7.2)
@@ -95,6 +100,7 @@ GEM
     webrick (1.8.1)
 
 PLATFORMS
+  aarch64-linux
   x86_64-linux
 
 DEPENDENCIES

README.md

@@ -28,9 +28,9 @@ Current version: 0.2.5
 
         make dependencies
 
-* Execute the following command to start the project:
+* Execute the following command to start the project, which you can see in `localhost:5000`:
 
-        make start
+        make serve
 
 * Execute the following command to stop the project (you can also hit ctrl+C):
 

_config.yml

@@ -46,6 +46,8 @@ pagination:
   per_page: 20
   permalink: /page/:num/
 
+incremental: true
+
 autopages:
   categories:
     layouts:

_includes/footer.html

@@ -4,38 +4,54 @@
       <div class="row">
         <div class="col-lg-4">
           <div class="footer-text">
-            <p>
-              Collage Labs is building software for multiple digital agencies across the globe. Our team provides personal, professional and friendly service which carefully considers your business goals and requirements.
-            </p>
             <div class="footer-schedule">
-              <span>Collage Labs CA</span>
-              <p>Maracay, Venezuela</p>
+              <span>Collage Labs LLC</span>
+              <p>Calle Cooperativa, N 73. 23 de Enero, Maracay, Venezuela.</p>
               <p>Open Monday to Friday from 7:00 to 17:00</p>
             </div>
+            <p>
+              Collage Labs is building software for multiple digital agencies across the globe. Our team provides
+              personal, professional and friendly service which carefully considers your business goals and
+              requirements.
+            </p>
           </div>
         </div>
         <div class="col-lg-4">
           <div class="footer-contact">
             <ul>
-              <li><svg><use xlink:href="#icophone"></use></svg><a href="tel:+584120333096">+58 412 033 3096</a></li>
-              <li><svg><use xlink:href="#icoemail"></use></svg><a href="mailto:[email protected]">[email protected]</a></li>
               <li>
-                <a href="https://instagram.com/collagelabsco"><svg><use xlink:href="#instagram"></use></svg></a>
-                <a href="https://twitter.com/CollageLabs"><svg><use xlink:href="#twitter"></use></svg></a>
-                <a href="https://facebook.com/CollageLabs"><svg><use xlink:href="#facebook"></use></svg></a>
+                Luis Alejandro Martinez Faneyth
+              </li>
+              <li><svg>
+                  <use xlink:href="#icophone"></use>
+                </svg><a href="tel:+584120333096">+58 424 352 49 70</a></li>
+              <li><svg>
+                  <use xlink:href="#icoemail"></use>
+                </svg><a href="mailto:[email protected]">[email protected]</a></li>
+              <li>
+                <a href="https://instagram.com/collagelabsco"><svg>
+                    <use xlink:href="#instagram"></use>
+                  </svg></a>
+                <a href="https://twitter.com/CollageLabs"><svg>
+                    <use xlink:href="#twitter"></use>
+                  </svg></a>
+                <a href="https://facebook.com/CollageLabs"><svg>
+                    <use xlink:href="#facebook"></use>
+                  </svg></a>
                 @CollageLabs
               </li>
               <li class="d-block d-lg-none">
-                <a href="https://wa.me/584120333096?text=Hello%20Collage%20Labs!"><svg><use xlink:href="#whatsapp"></use></svg>+58 412 033 3096</a>
+                <a href="https://wa.me/584120333096?text=Hello%20Collage%20Labs!"><svg>
+                    <use xlink:href="#whatsapp"></use>
+                  </svg>+58 412 033 3096</a>
               </li>
             </ul>
           </div>
         </div>
         <div class="col-lg-4 d-none d-lg-block">
           <script async src="https://snapwidget.com/js/snapwidget.js"></script>
-          <iframe src="https://snapwidget.com/embed/780265"
-                  class="snapwidget-widget"
-                  allowtransparency="true" frameborder="0" scrolling="no">
+          <iframe src="https://snapwidget.com/embed/780265" class="snapwidget-widget" allowtransparency="true"
+            frameborder="0" scrolling="no">
           </iframe>
         </div>
       </div>
@@ -48,4 +64,4 @@
   <span>Designed by <a href="https://siendocristina.com/" target="blank">Cristina Reyes</a></span>
   <span> &#9679; </span>
   <span>Coded by <a href="https://paolavrgs.github.io/cv_paolavrgs/" target="blank">Paola Vargas</a></span>
-</div>
+</div>

config/webpack.common.js

@@ -8,6 +8,7 @@ module.exports = {
     app: './_src/index.js'
   },
   plugins: [
+    new MiniCssExtractPlugin(),
     new webpack.ProvidePlugin({
       $: 'jquery',
       jQuery: 'jquery',

config/webpack.dev.js

@@ -4,11 +4,11 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
 const CommonConfig = require('./webpack.common.js');
 
-module.exports = merge(CommonConfig, {
+const x = merge(CommonConfig, {
   mode: 'development',
   output: {
     filename: '[name].js',
-    path: path.resolve('assets'),
+    path: path.resolve(__dirname, '..', 'assets/'),
     publicPath: '/assets/'
   },
   devtool: 'inline-source-map',
@@ -41,5 +41,12 @@ module.exports = merge(CommonConfig, {
     client: {
       webSocketURL: 'ws://0.0.0.0:5000/ws',
     },
+    devMiddleware: {
+      writeToDisk: true,
+    },
   }
 });
+
+console.log(x);
+
+module.exports = x;

config/webpack.prod.js

@@ -12,7 +12,7 @@ module.exports = merge(CommonConfig, {
   mode: 'production',
   output: {
     filename: '[name]-[fullhash].js',
-    path: path.resolve('assets'),
+    path: path.resolve(__dirname, '..', 'assets/'),
     publicPath: '/assets/'
   },
   plugins: [

docker-compose.yml

@@ -7,6 +7,7 @@ services:
       dockerfile: Dockerfile
     volumes:
       - .:/home/collagelabs/app
+      - ~/Library/Preferences/netlify:/home/collagelabs/.config/netlify
     env_file:
       - .env
     ports:

package.json

@@ -19,7 +19,8 @@
     "webpack:prod": "cross-env NODE_ENV=production webpack --env=prod --progress --profile",
     "webpack:pwa": "cross-env NODE_ENV=production webpack --env=pwa --progress --profile",
     "webpack:optim": "cross-env NODE_ENV=production webpack --env=optim --progress --profile",
-    "jekyll:dev": "cross-env JEKYLL_ENV=development bundle exec jekyll serve --trace --config=_config.yml,_config.development.yml",
+    "jekyll:dev": "cross-env JEKYLL_ENV=development bundle exec jekyll serve --trace --watch --config=_config.yml,_config.development.yml",
+    "jekyll:build": "cross-env JEKYLL_ENV=development bundle exec jekyll build --config=_config.yml,_config.development.yml",
     "jekyll:prod": "cross-env JEKYLL_ENV=production bundle exec jekyll build --config=_config.yml,_config.production.yml",
     "jekyll:pwa": "cross-env JEKYLL_ENV=pwa bundle exec jekyll build --config=_config.yml,_config.production.yml",
     "sw": "sw-precache --config=config/sw.config.js --verbose",
@@ -28,9 +29,8 @@
     "build:pwa": "yarn run clean:project && yarn run webpack:pwa && yarn run jekyll:pwa && yarn run build:lambda && yarn run sw",
     "build:pwa:optim": "yarn run clean:project && yarn run webpack:pwa && yarn run jekyll:pwa && yarn run build:lambda && yarn run webpack:optim && yarn run sw",
     "serve:dist": "yarn run clean:project && yarn run build:pwa:optim && http-server -p 5000 _site",
-    "serve:dev": "yarn run clean:project && concurrently \"yarn run webpack:dev\" \"yarn run jekyll:dev\"",
-    "start:lambda": "netlify-lambda serve lambda",
-    "build:lambda": "netlify-lambda build lambda"
+    "serve:dev": "yarn run clean:project && yarn run jekyll:build && concurrently \"yarn run webpack:dev\" \"yarn run jekyll:dev\"",
+    "build:lambda": "webpack --config ./webpack.lambda.config.js"
   },
   "browserslist": [
     "last 2 versions"
@@ -73,7 +73,7 @@
     "imagemin": "^8.0.1",
     "imagemin-mozjpeg": "^10.0.0",
     "mini-css-extract-plugin": "2.7.6",
-    "netlify-lambda": "2.0.16",
+    "netlify-cli": "^17.10.2",
     "node-sass": "9.0.0",
     "nodemon": "3.0.1",
     "postcss-advanced-variables": "3.0.1",

webpack.lambda.config.js

@@ -0,0 +1,44 @@
+const path = require("path");
+
+module.exports = {
+  mode: "production",
+  resolve: {
+    extensions: [".wasm", ".mjs", ".js", ".json", ".ts"],
+    mainFields: ["module", "main"],
+  },
+  module: {
+    rules: [
+      {
+        test: /\.(m?js|ts)?$/,
+        exclude: new RegExp(
+          `(node_modules|bower_components|\\.(test|spec)\\.?)`
+        ),
+        use: {
+          loader: require.resolve("babel-loader"),
+          options: {
+            cacheDirectory: true,
+            presets: [
+              [
+                require.resolve("@babel/preset-env"),
+                { targets: { node: "18" } },
+              ],
+            ],
+          },
+        },
+      },
+    ],
+  },
+  context: path.resolve(__dirname, "lambda/"),
+  entry: './frontpage-contact-form.js',
+  target: "node",
+  output: {
+    path: path.resolve(__dirname, "functions/"),
+    filename: "frontpage-contact-form.js",
+    libraryTarget: "commonjs",
+  },
+  bail: true,
+  devtool: false,
+  stats: {
+    colors: true,
+  },
+};