Move frontend code to the root directory

.bazelignore

@@ -7,4 +7,4 @@ vendor
 .github
 hack
 template
-pkg/app/web/node_modules
+web/node_modules

.github/workflows/test.yaml

@@ -39,8 +39,8 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Yarn install
-        working-directory: pkg/app/web
+        working-directory: web
         run: yarn install
       - name: Run unit tests
-        working-directory: pkg/app/web
+        working-directory: web
         run: echo "WIP"

.gitignore

@@ -32,13 +32,11 @@
 node_modules
 
 # web
-pkg/app/web/dist
+web/dist
+web/.env
+web/.cache
+web/coverage
 pkg/app/web/.env
-pkg/app/web/.cache
-pkg/app/web/coverage
-
-# generated by hack/gen-grpc-web-client.sh
-pkg/app/web/src/service
 
 # IDE config files
 .ijwb

.kapetanios/presubmit.yaml

@@ -31,7 +31,7 @@ spec:
     - description: Run coverage for unit tests
       runner: gcr.io/pipecd/runner:1.0.0
       commands:
-        - bazelisk --output_base=/workspace/bazel_out coverage --config=ci --config=linux -- //pkg/... -//pkg/app/web/...
+        - bazelisk --output_base=/workspace/bazel_out coverage --config=ci --config=linux -- //pkg/...
       secrets:
       - name: bazel_cache_service_account
         type: PROJECT
@@ -61,7 +61,7 @@ spec:
   - name: web-test
     timeout: 30m
     whenChanged:
