Merge pull request #12 from create-go-app/dev

Dev -> v1.5.0

Author: Vic Shóstak

.github/workflows/testing_build.yml

@@ -2,9 +2,15 @@ name: Testing CLI
 
 on:
   push:
-    branches: [master]
+    branches: [dev]
+    paths:
+      - "configs/**"
+      - "**.go"
   pull_request:
     branches: [master]
+    paths:
+      - "configs/**"
+      - "**.go"
 
 jobs:
   build:
@@ -28,4 +34,4 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Test
-        run: go test -v -cover -race ./...
+        run: go test -v -cover -race -timeout 60s ./...

.goreleaser.yml

@@ -23,7 +23,6 @@ builds:
       - CGO_ENABLED=0
 
 dockers:
-  # You can have multiple Docker images.
   - # GOOS of the built binary that should be used.
     goos: linux
     goarch: amd64
@@ -42,10 +41,10 @@ dockers:
       - "koddr/cgapp:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
       - "koddr/cgapp:{{ .Major }}.{{ .Minor }}"
       - "koddr/cgapp:{{ .Major }}"
-      - "koddr/cgapp-deploy:latest"
+      - "koddr/cgapp:latest"
 
     # Path to the Dockerfile (from the project root).
-    dockerfile: Dockerfile.deploy
+    dockerfile: Dockerfile
 
 archives:
   - # Replacements for GOOS and GOARCH in the archive name.

Dockerfile

@@ -2,14 +2,14 @@ FROM alpine:3.12
 
 LABEL maintainer="Vic Shóstak <[email protected]>"
 
-# Copy Create Go App binary
+# Copy Create Go App binary.
 COPY cgapp /cgapp
 
-# Install git
+# Install git, npm.
 RUN apk add --no-cache git npm
 
-# Install frontend CLIs
+# Install frontend CLIs.
 RUN npm i -g -s create-react-app preact-cli @vue/cli degit @angular/cli
 
-# Set entry point to /cgapp
+# Set entry point.
 ENTRYPOINT ["/cgapp"]

README.md

@@ -4,7 +4,7 @@
 </h1>
 <p align="center">Create a new production-ready project with <b>backend</b> (Golang), <b>frontend</b> (JavaScript, TypeScript)<br/>and <b>deploy automation</b> (Ansible, Docker) by running one CLI command.<br/><br/>Focus on <b>writing</b> code and <b>thinking</b> of business-logic! The CLI will take care of the rest.</p>
 
-<p align="center"><a href="https://github.com/create-go-app/cli/releases" target="_blank"><img src="https://img.shields.io/badge/version-v1.4.1-blue?style=for-the-badge&logo=none" alt="cli version" /></a>&nbsp;<a href="https://pkg.go.dev/github.com/create-go-app/cli?tab=doc" target="_blank"><img src="https://img.shields.io/badge/Go-1.11+-00ADD8?style=for-the-badge&logo=go" alt="go version" /></a>&nbsp;<a href="https://gocover.io/github.com/create-go-app/cli/pkg/cgapp" target="_blank"><img src="https://img.shields.io/badge/Go_Cover-94%25-success?style=for-the-badge&logo=none" alt="go cover" /></a>&nbsp;<a href="https://goreportcard.com/report/github.com/create-go-app/cli" target="_blank"><img src="https://img.shields.io/badge/Go_report-A+-success?style=for-the-badge&logo=none" alt="go report" /></a>&nbsp;<img src="https://img.shields.io/badge/license-apache_2.0-red?style=for-the-badge&logo=none" alt="license" /></p>
+<p align="center"><a href="https://github.com/create-go-app/cli/releases" target="_blank"><img src="https://img.shields.io/badge/version-v1.5.0-blue?style=for-the-badge&logo=none" alt="cli version" /></a>&nbsp;<a href="https://pkg.go.dev/github.com/create-go-app/cli?tab=doc" target="_blank"><img src="https://img.shields.io/badge/Go-1.11+-00ADD8?style=for-the-badge&logo=go" alt="go version" /></a>&nbsp;<a href="https://gocover.io/github.com/create-go-app/cli/pkg/cgapp" target="_blank"><img src="https://img.shields.io/badge/Go_Cover-94%25-success?style=for-the-badge&logo=none" alt="go cover" /></a>&nbsp;<a href="https://goreportcard.com/report/github.com/create-go-app/cli" target="_blank"><img src="https://img.shields.io/badge/Go_report-A+-success?style=for-the-badge&logo=none" alt="go report" /></a>&nbsp;<img src="https://img.shields.io/badge/license-apache_2.0-red?style=for-the-badge&logo=none" alt="license" /></p>
 
 ## ⚡️ [Quick start](https://create-go.app/quick-start/)
 
@@ -96,19 +96,27 @@ cgapp init
 project:
   # Backend for your project.
   # (Required)
