fix: Read raw config in tasks to avoid circular dependency

BREAKING CHANGE: Grunt templates will not be evaluated in Plugins anymore. Use lazy config loading instead.
webpack-contrib · Feb 14, 2019 · 570f378 · 570f378
1 parent 11b9b9a
commit 570f378
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/tasks/webpack-dev-server.js b/tasks/webpack-dev-server.js
@@ -57,12 +57,13 @@ npm install --save-dev webpack-dev-server
   grunt.registerTask('webpack-dev-server', 'Start a webpack-dev-server.', function webpackDevServerTask(cliTarget) {
     const done = this.async();
 
-    const config = grunt.config([this.name]);
-    const targets = cliTarget
-      ? [cliTarget]
-      : config
-        ? Object.keys(config)
-        : [];
+    let targets;
+    if (cliTarget) {
+      targets = [cliTarget];
+    } else {
+      const config = grunt.config.getRaw([this.name]);
+      targets = config ? Object.keys(config) : [];
+    }
 
     let runningTargetCount = targets.length;
     let keepalive = false;

diff --git a/tasks/webpack.js b/tasks/webpack.js
@@ -12,12 +12,13 @@ module.exports = (grunt) => {
   grunt.registerTask('webpack', 'Run webpack.', function webpackTask(cliTarget) {
     const done = this.async();
 
-    const config = grunt.config([this.name]);
-    const targets = cliTarget
-      ? [cliTarget]
-      : config
-        ? Object.keys(config)
-        : [];
+    let targets;
+    if (cliTarget) {
+      targets = [cliTarget];
+    } else {
+      const config = grunt.config.getRaw([this.name]);
+      targets = config ? Object.keys(config) : [];
+    }
     let runningTargetCount = targets.length;
     let keepalive = false;