Skip to content

Commit

Permalink
Rename bundle.js to gotty-bundle.js
Browse files Browse the repository at this point in the history
  • Loading branch information
yudai committed Aug 22, 2017
1 parent 27b6436 commit a8bb23f
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gotty: server/asset.go main.go server/*.go webtty/*.go backend/*.go Makefile

asset: server/asset.go

server/asset.go: bindata/static/js/bundle.js bindata/static/index.html bindata/static/favicon.png bindata/static/css/index.css bindata/static/css/xterm.css bindata/static/css/xterm_customize.css
server/asset.go: bindata/static/js/gotty-bundle.js bindata/static/index.html bindata/static/favicon.png bindata/static/css/index.css bindata/static/css/xterm.css bindata/static/css/xterm_customize.css
go-bindata -prefix bindata -pkg server -ignore=\\.gitkeep -o server/asset.go bindata/...
gofmt -w server/asset.go

Expand All @@ -27,8 +27,8 @@ bindata/static/js: bindata/static
mkdir -p bindata/static/js


bindata/static/js/bundle.js: bindata/static/js js/dist/bundle.js
cp js/dist/bundle.js bindata/static/js/bundle.js
bindata/static/js/gotty-bundle.js: bindata/static/js js/dist/gotty-bundle.js
cp js/dist/gotty-bundle.js bindata/static/js/gotty-bundle.js

bindata/static/css: bindata/static
mkdir -p bindata/static/css
Expand All @@ -46,7 +46,7 @@ js/node_modules/xterm/dist/xterm.css:
cd js && \
npm install

js/dist/bundle.js:
js/dist/gotty-bundle.js:
cd js && \
webpack

Expand Down
1 change: 0 additions & 1 deletion js/dist/bundle.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion js/dist/bundle.js → js/dist/gotty-bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -23983,4 +23983,4 @@ exports.contains = contains;

/***/ })
/******/ ]);
//# sourceMappingURL=bundle.js.map
//# sourceMappingURL=gotty-bundle.js.map
1 change: 1 addition & 0 deletions js/dist/gotty-bundle.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
entry: "./src/main.ts",
output: {
filename: "./dist/bundle.js"
filename: "./dist/gotty-bundle.js"
},
devtool: "source-map",
resolve: {
Expand Down
2 changes: 1 addition & 1 deletion resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
<div id="terminal"></div>
<script src="./auth_token.js"></script>
<script src="./config.js"></script>
<script src="./js/bundle.js"></script>
<script src="./js/gotty-bundle.js"></script>
</body>
</html>
33 changes: 28 additions & 5 deletions server/asset.go

Large diffs are not rendered by default.

0 comments on commit a8bb23f

Please sign in to comment.