remove webpacker:install

swiftcarrot · Aug 25, 2020 · 28b682c · 28b682c
1 parent 3d978de
commit 28b682c
Show file tree

Hide file tree

Showing 32 changed files with 166 additions and 257 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.4.1
+
+- remove `g webpacker:install`
+- move webpacker generator to packages generator
+
 ## 0.4.0
 
 - remove `g storybook:install`

diff --git a/cmd/generate.go b/cmd/generate.go
@@ -19,7 +19,6 @@ func init() {
 	generateCmd.AddCommand(generate.MigrationCmd)
 	generateCmd.AddCommand(generate.ModelCmd)
 	generateCmd.AddCommand(generate.GraphqlCmd)
-	generateCmd.AddCommand(generate.WebpackerInstallCmd)
 	generateCmd.AddCommand(generate.PackagesCmd)
 
 	rootCmd.AddCommand(generateCmd)

diff --git a/cmd/generate/webpacker.go b/cmd/generate/webpacker.go
diff --git a/generators/new/new.go b/generators/new/new.go
@@ -9,7 +9,6 @@ import (
 	"github.com/gobuffalo/packr/v2"
 	"github.com/swiftcarrot/dashi/generators/dashboard"
 	"github.com/swiftcarrot/dashi/generators/packages"
-	"github.com/swiftcarrot/dashi/generators/webpacker"
 )
 
 func New(opts *Options) (*genny.Group, error) {
@@ -47,12 +46,6 @@ func New(opts *Options) (*genny.Group, error) {
 		}
 		gg.Add(packages)
 
-		webpacker, err := webpacker.New(&webpacker.Options{})
-		if err != nil {
-			return nil, err
-		}
-		gg.Add(webpacker)
-
 		dashboard, err := dashboard.New(&dashboard.Options{
 			Name: opts.Name,
 		})

diff --git a/generators/packages/templates/packages/app/package.json b/generators/packages/templates/packages/app/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "app",
+  "version": "0.1.0",
+  "private": true,
+  "main": "./src/index.js",
+  "scripts": {
+    "start": "NODE_ENV=development webpacker serve",
+    "build": "NODE_ENV=production webpacker build"
+  },
+  "dependencies": {
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0"
+  }
+}
diff --git a/generators/packages/templates/packages/app/public/index.html b/generators/packages/templates/packages/app/public/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>App</title>
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/generators/packages/templates/packages/app/src/index.js b/generators/packages/templates/packages/app/src/index.js
@@ -0,0 +1,8 @@
+import React from 'react';
+import { render } from 'react-dom';
+
+const App = () => {
+  return <div>App</div>;
+};
+
+render(<App />, document.getElementById('root'));
diff --git a/...templates/packages/babel-preset/README.md → ...templates/packages/babel-preset/README.md b/...templates/packages/babel-preset/README.md → ...templates/packages/babel-preset/README.md
diff --git a/...plates/packages/babel-preset/package.json → ...plates/packages/babel-preset/package.json b/...plates/packages/babel-preset/package.json → ...plates/packages/babel-preset/package.json
diff --git a/...plates/packages/babel-preset/src/index.js → ...plates/packages/babel-preset/src/index.js b/...plates/packages/babel-preset/src/index.js → ...plates/packages/babel-preset/src/index.js
diff --git a/...es/packages/storybook-preset/package.json → ...es/packages/storybook-preset/package.json b/...es/packages/storybook-preset/package.json → ...es/packages/storybook-preset/package.json
diff --git a/...es/packages/storybook-preset/src/index.js → ...es/packages/storybook-preset/src/index.js b/...es/packages/storybook-preset/src/index.js → ...es/packages/storybook-preset/src/index.js
diff --git a/...er/templates/packages/webpacker/README.md → ...es/templates/packages/webpacker/README.md b/...er/templates/packages/webpacker/README.md → ...es/templates/packages/webpacker/README.md
diff --git a/...templates/packages/webpacker/package.json → ...templates/packages/webpacker/package.json b/...templates/packages/webpacker/package.json → ...templates/packages/webpacker/package.json
diff --git a/...lates/packages/webpacker/src/cmd/build.js → ...lates/packages/webpacker/src/cmd/build.js b/...lates/packages/webpacker/src/cmd/build.js → ...lates/packages/webpacker/src/cmd/build.js
diff --git a/...lates/packages/webpacker/src/cmd/serve.js → ...lates/packages/webpacker/src/cmd/serve.js b/...lates/packages/webpacker/src/cmd/serve.js → ...lates/packages/webpacker/src/cmd/serve.js
diff --git a/...lates/packages/webpacker/src/cmd/watch.js → ...lates/packages/webpacker/src/cmd/watch.js b/...lates/packages/webpacker/src/cmd/watch.js → ...lates/packages/webpacker/src/cmd/watch.js
diff --git a/.../templates/packages/webpacker/src/main.js → .../templates/packages/webpacker/src/main.js b/.../templates/packages/webpacker/src/main.js → .../templates/packages/webpacker/src/main.js
diff --git a/...es/packages/webpacker/src/utils/config.js → ...es/packages/webpacker/src/utils/config.js b/...es/packages/webpacker/src/utils/config.js → ...es/packages/webpacker/src/utils/config.js
diff --git a/...acker/src/utils/getCSSModuleLocalIdent.js → ...acker/src/utils/getCSSModuleLocalIdent.js b/...acker/src/utils/getCSSModuleLocalIdent.js → ...acker/src/utils/getCSSModuleLocalIdent.js
diff --git a/...es/webpacker/src/utils/getStyleLoaders.js → ...es/webpacker/src/utils/getStyleLoaders.js b/...es/webpacker/src/utils/getStyleLoaders.js → ...es/webpacker/src/utils/getStyleLoaders.js
diff --git a/...es/packages/webpacker/src/webpack/base.js → ...es/packages/webpacker/src/webpack/base.js b/...es/packages/webpacker/src/webpack/base.js → ...es/packages/webpacker/src/webpack/base.js
diff --git a/...ages/webpacker/src/webpack/development.js → ...ages/webpacker/src/webpack/development.js b/...ages/webpacker/src/webpack/development.js → ...ages/webpacker/src/webpack/development.js
diff --git a/...s/packages/webpacker/src/webpack/index.js → ...s/packages/webpacker/src/webpack/index.js b/...s/packages/webpacker/src/webpack/index.js → ...s/packages/webpacker/src/webpack/index.js
diff --git a/...kages/webpacker/src/webpack/production.js → ...kages/webpacker/src/webpack/production.js b/...kages/webpacker/src/webpack/production.js → ...kages/webpacker/src/webpack/production.js
diff --git a/...s/packages/webpacker/src/webpack/rules.js → ...s/packages/webpacker/src/webpack/rules.js b/...s/packages/webpacker/src/webpack/rules.js → ...s/packages/webpacker/src/webpack/rules.js
diff --git a/generators/webpacker/options.go b/generators/webpacker/options.go
diff --git a/generators/webpacker/options_test.go b/generators/webpacker/options_test.go
diff --git a/generators/webpacker/webpacker-packr.go b/generators/webpacker/webpacker-packr.go
diff --git a/generators/webpacker/webpacker.go b/generators/webpacker/webpacker.go
diff --git a/generators/webpacker/webpacker_test.go b/generators/webpacker/webpacker_test.go
diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go