Commit 8e27da50 authored by Andrei Mihu's avatar Andrei Mihu
Browse files

Update console handlebars and js-yaml dependencies.

parent 2c13ff50

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 
- Use Go 1.12.6 as base Docker container image and native builds.

- Move from dep to Go modules for dependency management.

- Switch database driver from pq to pgx.

- Update console handlebars (4.1.2) and js-yaml (3.13.1) dependencies.



### Fixed

- Fix delayed first time invocation of tournament and leaderboard callbacks.

console/a_console-packr.go

+17 −17

File changed.

Preview size limit exceeded, changes collapsed.

console/ui.go

+15 −4
Original line number Diff line number Diff line 
// Copyright 2019 The Nakama Authors

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

// http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package console



import (
@@ -6,7 +20,4 @@ import ( 
	"github.com/gobuffalo/packr"

)



func Handler() http.Handler {

	uiBox := packr.NewBox("./ui/build") // path must be string not a variable for packr to understand

	return http.FileServer(uiBox)

}
 
var UI = http.FileServer(packr.NewBox("./ui/build")) // path must be string not a variable for packr to understand

console/ui/package.json

+3 −1
Original line number Diff line number Diff line
@@ -32,7 +32,9 @@ 
    "redux": "^4.0.1",

    "redux-saga": "^1.0.2",

    "typesafe-actions": "^3.2.1",

    "typescript": "3.3.3333"

    "typescript": "3.3.3333",

    "js-yaml": "^3.13.1",

    "handlebars": "^4.1.2"

  },

  "scripts": {

    "start": "react-scripts start",

console/ui/yarn.lock

+25 −1
Original line number Diff line number Diff line
@@ -4494,6 +4494,17 @@ handlebars@^4.0.3: 
  optionalDependencies:

    uglify-js "^3.1.4"



handlebars@^4.1.2:

  version "4.1.2"

  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"

  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==

  dependencies:

    neo-async "^2.6.0"

    optimist "^0.6.1"

    source-map "^0.6.1"

  optionalDependencies:

    uglify-js "^3.1.4"



har-schema@^2.0.0:

  version "2.0.0"

  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -5850,6 +5861,14 @@ js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0: 
    argparse "^1.0.7"

    esprima "^4.0.0"



js-yaml@^3.13.1:

  version "3.13.1"

  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"

  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==

  dependencies:

    argparse "^1.0.7"

    esprima "^4.0.0"



jsbn@~0.1.0:

  version "0.1.1"

  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -6509,7 +6528,7 @@ mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@ 
  dependencies:

    minimist "0.0.8"



moment@^2.10.2, moment@^2.24.0:

moment@^2.10.2:

  version "2.24.0"

  resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"

  integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
@@ -6600,6 +6619,11 @@ neo-async@^2.5.0: 
  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"

  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==



neo-async@^2.6.0:

  version "2.6.1"

  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"

  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==



nice-try@^1.0.4:

  version "1.0.5"

  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"