Merge pull request #119 from gochigo/hotfix-webpack-glob-error

fixed glob error related to copy-webpack-plugin
gobuffalo · Mar 14, 2022 · 0fbc2be · 0fbc2be
2 parents de958c6 + b793866
commit 0fbc2be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/internal/cmd/build/build_test.go b/internal/cmd/build/build_test.go
@@ -41,10 +41,13 @@ func TestBuild(t *testing.T) {
 			appname:      "sqlite",
 		},
 		{
+			// this test covers too things at once (to save testing time)
+			// 1. originally this test case is for `--skip-pop`
+			// 2. by using "src" as appname, it covers webpack-copy glob issue (pull/119)
 			name:         "skipop",
-			newargs:      []string{"new", "skipop", "-f", "--skip-pop", "--vcs", "none"},
+			newargs:      []string{"new", "src", "-f", "--skip-pop", "--vcs", "none"},
 			resourceargs: []string{"g", "action", "phone", "new"},
-			appname:      "skipop",
+			appname:      "src",
 		},
 	}
 

diff --git a/internal/genny/assets/webpack/templates/webpack.config.js.tmpl b/internal/genny/assets/webpack/templates/webpack.config.js.tmpl
@@ -46,8 +46,9 @@ const configurator = {
           from: "./assets",
           globOptions: {
             ignore: [
-              "**/css/**", 
-              "**/js/**", 
+              "**/assets/css/**",
+              "**/assets/js/**",
+              "**/assets/src/**",
             ]
           }
         }],