Merge pull request #43 from ojvribeiro/fix-ejs-hashing

fix(core): allow file path hashing in `watch` mode
ojvribeiro · Sep 27, 2022 · 89562d9 · 89562d9 · vercel · Sep 27, 2022
2 parents 0e9a684 + de44f4f
commit 89562d9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/.vulmix/mix.js b/.vulmix/mix.js
@@ -29,7 +29,16 @@ class VulmixInit {
         },
       })
 
-      .ejs('index.ejs', '_dist')
+      .ejs(
+        ['index.ejs', '_dist/mix-manifest.json'],
+        '_dist',
+        {},
+        {
+          base: '_dist',
+          partials: ['_dist/mix-manifest.json'],
+          mixVersioning: true,
+        }
+      )
 
       .copy('.vulmix/assets/icons/favicon-16x16.png', '_dist/assets/icons')
 
@@ -47,18 +56,16 @@ class VulmixInit {
 
       .extract()
 
-      .after(stats => {
-        mix.imgs({
-          source: 'assets/img',
-          destination: '_dist/assets/img',
-          webp: true,
-          thumbnailsSizes: [1920, 1200, 900, 600, 300, 50],
-          smallerThumbnailsOnly: true,
-          thumbnailsOnly: true,
-          imageminWebpOptions: {
-            quality: 90,
-          },
-        })
+      .imgs({
+        source: 'assets/img',
+        destination: '_dist/assets/img',
+        webp: true,
+        thumbnailsSizes: [1920, 1200, 900, 600, 300, 50],
+        smallerThumbnailsOnly: true,
+        thumbnailsOnly: true,
+        imageminWebpOptions: {
+          quality: 90,
+        },
       })
 
     /**
@@ -73,7 +80,7 @@ class VulmixInit {
        */
       mix
         .serve(
-          'npx http-server -p 8000 -a localhost _dist -c-1 --gzip --proxy http://localhost:8000?',
+          'npx http-server -p 8000 -a localhost _dist --gzip --proxy http://localhost:8000?',
           {
             verbose: false,
             build: false,

diff --git a/package.json b/package.json
@@ -5,11 +5,10 @@
   "main": "index.js",
   "scripts": {
     "create-img-dir": "mkdirp _dist/assets/img",
-    "remove-dist": "rimraf _dist",
+    "remove-dist": "rimraf _dist/assets/_vulmix _dist/assets/css _dist/assets/js",
     "build": "npm run remove-dist && npm run create-img-dir && mix",
     "dev": "npm run remove-dist && npm run create-img-dir && mix watch",
-    "hot": "npm run remove-dist && npm run create-img-dir && mix watch --hot",
-    "serve": "npx http-server -p 8000 -a localhost _dist -c-1 --gzip --proxy http://localhost:8000?",
+    "serve": "npx http-server -p 8000 -a localhost _dist --gzip --proxy http://localhost:8000?",
     "prod": "npm run remove-dist && npm run create-img-dir && mix --production"
   },
   "author": "Victor Ribeiro",