Prevent optional dependency Chokidar from loading when not watching

mozilla · Oct 15, 2019 · cefb1cf · cefb1cf
1 parent 1485a44
commit cefb1cf
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/nunjucks/src/node-loaders.js b/nunjucks/src/node-loaders.js
@@ -7,9 +7,6 @@ const path = require('path');
 const Loader = require('./loader');
 const {PrecompiledLoader} = require('./precompiled-loader.js');
 let chokidar;
-try {
-  chokidar = require('chokidar'); // eslint-disable-line global-require
-} catch (e) {} // eslint-disable-line no-empty
 
 class FileSystemLoader extends Loader {
   constructor(searchPaths, opts) {
@@ -37,7 +34,9 @@ class FileSystemLoader extends Loader {
     if (opts.watch) {
       // Watch all the templates in the paths and fire an event when
       // they change
-      if (!chokidar) {
+      try {
+        chokidar = require('chokidar'); // eslint-disable-line global-require
+      } catch (e) {
         throw new Error('watch requires chokidar to be installed');
       }
       const paths = this.searchPaths.filter(fs.existsSync);
@@ -94,7 +93,9 @@ class NodeResolveLoader extends Loader {
     this.noCache = !!opts.noCache;
 
     if (opts.watch) {
-      if (!chokidar) {
+      try {
+        chokidar = require('chokidar'); // eslint-disable-line global-require
+      } catch (e) {
         throw new Error('watch requires chokidar to be installed');
       }
       this.watcher = chokidar.watch();