From 18d30b50bc7ba800c9f05bfd82970781db0aea3e Mon Sep 17 00:00:00 2001 From: Ben Schumacher Date: Wed, 23 Sep 2020 01:14:00 +0200 Subject: [PATCH] Don't generate manifest.ts (#127) --- .gitattributes | 1 - build/manifest/main.go | 35 ----------------------------------- webapp/src/manifest.ts | 28 +--------------------------- 3 files changed, 1 insertion(+), 63 deletions(-) diff --git a/.gitattributes b/.gitattributes index 4bd338f..f8621eb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ server/manifest.go linguist-generated=true -webapp/src/manifest.js linguist-generated=true diff --git a/build/manifest/main.go b/build/manifest/main.go index 14e6f4f..3d2cde7 100644 --- a/build/manifest/main.go +++ b/build/manifest/main.go @@ -5,7 +5,6 @@ import ( "fmt" "io/ioutil" "os" - "strings" "github.com/mattermost/mattermost-server/v5/model" "github.com/pkg/errors" @@ -32,17 +31,6 @@ func init() { } ` -const pluginIDJSFileTemplate = `// This file is automatically generated. Do not modify it manually. - -const manifest = JSON.parse(` + "`" + ` -%s -` + "`" + `); - -export default manifest; -export const id = manifest.id; -export const version = manifest.version; -` - func main() { if len(os.Args) <= 1 { panic("no cmd specified") @@ -134,28 +122,5 @@ func applyManifest(manifest *model.Manifest) error { } } - if manifest.HasWebapp() { - // generate JSON representation of Manifest. - // JSON is very similar and compatible with JS's object literals. so, what we do here - // is actually JS code generation. - manifestBytes, err := json.MarshalIndent(manifest, "", " ") - if err != nil { - return err - } - manifestStr := string(manifestBytes) - - // Escape newlines - manifestStr = strings.ReplaceAll(manifestStr, `\n`, `\\n`) - - // write generated code to file by using JS file template. - if err := ioutil.WriteFile( - "webapp/src/manifest.ts", - []byte(fmt.Sprintf(pluginIDJSFileTemplate, manifestStr)), - 0600, - ); err != nil { - return errors.Wrap(err, "failed to open webapp/src/manifest.js") - } - } - return nil } diff --git a/webapp/src/manifest.ts b/webapp/src/manifest.ts index ae6fdfc..5e14f59 100644 --- a/webapp/src/manifest.ts +++ b/webapp/src/manifest.ts @@ -1,30 +1,4 @@ -// This file is automatically generated. Do not modify it manually. - -const manifest = JSON.parse(` -{ - "id": "com.mattermost.plugin-starter-template", - "name": "Plugin Starter Template", - "description": "This plugin serves as a starting point for writing a Mattermost plugin.", - "version": "0.1.0", - "min_server_version": "5.12.0", - "server": { - "executables": { - "linux-amd64": "server/dist/plugin-linux-amd64", - "darwin-amd64": "server/dist/plugin-darwin-amd64", - "windows-amd64": "server/dist/plugin-windows-amd64.exe" - }, - "executable": "" - }, - "webapp": { - "bundle_path": "webapp/dist/main.js" - }, - "settings_schema": { - "header": "", - "footer": "", - "settings": [] - } -} -`); +import manifest from '../../plugin.json'; export default manifest; export const id = manifest.id;