fmartingr/mattermost-plugin-attachments-remover
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tweak plugin id/version injection

Browse source 
* define BUNDLE_NAME after including build/setup.mk (just for clarity, not correctness)
* separate plugin id from version with dash in bundle name to match Mattermost package
* fix various js/go idioms (some pre-existing!)
* fix error message
This commit is contained in:
Jesse Hallam 2018-09-20 11:36:53 -04:00
parent a0e9acdbaf
commit 5b2980d1ac
No known key found for this signature in database
GPG key ID: E7959EB6518AF966
6 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -4,11 +4,12 @@ NPM ?= $(shell command -v npm 2> /dev/null)
HTTP ?= $(shell command -v http 2> /dev/null) HTTP ?= $(shell command -v http 2> /dev/null)
CURL ?= $(shell command -v curl 2> /dev/null) CURL ?= $(shell command -v curl 2> /dev/null)
MANIFEST_FILE ?= plugin.json MANIFEST_FILE ?= plugin.json
BUNDLE_NAME = $(PLUGIN_ID)_$(PLUGIN_VERSION).tar.gz
# Verify environment, and define PLUGIN_ID, HAS_SERVER and HAS_WEBAPP as needed. # Verify environment, and define PLUGIN_ID, PLUGIN_VERSION, HAS_SERVER and HAS_WEBAPP as needed.
include build/setup.mk include build/setup.mk
BUNDLE_NAME ?= $(PLUGIN_ID)-$(PLUGIN_VERSION).tar.gz
# all, the default target, tests, builds and bundles the plugin. # all, the default target, tests, builds and bundles the plugin.
all: test dist all: test dist

21
build/manifest/main.go
View file

@ -10,15 +10,20 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
const PluginIdGoFileTemplate = `package main const pluginIdGoFileTemplate = `package main
const PluginId = "%s" var manifest = struct {
const PluginVersion = "%s" Id string
Version string
}{
Id: "%s",
Version: "%s",
}
` `
const PluginIdJsFileTemplate = `export default { const pluginIdJsFileTemplate = `export default {
PluginId: '%s', id: '%s',
PluginVersion: '%s', version: '%s',
}; };
` `
@ -98,7 +103,7 @@ func applyManifest(manifest *model.Manifest) error {
if manifest.HasServer() { if manifest.HasServer() {
if err := ioutil.WriteFile( if err := ioutil.WriteFile(
"server/manifest.go", "server/manifest.go",
[]byte(fmt.Sprintf(PluginIdGoFileTemplate, manifest.Id, manifest.Version)), []byte(fmt.Sprintf(pluginIdGoFileTemplate, manifest.Id, manifest.Version)),
0644, 0644,
); err != nil { ); err != nil {
return errors.Wrap(err, "failed to write server/manifest.go") return errors.Wrap(err, "failed to write server/manifest.go")
@ -108,7 +113,7 @@ func applyManifest(manifest *model.Manifest) error {
if manifest.HasWebapp() { if manifest.HasWebapp() {
if err := ioutil.WriteFile( if err := ioutil.WriteFile(
"webapp/src/manifest.js", "webapp/src/manifest.js",
[]byte(fmt.Sprintf(PluginIdJsFileTemplate, manifest.Id, manifest.Version)), []byte(fmt.Sprintf(pluginIdJsFileTemplate, manifest.Id, manifest.Version)),
0644, 0644,
); err != nil { ); err != nil {
return errors.Wrap(err, "failed to open webapp/src/manifest.js") return errors.Wrap(err, "failed to open webapp/src/manifest.js")

2
build/setup.mk
View file

@ -16,7 +16,7 @@ endif
# Extract the plugin version from the manifest. # Extract the plugin version from the manifest.
PLUGIN_VERSION ?= $(shell build/bin/manifest version) PLUGIN_VERSION ?= $(shell build/bin/manifest version)
ifeq ($(PLUGIN_VERSION),) ifeq ($(PLUGIN_VERSION),)
$(error "Cannot parse id from $(MANIFEST_FILE)") $(error "Cannot parse version from $(MANIFEST_FILE)")
endif endif
# Determine if a server is defined in the manifest. # Determine if a server is defined in the manifest.

9
server/manifest.go
View file

@ -1,4 +1,9 @@
package main package main
const PluginId = "com.mattermost.sample-plugin" var manifest = struct {
const PluginVersion = "0.0.1" Id string
Version string
}{
Id: "com.mattermost.sample-plugin",
Version: "0.0.1",
}

4
webapp/src/index.js
View file

@ -1,4 +1,4 @@
import Manifest from './manifest'; import {id as pluginId} from './manifest';
export default class Plugin { export default class Plugin {
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
@ -7,4 +7,4 @@ export default class Plugin {
} }
} }
window.registerPlugin(Manifest.PluginId, new Plugin()); window.registerPlugin(pluginId, new Plugin());

4
webapp/src/manifest.js
View file

@ -1,4 +1,4 @@
export default { export default {
PluginId: 'com.mattermost.sample-plugin', id: 'com.mattermost.sample-plugin',
PluginVersion: '0.0.1', version: '0.0.1',
}; };