-  # String: `net/http`, `fiber`, `echo`, `gin`
+  # String:
+  #   - `net/http`
+  #   - `fiber`
+  #   - `echo`
+  #   - `gin`
   # User template: supported, set to URL (without protocol),
   # like `github.com/user/template`
   - backend: fiber
 
   # Frontend for your project.
   # (Optional, to skip set to `none`)
   # String:
-  #   - `react`, `react:<template>`
-  #   - `preact`, `preact:<template>`
+  #   - `react`
+  #     - `react:<template>`
+  #   - `preact`
+  #     - `preact:<template>`
   #   - `vue`
-  #   - `svelte`
+  #     - `vue:<user/repo>` (for preset from GitHub)
+  #     - `vue:<gitlab|bitbucket>:<user/repo>` (for presets from others)
   #   - `angular`
+  #   - `svelte`
   # User template: supported, set to URL (without protocol),
   # like `github.com/user/template`
   - frontend: svelte
@@ -131,7 +139,7 @@ project:
 roles:
   # Ansible roles for deploy your project.
   # (Optional, to skip set to empty or comment)
-  # Objects list: `deploy`
+  # Objects list.
   - deploy:
     # Username of remote's server or local's user.
     # (Required)
@@ -223,11 +231,21 @@ cgapp deploy --use-config
 
 **Frontend:**
 
