Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update checksum algorithm to SHA1 #52102

Merged
merged 9 commits into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next/src/build/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1915,7 +1915,7 @@ export default async function build(
) {
const cacheHash = (
require('crypto') as typeof import('crypto')
).createHash('sha256')
).createHash('sha1')

cacheHash.update(require('next/package').version)
cacheHash.update(hasSsrAmpPages + '')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function getCssModuleLocalIdent(
// Generate a hash to make the class name unique.
const hash = loaderUtils.getHashDigest(
Buffer.from(`filePath:${relativePath}#className:${exportName}`),
'md5',
'sha1',
'base64',
5
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const NextServerCSSLoader: webpack.LoaderDefinitionFunction<NextServerCSSLoaderO
this.resourcePath.match(/\.module\.(css|sass|scss)$/) !== null
}
const checksum = crypto
.createHash('sha256')
.createHash('sha1')
.update(typeof content === 'string' ? Buffer.from(content) : content)
.digest()
.toString('hex')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default async function nextFontLoader(this: any) {
// Generate a hash from the CSS content. Used to generate classnames and font families
const fontFamilyHash = loaderUtils.getHashDigest(
Buffer.from(css),
'md5',
'sha1',
'hex',
6
)
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/cli/next-dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ const nextDev: CliCommand = async (argv) => {
const instrumentationFileHash = (
require('crypto') as typeof import('crypto')
)
.createHash('sha256')
.createHash('sha1')
.update(await fs.promises.readFile(instrumentationFile, 'utf8'))
.digest('hex')

Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/server/dev/hot-reloader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ export default class HotReloader {
// every time for both server and client so we calculate
// the hash without the source map for the page module
const hash = require('crypto')
.createHash('sha256')
.createHash('sha1')
.update(mod.originalSource().buffer())
.digest()
.toString('hex')
Expand Down
4 changes: 2 additions & 2 deletions test/integration/css-features/test/css-modules.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe('CSS Modules: Import Global CSS', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`"a .styles_foo__Io_Us{all:initial}"`
`"a .styles_foo__G5630{all:initial}"`
)
})
})
Expand Down Expand Up @@ -119,7 +119,7 @@ describe('CSS Modules: Import Exports', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".styles_blk__CqbFg{color:#000}"`
`".styles_blk__480DC{color:#000}"`
)
})
})
24 changes: 12 additions & 12 deletions test/integration/css-modules/test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('Basic CSS Module Support', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".index_redText__KCBQp{color:red}"`
`".index_redText__honUV{color:red}"`
)
})

Expand All @@ -69,7 +69,7 @@ describe('Basic CSS Module Support', () => {
expect(cssSheet.attr('href')).toMatch(/^\/_next\/static\/css\/.*\.css$/)

expect($('#verify-red').attr('class')).toMatchInlineSnapshot(
`"index_redText__KCBQp"`
`"index_redText__honUV"`
)
})
})
Expand Down Expand Up @@ -108,7 +108,7 @@ describe('3rd Party CSS Module Support', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".index_foo__2K5pY{position:relative}.index_foo__2K5pY .bar,.index_foo__2K5pY .baz{height:100%;overflow:hidden}.index_foo__2K5pY .lol,.index_foo__2K5pY>.lel{width:80%}"`
`".index_foo__6TgnK{position:relative}.index_foo__6TgnK .bar,.index_foo__6TgnK .baz{height:100%;overflow:hidden}.index_foo__6TgnK .lol,.index_foo__6TgnK>.lel{width:80%}"`
)
})

Expand All @@ -125,7 +125,7 @@ describe('3rd Party CSS Module Support', () => {
expect(cssSheet.attr('href')).toMatch(/^\/_next\/static\/css\/.*\.css$/)

expect($('#verify-div').attr('class')).toMatchInlineSnapshot(
`"index_foo__2K5pY"`
`"index_foo__6TgnK"`
)
})
})
Expand Down Expand Up @@ -310,7 +310,7 @@ describe('Valid CSS Module Usage from within node_modules', () => {

const cssPreload = $('#nm-div')
expect(cssPreload.text()).toMatchInlineSnapshot(
`"{\\"message\\":\\"Why hello there\\"} {\\"redText\\":\\"example_redText__lIU4W\\"}"`
`"{\\"message\\":\\"Why hello there\\"} {\\"redText\\":\\"example_redText__0ctGB\\"}"`
)
})

Expand All @@ -324,7 +324,7 @@ describe('Valid CSS Module Usage from within node_modules', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".example_redText__lIU4W{color:red}"`
`".example_redText__0ctGB{color:red}"`
)
})
})
Expand Down Expand Up @@ -363,7 +363,7 @@ describe('Valid Nested CSS Module Usage from within node_modules', () => {

const cssPreload = $('#nm-div')
expect(cssPreload.text()).toMatchInlineSnapshot(
`"{\\"message\\":\\"Why hello there\\"} {\\"subClass\\":\\"example_subClass__ak_R4 other_className__hfPre\\"}"`
`"{\\"message\\":\\"Why hello there\\"} {\\"subClass\\":\\"example_subClass__m6Tyy other_className__OA8dV\\"}"`
)
})

