Closed john-positano closed 2 years ago
a test module written to go along with these changes
This one :)
@patrickhulce I wrote a test to make sure that the hashes appended to the font filenames are referenced in the final assets, that's pushed
thanks very much @john-positano!
a quick patch to fix the lint failures and we're on our way 🎉
git am <<-'EOF'
From cc7ad0fb5e48aa151821d95d9b4797a47b6ad3c2 Mon Sep 17 00:00:00 2001
From: Patrick Hulce <patrick.hulce@compass.com>
Date: Tue, 16 Nov 2021 22:40:14 -0600
Subject: [PATCH] lint fixes
---
lib/index.js | 18 +++++++++---------
test/index.test.js | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/index.js b/lib/index.js
index 283f8e0..c3703e2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,7 +1,7 @@
const fs = require('fs')
const path = require('path')
-const log = require('debug')('fontmin-webpack')
const crypto = require('crypto')
+const log = require('debug')('fontmin-webpack')
const _ = require('lodash')
const ttf2woff2 = require('ttf2woff2')
@@ -28,7 +28,7 @@ class FontminPlugin {
autodetect: true,
allowedFilesRegex: null,
skippedFilesRegex: null,
- appendHash: false
+ appendHash: false,
},
options,
)
@@ -230,25 +230,25 @@ class FontminPlugin {
} else {
compilation.assets[file.asset] = new RawSource(file.minified)
}
- }
+ }
})
})
}, Promise.resolve())
}
appendMinifiedFileHash(file) {
- const fileHash = crypto.createHash( 'md5' ).update( file.minified ).digest( 'hex' )
+ const fileHash = crypto.createHash('md5').update(file.minified).digest('hex')
return file.asset.split('.').join(`-${fileHash}.`)
}
hashifyFontReferences(oldAssetName, newAssetName, assets) {
Object.keys(assets).forEach(
- ( asset, assetIndex ) => {
- let oldAssetNameRegex = new RegExp( oldAssetName.replace( '.', '\\.' ), 'g' )
- let assetSource = assets[ asset ].source().toString()
+ asset => {
+ const oldAssetNameRegex = new RegExp(oldAssetName.replace('.', '\\.'), 'g')
+ const assetSource = assets[asset].source().toString()
- if ( assetSource.match( oldAssetNameRegex ) ) {
- assets[ asset ] = new RawSource( assetSource.replace( oldAssetNameRegex, newAssetName ) )
+ if (assetSource.match(oldAssetNameRegex)) {
+ assets[asset] = new RawSource(assetSource.replace(oldAssetNameRegex, newAssetName))
}
}
)
diff --git a/test/index.test.js b/test/index.test.js
index c74a251..90de651 100644
--- a/test/index.test.js
+++ b/test/index.test.js
@@ -249,9 +249,9 @@ describe('FontminPlugin', () => {
})
it('should append the hash to the ends of all refrences in all assets', () => {
- let out = fs.readFileSync(DIST_FOLDER + '/out.js').toString()
- fontStats.forEach( file => expect( out.match( file.filename ) ).to.be.ok )
- fontStats.forEach( file => expect( out.match( file.filename.replace( /\-([a-z]|[0-9])+\./, '.') ) ).to.not.be.ok )
+ const out = fs.readFileSync(DIST_FOLDER + '/out.js').toString()
+ fontStats.forEach(file => expect(out.match(file.filename)).to.be.ok)
+ fontStats.forEach(file => expect(out.match(file.filename.replace(/-([a-z0-9]+)\./, '.'))).to.not.be.ok)
})
})
})
--
2.33.1
EOF
@patrickhulce I weeded out lint errors. CircleCI can be reran.
Thanks very much @john-positano! Published in https://github.com/patrickhulce/fontmin-webpack/releases/tag/v3.2.0
@patrickhulce Did you mean "check that on my end" or did you want a test module written to go along with these changes?