-      - pkg/app/web/**
+      - web/**
     steps:
     - name: restore-cache
       description: Restore node modules cache
@@ -72,7 +72,7 @@ spec:
     - name: install-dependencies
       runner: gcr.io/kapetanios/node:16.13.1
       commands:
-        - cd pkg/app/web
+        - cd web
         - yarn install --frozen-lockfile
     - description: Save node modules cache
       runner: kapetanios@save-cache
@@ -83,15 +83,15 @@ spec:
       description: Generate API client code
       runner: gcr.io/pipecd/runner:1.0.0
       commands:
-        - bazelisk --output_base=/workspace/bazel_out build --config=ci //pkg/app/web:build_api //pkg/app/web:build_model
+        - bazelisk --output_base=/workspace/bazel_out build --config=ci //web:build_api //web:build_model
       secrets:
       - name: bazel_cache_service_account
         type: PROJECT
     - name: test
       description: Run all web tests
       runner: gcr.io/kapetanios/node:16.13.1
       commands:
-        - cd pkg/app/web
+        - cd web
         - yarn test:coverage --coverageDirectory=/artifact --runInBand
         - yarn typecheck
       requires:

BUILD.bazel

@@ -7,7 +7,7 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 # gazelle:exclude terraform
 # gazelle:exclude template
 # gazelle:exclude vendor
-# gazelle:exclude pkg/app/web/node_modules
+# gazelle:exclude web/node_modules
 # gazelle:exclude pkg/plugin/golinter/gofmt/testdata
 # gazelle:exclude pkg/app/kapetool/cmd/godifflinter/pkg/linters/unusedparam/testdata
 # gazelle:exclude pkg/app/kapetool/cmd/godifflinter/pkg/linters/ineffassign/testdata

Makefile

@@ -54,7 +54,7 @@ test-integration:
 
 .PHONY: coverage
 coverage:
-	bazelisk ${BAZEL_FLAGS} coverage ${BAZEL_COMMAND_FLAGS} -- //pkg/... -//pkg/app/web/...
+	bazelisk ${BAZEL_FLAGS} coverage ${BAZEL_COMMAND_FLAGS} -- //pkg/...
 
 .PHONY: dep
 dep:
@@ -80,19 +80,19 @@ site:
 
 .PHONY: web-dep
 web-dep:
-	bazelisk build //pkg/app/web:build_api //pkg/app/web:build_model
+	bazelisk build //web:build_api //web:build_model
 
 .PHONY: web-dev
 web-dev:
-	cd pkg/app/web; yarn dev
+	cd web; yarn dev
 
 .PHONY: web-test
 web-test:
-	cd pkg/app/web; yarn test:coverage --runInBand
+	cd web; yarn test:coverage --runInBand
 
 .PHONY: web-lint
 web-lint:
-	cd pkg/app/web; yarn lint:fix
+	cd web; yarn lint:fix
 
 .PHONY: generate-test-tls
 generate-test-tls:
@@ -129,4 +129,4 @@ update-docsy:
 
 .PHONY: codegen
 codegen:
-	docker run --rm -v ${PWD}:/repo -it gcr.io/pipecd/codegen:0.5.0 /repo
+	docker run --rm -v ${PWD}:/repo -it gcr.io/pipecd/codegen:0.6.0 /repo

WORKSPACE

@@ -1,6 +1,6 @@
 workspace(
     name = "pipecd",
-    managed_directories = {"@npm": ["pkg/app/web/node_modules"]},
+    managed_directories = {"@npm": ["web/node_modules"]},
 )
 
 load(
@@ -178,15 +178,15 @@ load(
 ### https://bazelbuild.github.io/rules_nodejs/Built-ins.html#usage
 node_repositories(
     node_version = "16.13.0",
-    package_json = ["//pkg/app/web:package.json"],
+    package_json = ["//web:package.json"],
     yarn_version = "1.22.4",
 )
 
 yarn_install(
     name = "npm",
     frozen_lockfile = False,
-    package_json = "//pkg/app/web:package.json",
-    yarn_lock = "//pkg/app/web:yarn.lock",
+    package_json = "//web:package.json",
+    yarn_lock = "//web:yarn.lock",
 )
 
 load("@npm//@bazel/labs:package.bzl", "npm_bazel_labs_dependencies")

cmd/pipecd/BUILD.bazel

@@ -66,7 +66,7 @@ go_library(
 go_binary(
     name = "pipecd",
     data = [
-        "//pkg/app/web:public_files",
+        "//web:public_files",
     ],
     embed = [":go_default_library"],
     visibility = ["//visibility:public"],

cmd/pipecd/server.go

@@ -97,7 +97,7 @@ func NewServerCommand() *cobra.Command {
 		httpPort:     9082,
 		apiPort:      9083,
 		adminPort:    9085,
-		staticDir:    "pkg/app/web/public_files",
+		staticDir:    "web/public_files",
 		cacheAddress: "cache:6379",
 		gracePeriod:  30 * time.Second,
 	}

dockers/codegen/DOCKER_BUILD

@@ -1,2 +1,2 @@
-version: 0.5.0
+version: 0.6.0
 registry: gcr.io/pipecd/codegen

dockers/codegen/codegen.sh

@@ -48,8 +48,8 @@ jsProtoDirs=(
   "pkg/app/server/service/webservice"
 )
 jsOutDirs=(
-  "pkg/app/web/model"
-  "pkg/app/web/api_client"
+  "web/model"
+  "web/api_client"
 )
 
 i=0
@@ -76,8 +76,8 @@ while [ $i -lt ${#jsProtoDirs[*]} ]; do
   mv ${inDir}/*.ts ${outDir}
 
   find ${outDir} -type f -exec sed -i 's:.*validate_pb.*::g' {} \;
-  find ${outDir} -type f -exec sed -i "s:'.*pkg:'pipecd\/pkg\/app\/web:g;" {} \;
-  find ${outDir} -type f -exec sed -i "s:'.*\/model\/:'pipecd\/pkg\/app\/web\/model\/:g;" {} \;
+  find ${outDir} -type f -exec sed -i "s:'.*pkg:'pipecd\/web:g;" {} \;
+  find ${outDir} -type f -exec sed -i "s:'.*\/model\/:'pipecd\/web\/model\/:g;" {} \;
   echo "successfully generated"
 done
 

pkg/app/web/BUILD.bazel → web/BUILD.bazel

@@ -85,7 +85,7 @@ webpack(
         "--env bazelBinPath=./$(BINDIR)",
         "--output-path",
         "$(@D)",
-        "./$(BINDIR)/pkg/app/web/src/index.js",
+        "./$(BINDIR)/web/src/index.js",
     ],
     configuration_env_vars = ["ENABLE_MOCK"],
     data = [

pkg/app/web/api_client/service_grpc_web_pb.d.ts → web/api_client/service_grpc_web_pb.d.ts

@@ -1,6 +1,6 @@
 import * as grpcWeb from 'grpc-web';
 
-import * as pkg_app_server_service_webservice_service_pb from 'pipecd/pkg/app/web/app/server/service/webservice/service_pb';
+import * as pkg_app_server_service_webservice_service_pb from 'pipecd/web/app/server/service/webservice/service_pb';
 
 
 export class WebServiceClient {

pkg/app/web/api_client/service_grpc_web_pb.js → web/api_client/service_grpc_web_pb.js

@@ -18,31 +18,31 @@ grpc.web = require('grpc-web');
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js')
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js')
 
-var pkg_model_insight_pb = require('pipecd/pkg/app/web/model/insight_pb.js')
+var pkg_model_insight_pb = require('pipecd/web/model/insight_pb.js')
 
-var pkg_model_application_pb = require('pipecd/pkg/app/web/model/application_pb.js')
+var pkg_model_application_pb = require('pipecd/web/model/application_pb.js')
 
-var pkg_model_application_live_state_pb = require('pipecd/pkg/app/web/model/application_live_state_pb.js')
+var pkg_model_application_live_state_pb = require('pipecd/web/model/application_live_state_pb.js')
 
-var pkg_model_command_pb = require('pipecd/pkg/app/web/model/command_pb.js')
+var pkg_model_command_pb = require('pipecd/web/model/command_pb.js')
 
-var pkg_model_deployment_pb = require('pipecd/pkg/app/web/model/deployment_pb.js')
+var pkg_model_deployment_pb = require('pipecd/web/model/deployment_pb.js')
 
-var pkg_model_deployment_chain_pb = require('pipecd/pkg/app/web/model/deployment_chain_pb.js')
+var pkg_model_deployment_chain_pb = require('pipecd/web/model/deployment_chain_pb.js')
 
-var pkg_model_logblock_pb = require('pipecd/pkg/app/web/model/logblock_pb.js')
+var pkg_model_logblock_pb = require('pipecd/web/model/logblock_pb.js')
 
-var pkg_model_piped_pb = require('pipecd/pkg/app/web/model/piped_pb.js')
+var pkg_model_piped_pb = require('pipecd/web/model/piped_pb.js')
 
-var pkg_model_role_pb = require('pipecd/pkg/app/web/model/role_pb.js')
+var pkg_model_role_pb = require('pipecd/web/model/role_pb.js')
 
-var pkg_model_project_pb = require('pipecd/pkg/app/web/model/project_pb.js')
+var pkg_model_project_pb = require('pipecd/web/model/project_pb.js')
 
-var pkg_model_apikey_pb = require('pipecd/pkg/app/web/model/apikey_pb.js')
+var pkg_model_apikey_pb = require('pipecd/web/model/apikey_pb.js')
 
-var pkg_model_event_pb = require('pipecd/pkg/app/web/model/event_pb.js')
+var pkg_model_event_pb = require('pipecd/web/model/event_pb.js')
 
 var google_protobuf_wrappers_pb = require('google-protobuf/google/protobuf/wrappers_pb.js')
 const proto = {};

pkg/app/web/api_client/service_pb.d.ts → web/api_client/service_pb.d.ts

@@ -1,19 +1,19 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
-import * as pkg_model_insight_pb from 'pipecd/pkg/app/web/model/insight_pb';
-import * as pkg_model_application_pb from 'pipecd/pkg/app/web/model/application_pb';
-import * as pkg_model_application_live_state_pb from 'pipecd/pkg/app/web/model/application_live_state_pb';
-import * as pkg_model_command_pb from 'pipecd/pkg/app/web/model/command_pb';
-import * as pkg_model_deployment_pb from 'pipecd/pkg/app/web/model/deployment_pb';
-import * as pkg_model_deployment_chain_pb from 'pipecd/pkg/app/web/model/deployment_chain_pb';
-import * as pkg_model_logblock_pb from 'pipecd/pkg/app/web/model/logblock_pb';
-import * as pkg_model_piped_pb from 'pipecd/pkg/app/web/model/piped_pb';
-import * as pkg_model_role_pb from 'pipecd/pkg/app/web/model/role_pb';
-import * as pkg_model_project_pb from 'pipecd/pkg/app/web/model/project_pb';
-import * as pkg_model_apikey_pb from 'pipecd/pkg/app/web/model/apikey_pb';
-import * as pkg_model_event_pb from 'pipecd/pkg/app/web/model/event_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
+import * as pkg_model_insight_pb from 'pipecd/web/model/insight_pb';
+import * as pkg_model_application_pb from 'pipecd/web/model/application_pb';
+import * as pkg_model_application_live_state_pb from 'pipecd/web/model/application_live_state_pb';
+import * as pkg_model_command_pb from 'pipecd/web/model/command_pb';
+import * as pkg_model_deployment_pb from 'pipecd/web/model/deployment_pb';
+import * as pkg_model_deployment_chain_pb from 'pipecd/web/model/deployment_chain_pb';
+import * as pkg_model_logblock_pb from 'pipecd/web/model/logblock_pb';
+import * as pkg_model_piped_pb from 'pipecd/web/model/piped_pb';
+import * as pkg_model_role_pb from 'pipecd/web/model/role_pb';
+import * as pkg_model_project_pb from 'pipecd/web/model/project_pb';
+import * as pkg_model_apikey_pb from 'pipecd/web/model/apikey_pb';
+import * as pkg_model_event_pb from 'pipecd/web/model/event_pb';
 import * as google_protobuf_wrappers_pb from 'google-protobuf/google/protobuf/wrappers_pb';
 
 

pkg/app/web/api_client/service_pb.js → web/api_client/service_pb.js

@@ -23,31 +23,31 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
-var pkg_model_insight_pb = require('pipecd/pkg/app/web/model/insight_pb.js');
+var pkg_model_insight_pb = require('pipecd/web/model/insight_pb.js');
 goog.object.extend(proto, pkg_model_insight_pb);
-var pkg_model_application_pb = require('pipecd/pkg/app/web/model/application_pb.js');
+var pkg_model_application_pb = require('pipecd/web/model/application_pb.js');
 goog.object.extend(proto, pkg_model_application_pb);
-var pkg_model_application_live_state_pb = require('pipecd/pkg/app/web/model/application_live_state_pb.js');
+var pkg_model_application_live_state_pb = require('pipecd/web/model/application_live_state_pb.js');
 goog.object.extend(proto, pkg_model_application_live_state_pb);
-var pkg_model_command_pb = require('pipecd/pkg/app/web/model/command_pb.js');
+var pkg_model_command_pb = require('pipecd/web/model/command_pb.js');
 goog.object.extend(proto, pkg_model_command_pb);
-var pkg_model_deployment_pb = require('pipecd/pkg/app/web/model/deployment_pb.js');
+var pkg_model_deployment_pb = require('pipecd/web/model/deployment_pb.js');
 goog.object.extend(proto, pkg_model_deployment_pb);
-var pkg_model_deployment_chain_pb = require('pipecd/pkg/app/web/model/deployment_chain_pb.js');
+var pkg_model_deployment_chain_pb = require('pipecd/web/model/deployment_chain_pb.js');
 goog.object.extend(proto, pkg_model_deployment_chain_pb);
-var pkg_model_logblock_pb = require('pipecd/pkg/app/web/model/logblock_pb.js');
+var pkg_model_logblock_pb = require('pipecd/web/model/logblock_pb.js');
 goog.object.extend(proto, pkg_model_logblock_pb);
-var pkg_model_piped_pb = require('pipecd/pkg/app/web/model/piped_pb.js');
+var pkg_model_piped_pb = require('pipecd/web/model/piped_pb.js');
 goog.object.extend(proto, pkg_model_piped_pb);
-var pkg_model_role_pb = require('pipecd/pkg/app/web/model/role_pb.js');
+var pkg_model_role_pb = require('pipecd/web/model/role_pb.js');
 goog.object.extend(proto, pkg_model_role_pb);
-var pkg_model_project_pb = require('pipecd/pkg/app/web/model/project_pb.js');
+var pkg_model_project_pb = require('pipecd/web/model/project_pb.js');
 goog.object.extend(proto, pkg_model_project_pb);
-var pkg_model_apikey_pb = require('pipecd/pkg/app/web/model/apikey_pb.js');
+var pkg_model_apikey_pb = require('pipecd/web/model/apikey_pb.js');
 goog.object.extend(proto, pkg_model_apikey_pb);
-var pkg_model_event_pb = require('pipecd/pkg/app/web/model/event_pb.js');
+var pkg_model_event_pb = require('pipecd/web/model/event_pb.js');
 goog.object.extend(proto, pkg_model_event_pb);
 var google_protobuf_wrappers_pb = require('google-protobuf/google/protobuf/wrappers_pb.js');
 goog.object.extend(proto, google_protobuf_wrappers_pb);

pkg/app/web/jest.config.js → web/jest.config.js

@@ -6,7 +6,7 @@ module.exports = {
       "<rootDir>/file-transformer.js",
   },
   moduleNameMapper: {
-    "^pipecd/(.*)$": "<rootDir>/../../../$1",
+    "^pipecd/(.*)$": "<rootDir>/../$1",
     "^~/(.*)$": "<rootDir>/src/$1",
     "^~~/(.*)$": "<rootDir>/$1",
   },

pkg/app/web/jest.config.local.js → web/jest.config.local.js

@@ -6,7 +6,7 @@ module.exports = {
       "<rootDir>/file-transformer.js",
   },
   moduleNameMapper: {
-    "^pipecd/(.*)$": "<rootDir>/../../../bazel-bin/$1",
+    "^pipecd/(.*)$": "<rootDir>/../bazel-bin/$1",
     "^~/(.*)$": "<rootDir>/src/$1",
     "^~~/(.*)$": "<rootDir>/$1",
   },

pkg/app/web/model/application_live_state_pb.d.ts → web/model/application_live_state_pb.d.ts

@@ -1,7 +1,7 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
 
 
 export class ApplicationLiveStateSnapshot extends jspb.Message {

pkg/app/web/model/application_live_state_pb.js → web/model/application_live_state_pb.js

@@ -23,7 +23,7 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
 goog.exportSymbol('proto.model.ApplicationLiveStateSnapshot', null, global);
 goog.exportSymbol('proto.model.ApplicationLiveStateSnapshot.Status', null, global);

pkg/app/web/model/application_pb.d.ts → web/model/application_pb.d.ts

@@ -1,8 +1,8 @@
 import * as jspb from 'google-protobuf'
 
 
-import * as pkg_model_common_pb from 'pipecd/pkg/app/web/model/common_pb';
-import * as pkg_model_deployment_pb from 'pipecd/pkg/app/web/model/deployment_pb';
+import * as pkg_model_common_pb from 'pipecd/web/model/common_pb';
+import * as pkg_model_deployment_pb from 'pipecd/web/model/deployment_pb';
 
 
 export class Application extends jspb.Message {

pkg/app/web/model/application_pb.js → web/model/application_pb.js

@@ -23,9 +23,9 @@ var global = (function() {
 
 
 
-var pkg_model_common_pb = require('pipecd/pkg/app/web/model/common_pb.js');
+var pkg_model_common_pb = require('pipecd/web/model/common_pb.js');
 goog.object.extend(proto, pkg_model_common_pb);
-var pkg_model_deployment_pb = require('pipecd/pkg/app/web/model/deployment_pb.js');
+var pkg_model_deployment_pb = require('pipecd/web/model/deployment_pb.js');
 goog.object.extend(proto, pkg_model_deployment_pb);
 goog.exportSymbol('proto.model.Application', null, global);
 goog.exportSymbol('proto.model.ApplicationDeploymentReference', null, global);