Expand All @@ -377,7 +377,7 @@ describe('Valid Nested CSS Module Usage from within node_modules', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".other2_other2__n0niK{color:red}.other3_other3__5PqwU{color:violet}.other_className__hfPre{background:red;color:#ff0}.example_subClass__ak_R4{background:blue}"`
`".other2_other2__dYPgz{color:red}.other3_other3__7hgUE{color:violet}.other_className__OA8dV{background:red;color:#ff0}.example_subClass__m6Tyy{background:blue}"`
)
})
})
Expand Down Expand Up @@ -410,7 +410,7 @@ describe('CSS Module Composes Usage (Basic)', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".index_className___fnCf{background:red;color:#ff0}.index_subClass__3ZQHz{background:blue}"`
`".index_className__jjcZ1{background:red;color:#ff0}.index_subClass__eDzaW{background:blue}"`
)
})
})
Expand Down Expand Up @@ -443,7 +443,7 @@ describe('CSS Module Composes Usage (External)', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".other_className__3Kqmr{background:red;color:#ff0}.index_subClass__3ZQHz{background:blue}"`
`".other_className__eZV4M{background:red;color:#ff0}.index_subClass__eDzaW{background:blue}"`
)
})
})
Expand Down Expand Up @@ -491,7 +491,7 @@ describe('Dynamic Route CSS Module Usage', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`"._post__home__BTqh4{background:red}"`
`"._post__home__yRmHz{background:red}"`
)
})
})
Expand Down Expand Up @@ -541,7 +541,7 @@ describe('Catch-all Route CSS Module Usage', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".___post__home__G40mx{background:red}.__55css_home__OvQYk{color:green}"`
`".___post__home__e4zfx{background:red}.__55css_home__r8Rnq{color:green}"`
)
})
})
12 changes: 6 additions & 6 deletions test/integration/scss-modules/test/basic-scss.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ describe('Basic SCSS Module Support', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".index_redText__WduQk{color:red}"`
`".index_redText__zXafh{color:red}"`
)
})

Expand All @@ -68,7 +68,7 @@ describe('Basic SCSS Module Support', () => {
expect(cssSheet.attr('href')).toMatch(/^\/_next\/static\/css\/.*\.css$/)

expect($('#verify-red').attr('class')).toMatchInlineSnapshot(
`"index_redText__WduQk"`
`"index_redText__zXafh"`
)
})
})
Expand Down Expand Up @@ -107,7 +107,7 @@ describe('3rd Party CSS Module Support', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".index_foo__gL0ty{position:relative}.index_foo__gL0ty .bar,.index_foo__gL0ty .baz{height:100%;overflow:hidden}.index_foo__gL0ty .lol,.index_foo__gL0ty>.lel{width:80%}"`
`".index_foo__72b4D{position:relative}.index_foo__72b4D .bar,.index_foo__72b4D .baz{height:100%;overflow:hidden}.index_foo__72b4D .lol,.index_foo__72b4D>.lel{width:80%}"`
)
})

