feat(module): compatibility with netlify-cms v2

medfreeman · medfreeman · commit 6800ea421bea · 2018-08-06T23:51:01.000+02:00
Fixes #64
diff --git a/lib/entry.js b/lib/entry.js
@@ -1,5 +1,6 @@
-/* global REQUIRE_EXTENSIONS */
+/* global REQUIRE_EXTENSIONS, REQUIRE_CSS, CSS_FILE */
 /* eslint-disable import/order */
+
 function requireAll(r) {
   r.keys().forEach(r);
 }
@@ -9,9 +10,11 @@ const CMS = require("netlify-cms");
 if (REQUIRE_EXTENSIONS) {
   requireAll(require.context("extensions/", true, /\.js$/));
 }
-const CSS = require("netlify-cms/dist/cms.css");
+
+if (REQUIRE_CSS) {
+  require(CSS_FILE);
+}
 
 module.exports = {
-  CMS,
-  CSS
+  CMS
 };
diff --git a/src/webpack.config.js b/src/webpack.config.js
@@ -26,6 +26,10 @@ export default function webpackNetlifyCmsConfig(
   const PAGE_TEMPLATE = resolve(__dirname, "../lib/template", "index.html");
   const REQUIRE_EXTENSIONS = existsSync(EXTENSIONS_DIR) ? true : false;
   const HMR_CLIENT = resolve(__dirname, "../lib/hmr.client");
+  const CSS_FILE = "netlify-cms/dist/cms.css";
+  const REQUIRE_CSS = existsSync(resolve(__dirname, "node_modules", CSS_FILE))
+    ? true
+    : false;
 
   const config = {
     name,
@@ -65,7 +69,9 @@ export default function webpackNetlifyCmsConfig(
         chunksSortMode: "dependency"
       }),
       new webpack.DefinePlugin({
-        REQUIRE_EXTENSIONS
+        REQUIRE_EXTENSIONS,
+        REQUIRE_CSS,
+        CSS_FILE
       })
     ]
   };
diff --git a/test/__snapshots__/module.test.js.snap b/test/__snapshots__/module.test.js.snap
@@ -10,7 +10,7 @@ exports[`module admin 1`] = `
     <title>Content Manager</title>
   </head>
   <body>
-  <script type=\\"text/javascript\\" src=\\"/admin/bundle.57440c18556c5552e2da.js\\"></script></body>
+  <script type=\\"text/javascript\\" src=\\"/admin/bundle.c5488af0231117ae2d85.js\\"></script></body>
 </html>
 "
 `;

Original file line number	Diff line number	Diff line change
@@ -10,7 +10,7 @@ exports[`module admin 1`] = `
`10`	`10`	`<title>Content Manager</title>`
`11`	`11`	`</head>`
`12`	`12`	`<body>`
`13`		`- <script type=\\"text/javascript\\" src=\\"/admin/bundle.57440c18556c5552e2da.js\\"></script></body>`
	`13`	`+ <script type=\\"text/javascript\\" src=\\"/admin/bundle.c5488af0231117ae2d85.js\\"></script></body>`
`14`	`14`	`</html>`
`15`	`15`	`"`
`16`	`16`	`;