Fix checking /_app #43

TheMatrixan · 2023-06-21T08:12:09Z

[ ] Documentation update
[+] Bug fix
[ ] New feature
[ ] Other, please explain:

What changes did you make? (Give an overview)

Which issue (if any) does this pull request address?

Is there anything you'd like reviewers to focus on?

aralroca · 2023-06-21T08:14:32Z

src/loader.ts

@@ -116,14 +116,14 @@ export default function loader(
    //
    // This way, the only modified file has to be the _app.js.
    if (hasGetInitialPropsOnAppJs) {
-      return pageNoExt === '/_app'
+      return pageNoExt.startsWith('/_app')


the problem is that this is not going to work in monorepos...

well, maybe yes is fine. If before was just === and was working... pageNoExt is only the page and not all the path... So then yes. This is to fix these cases /_app.page.ts, right?

Yes, this is a fix for _app.page.tsx - custom pageExtensions.

aralroca

Thanks for the contribution! LGTM. The only thing... can you add a test similar than this?

next-translate-plugin/__tests__/loader.test.js

Lines 66 to 79 in 60c4ee7

    
             it('should return templateWithHoc', () => { 
        
               mockHasStaticName.mockReturnValueOnce(true) 
        
               const code = ` 
        
                 import withSomeHoc from 'some-hoc' 
        
                 export default function Page() { 
        
                   return <h1>Page</h1> 
        
                 } 
        
                 Page.getInitialProps = () => ({ props: {} }) 
        
               ` 
        
               loader.call({ ...config, resourcePath: 'pages/some-page.ts' }, code) 
        
               expect(mockTemplateWithHoc).toBeCalled() 
        
             })

Thanks!!

TheMatrixan · 2023-07-24T06:58:49Z

Okay, done, @aralroca

aralroca · 2023-07-25T11:09:05Z

@TheMatrixan thanks for your contribution. Your code is already available in 2.5.3-canary.2 prerelase

aralroca reviewed Jun 21, 2023

View reviewed changes

Fix checking /_app

24cac33

TheMatrixan force-pushed the main branch from c698e24 to 24cac33 Compare July 24, 2023 06:58

aralroca approved these changes Jul 25, 2023

View reviewed changes

aralroca merged commit 0af914f into aralroca:main Jul 25, 2023
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix checking /_app #43

Fix checking /_app #43

TheMatrixan commented Jun 21, 2023 •

edited by aralroca

aralroca Jun 21, 2023

aralroca Jun 21, 2023 •

edited

TheMatrixan Jul 24, 2023

aralroca left a comment

TheMatrixan commented Jul 24, 2023

aralroca commented Jul 25, 2023 •

edited

	it('should return templateWithHoc', () => {
	mockHasStaticName.mockReturnValueOnce(true)
	const code = `
	import withSomeHoc from 'some-hoc'

	export default function Page() {
	return <h1>Page</h1>
	}

	Page.getInitialProps = () => ({ props: {} })
	`
	loader.call({ ...config, resourcePath: 'pages/some-page.ts' }, code)
	expect(mockTemplateWithHoc).toBeCalled()
	})

Fix checking /_app #43

Fix checking /_app #43

Conversation

TheMatrixan commented Jun 21, 2023 • edited by aralroca

aralroca Jun 21, 2023

Choose a reason for hiding this comment

aralroca Jun 21, 2023 • edited

Choose a reason for hiding this comment

TheMatrixan Jul 24, 2023

Choose a reason for hiding this comment

aralroca left a comment

Choose a reason for hiding this comment

TheMatrixan commented Jul 24, 2023

aralroca commented Jul 25, 2023 • edited

TheMatrixan commented Jun 21, 2023 •

edited by aralroca

aralroca Jun 21, 2023 •

edited

aralroca commented Jul 25, 2023 •

edited