Expand All @@ -124,7 +124,7 @@ describe('3rd Party CSS Module Support', () => {
expect(cssSheet.attr('href')).toMatch(/^\/_next\/static\/css\/.*\.css$/)

expect($('#verify-div').attr('class')).toMatchInlineSnapshot(
`"index_foo__gL0ty"`
`"index_foo__72b4D"`
)
})
})
Expand Down Expand Up @@ -261,7 +261,7 @@ describe('CSS Module Composes Usage (Basic)', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".index_className__phGSl{background:red;color:#ff0}.index_subClass__fPp6w{background:blue}"`
`".index_className__OLWEh{background:red;color:#ff0}.index_subClass__Z_IFg{background:blue}"`
)
})
})
Expand Down Expand Up @@ -294,7 +294,7 @@ describe('CSS Module Composes Usage (External)', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".other_className__e_JDW{background:red;color:#ff0}.index_subClass__fPp6w{background:blue}"`
`".other_className__A8aN2{background:red;color:#ff0}.index_subClass__Z_IFg{background:blue}"`
)
})
})
4 changes: 2 additions & 2 deletions test/integration/scss-modules/test/dynamic-route.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('Dynamic Route CSS Module Usage', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`"._post__home__a9vTy{background:red}"`
`"._post__home__ZI5mq{background:red}"`
)
})

Expand Down Expand Up @@ -98,7 +98,7 @@ describe('Catch-all Route CSS Module Usage', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".___post__home__w1yuY{background:red}"`
`".___post__home__bZNj1{background:red}"`
)
})
})
8 changes: 4 additions & 4 deletions test/integration/scss-modules/test/valid-invalid.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ describe('Valid CSS Module Usage from within node_modules', () => {

const cssPreload = $('#nm-div')
expect(cssPreload.text()).toMatchInlineSnapshot(
`"{\\"message\\":\\"Why hello there\\"} {\\"redText\\":\\"example_redText__8_1ap\\"}"`
`"{\\"message\\":\\"Why hello there\\"} {\\"redText\\":\\"example_redText__jsP_3\\"}"`
)
})

Expand All @@ -103,7 +103,7 @@ describe('Valid CSS Module Usage from within node_modules', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".example_redText__8_1ap{color:red}"`
`".example_redText__jsP_3{color:red}"`
)
})
})
Expand Down Expand Up @@ -142,7 +142,7 @@ describe('Valid Nested CSS Module Usage from within node_modules', () => {

const cssPreload = $('#nm-div')
expect(cssPreload.text()).toMatchInlineSnapshot(
`"{\\"message\\":\\"Why hello there\\"} {\\"other2\\":\\"example_other2__pD1TP\\",\\"subClass\\":\\"example_subClass___Qywg other_className__jR2X2\\"}"`
`"{\\"message\\":\\"Why hello there\\"} {\\"other2\\":\\"example_other2__HNcoQ\\",\\"subClass\\":\\"example_subClass__SxkPt other_className___l2o_\\"}"`
)
})

Expand All @@ -156,7 +156,7 @@ describe('Valid Nested CSS Module Usage from within node_modules', () => {
const cssContent = await readFile(join(cssFolder, cssFiles[0]), 'utf8')

expect(cssContent.replace(/\/\*.*?\*\//g, '').trim()).toMatchInlineSnapshot(
`".other_other3__QRKUk{color:violet}.other_className__jR2X2{background:red;color:#ff0}.example_other2__pD1TP{color:red}.example_subClass___Qywg{background:blue}"`
`".other_other3__DvhyB{color:violet}.other_className___l2o_{background:red;color:#ff0}.example_other2__HNcoQ{color:red}.example_subClass__SxkPt{background:blue}"`
)
})
})