Merge pull request #15 from bem/yarastqt.issue-14.fix-next-12

Check entries for patch require

Author: yarastqt

__tests__/next-12-react-18-local/.npmrc

@@ -0,0 +1 @@
+package-lock=false

__tests__/next-12-react-18-local/next.config.js

@@ -0,0 +1,3 @@
+const { withGlobalCss } = require('../../lib')
+
+module.exports = withGlobalCss()()

__tests__/next-12-react-18-local/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "next-10-local",
+  "version": "0.0.1",
+  "private": "true",
+  "scripts": {
+    "build": "next build",
+    "dev": "next dev"
+  },
+  "dependencies": {
+    "3d-party-library": "file:../__fixtures__/3d-party-library/3d-party-library-0.0.1.tgz",
+    "next": "^12.1.4",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0",
+    "sass": "^1.34.0"
+  }
+}

__tests__/next-12-react-18-local/pages/_app.js

@@ -0,0 +1,5 @@
+import React from 'react'
+
+export default function MyApp({ Component, pageProps }) {
+  return <Component {...pageProps} />
+}

__tests__/next-12-react-18-local/pages/index.js

@@ -0,0 +1,13 @@
+import { Component } from '3d-party-library/component'
+import { ScssComponent } from '../src/components/scss-component'
+import { CssComponent } from '../src/components/css-component'
+
+export default function Home() {
+  return (
+    <>
+      <Component />
+      <ScssComponent />
+      <CssComponent />
+    </>
+  )
+}

__tests__/next-12-react-18-local/src/components/css-component/index.js

@@ -0,0 +1,5 @@
+import './styles.css'
+
+export const CssComponent = () => {
+  return <button className="css-button">CssComponent</button>
+}

__tests__/next-12-react-18-local/src/components/css-component/styles.css

@@ -0,0 +1,3 @@
+.css-button {
+  color: red;
+}

__tests__/next-12-react-18-local/src/components/scss-component/index.js

@@ -0,0 +1,5 @@
+import './styles.scss'
+
+export const ScssComponent = () => {
+  return <button className="scss-button">ScssComponent</button>
+}

__tests__/next-12-react-18-local/src/components/scss-component/styles.scss

@@ -0,0 +1,3 @@
+.scss-button {
+  color: red;
+}

lib/index.js

@@ -6,10 +6,10 @@ function patchServerWebpackConfig(config) {
     const entry = await originalEntry()
     const patchPath = require.resolve('./patch-global-require')
     // Prepend module with patched `require` for ignore load css files.
-    if (!entry['pages/_app'].includes(patchPath)) {
+    if (entry['pages/_app'] && !entry['pages/_app'].includes(patchPath)) {
       entry['pages/_app'].unshift(patchPath)
     }
-    if (!entry['pages/_document'].includes(patchPath)) {
+    if (entry['pages/_document'] && !entry['pages/_document'].includes(patchPath)) {
       entry['pages/_document'].unshift(patchPath)
     }
     return entry

package.json

@@ -18,6 +18,7 @@
     "test-next-10-local": "node ./__tests__/index.test.js --version=10-local",
     "test-next-10-ssr": "node ./__tests__/index.test.js --version=10-ssr",
     "test-next-10": "node ./__tests__/index.test.js --version=10",
-    "test": "npm run test-next-10-local && npm run test-next-10-ssr && npm run test-next-10"
+    "test-next-12-react-18-local": "node ./__tests__/index.test.js --version=12-react-18-local",
+    "test": "npm run test-next-10-local && npm run test-next-10-ssr && npm run test-next-10 && npm run test-next-12-react-18-local"
   }
 }