-- [x] [`react`](https://create-go.app/production-templates/react-js/) — Frontend app with [React.js](https://reactjs.org).
-- [x] [`preact`](https://create-go.app/production-templates/preact-js/) — Frontend app with [Preact](https://preactjs.com).
-- [ ] [`vue`](https://create-go.app/production-templates/vue-js/) _WIP_ — Frontend app with [Vue.js](https://vuejs.org).
-- [x] [`svelte`](https://create-go.app/production-templates/svelte-js/) — Frontend app with [Svelte](https://svelte.dev).
-- [ ] [`angular`](https://create-go.app/production-templates/angular-js/) _WIP_ — Frontend app with [Angular](https://angular.io).
+- [x] `react` — [React](https://reactjs.org/) frontend app.
+  - `react:<template>` — CRA generated template for React app.
+- [x] `preact` — [Preact](https://preactjs.com/) frontend app.
+  - `preact:<template>` — Preact CLI generated template for Preact app.
+- [x] `vue` — [Vue.js](https://vuejs.org/) frontend app.
+  - `vue:<user/repo>` — Preset for generating Vue.js app from GitHub.
+  - `vue:<gitlab|bitbucket>:<user/repo>` — Preset for generating Vue.js app from GitLab/BitBucket/etc.
+- [x] `angular` — [Angular](https://angular.io/) frontend app.
+- [x] `svelte` — [Svelte](https://svelte.dev/) frontend app.
+- [x] `sapper` — [Sapper](https://sapper.svelte.dev/) frontend app for static websites.
+  - `sapper:<webpack>` — Preset for generating Sapper with Webpack bundler.
+
+> ☝️ Please note, that since version `v1.3.0`, frontend templates (_in the classical sense_) are **not** supported by the Create Go App CLI. Those templates, that we created ([`react-js`](https://github.com/create-go-app/react-js-template), [`react-ts`](https://github.com/create-go-app/react-ts-template) and [`preact-js`](https://github.com/create-go-app/preact-js-template)), are still available, but only for use as **user's custom templates**.
+>
+> Now, the frontend part of your project will be generated **using official CLI** from the authors of each frontend UI library/framework (_under the hood_). So, you'll always get the latest version of `React`, `Preact`, `Vue.js`, `Angular`, `Svelte` or `Sapper` for your project from their authors!
 
 ## 🐳 [Configured Docker containers](https://create-go.app/docker-containers/)
 

cmd/create.go

@@ -172,6 +172,15 @@ var runCreateCmd = func(cmd *cobra.Command, args []string) {
 			cgapp.SendMsg(true, "[ERROR]", err.Error(), "red", true)
 			os.Exit(1)
 		}
+
+		// Create Dockerfile for frontend.
+		filesToMake := map[string][]byte{
+			"frontend/Dockerfile": embed.Get("/Dockerfile.frontend"),
+		}
+		if err := cgapp.MakeFiles(currentDir, filesToMake); err != nil {
+			cgapp.SendMsg(true, "[ERROR]", err.Error(), "red", true)
+			os.Exit(1)
+		}
 	}
 
 	// Docker containers.

configs/.cgapp.yml

@@ -6,19 +6,27 @@
 project:
   # Backend for your project.
   # (Required)
-  # String: `net/http`, `fiber`, `echo`, `gin`
+  # String:
+  #   - `net/http`
+  #   - `fiber`
+  #   - `echo`
+  #   - `gin`
   # User template: supported, set to URL (without protocol),
   # like `github.com/user/template`
   - backend: fiber
 
   # Frontend for your project.
   # (Optional, to skip set to `none`)
   # String:
-  #   - `react`, `react:<template>`
-  #   - `preact`, `preact:<template>`
+  #   - `react`
+  #     - `react:<template>`
+  #   - `preact`
+  #     - `preact:<template>`
   #   - `vue`
-  #   - `svelte`
+  #     - `vue:<user/repo>` (for preset from GitHub)
+  #     - `vue:<gitlab|bitbucket>:<user/repo>` (for presets from others)
   #   - `angular`
+  #   - `svelte`
   # User template: supported, set to URL (without protocol),
   # like `github.com/user/template`
   - frontend: svelte
@@ -41,7 +49,7 @@ project:
 roles:
   # Ansible roles for deploy your project.
   # (Optional, to skip set to empty or comment)
-  # Objects list: `deploy`
+  # Objects list.
   - deploy:
     # Username of remote's server or local's user.
     # (Required)

configs/Dockerfile.frontend

@@ -0,0 +1,17 @@
+FROM node:14-alpine AS builder
+
+LABEL maintainer="Vic Shóstak <[email protected]>"
+
+# Go to work directory.
+WORKDIR /build
+
+# Copy all needed files to /build folder.
+COPY package*.json src ./
+
+# Install frontend dependencies and run build.
+RUN npm ci -s --only=production && npm run build
+
+FROM scratch
+
+# Copy builded files to container root.
+COPY --from=builder /build/dist /

pkg/cgapp/create.go

@@ -134,10 +134,31 @@ func CreateProjectFromCmd(p *registry.Project, c map[string]*registry.Command, m
 				options = []string{create, project[1], p.Type, args["cwd"], p.RootFolder, args["name"], "cgapp"}
 			}
 			break
+		case "vue":
+			// vue create [options] <app-name>
+			options = []string{create, "--default", "--bare", p.Type}
+			if len(project) == 2 {
+				options = []string{create, "--preset", project[1], "--bare", p.Type}
+			}
+			if len(project) == 3 {
+				options = []string{create, "--preset", project[1] + ":" + project[2], "--bare", "--clone", p.Type}
+			}
+			break
+		case "angular":
+			// ng new <app-name> [options]
+			options = []string{create, "cgapp", "--defaults", "--routing", "--directory", p.Type}
+			break
 		case "svelte":
 			// npx degit [template] [dest]
 			options = []string{create, args["template"], folder}
 			break
+		case "sapper":
+			// npx degit [template] [dest]
+			options = []string{create, args["template"] + "#rollup", folder}
+			if len(project) > 1 {
+				options = []string{create, args["template"] + "#" + project[1], folder}
+			}
+			break
 		}
 
 		// Run execution command.

pkg/cgapp/create_test.go

@@ -173,7 +173,7 @@ func TestCreateProjectFromCmd(t *testing.T) {
 		wantErr bool
 	}{
 		{
-			"successfully create react",
+			"successfully create react:redux",
 			args{
 				p: &registry.Project{
 					Type:       "frontend",
@@ -210,6 +210,63 @@ func TestCreateProjectFromCmd(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"successfully create vue (with mock for GitHub)",
+			args{
+				p: &registry.Project{
+					Type:       "frontend",
+					Name:       "vue:mock",
+					RootFolder: "../../tmp",
+				},
+				c: map[string]*registry.Command{
+					"vue": {
+						Runner: "echo",
+						Create: "vue",
+						Args:   map[string]string{},
+					},
+				},
+				m: registry.RegexpFrontendPattern,
+			},
+			false,
+		},
+		{
+			"successfully create vue (with mock for others)",
+			args{
+				p: &registry.Project{
+					Type:       "frontend",
+					Name:       "vue:mock:mock",
+					RootFolder: "../../tmp",
+				},
+				c: map[string]*registry.Command{
+					"vue": {
+						Runner: "echo",
+						Create: "vue",
+						Args:   map[string]string{},
+					},
+				},
+				m: registry.RegexpFrontendPattern,
+			},
+			false,
+		},
+		{
+			"successfully create angular",
+			args{
+				p: &registry.Project{
+					Type:       "frontend",
+					Name:       "angular",
+					RootFolder: "../../tmp",
+				},
+				c: map[string]*registry.Command{
+					"angular": {
+						Runner: "echo",
+						Create: "angular",
+						Args:   map[string]string{},
+					},
+				},
+				m: registry.RegexpFrontendPattern,
+			},
+			false,
+		},
 		{
 			"successfully create svelte",
 			args{
@@ -229,12 +286,31 @@ func TestCreateProjectFromCmd(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"successfully create sapper:webpack",
+			args{
+				p: &registry.Project{
+					Type:       "frontend",
+					Name:       "sapper:webpack",
+					RootFolder: "../../tmp",
+				},
+				c: map[string]*registry.Command{
+					"sapper": {
+						Runner: "echo",
+						Create: "sapper",
+						Args:   map[string]string{},
+					},
+				},
+				m: registry.RegexpFrontendPattern,
+			},
+			false,
+		},
 		{
 			"successfully create from user repository",
 			args{
 				p: &registry.Project{
 					Type:       "frontend",
-					Name:       "github.com/create-go-app/preact-js-template",
+					Name:       "github.com/create-go-app/gin-go-template",
 					RootFolder: "../../tmp",
 				},
 				c: registry.Commands,