Skip to content
Snippets Groups Projects
Commit eeb97122 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

Merge branch 'MONSTER/-/646683cb-0622-4ec4-af16-f3cc149cc8c1' into 'master' 

Monster/ /646683cb 0622 4ec4 af16 f3cc149cc8c1

See merge request oss/libraries/javascript/monster!14
parents 2099be09 f7936cbc
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Makefile
+ 4
− 3
View file @ eeb97122
...@@ -340,9 +340,10 @@ test-browser-monster: $(MONSTER_BUILD_TEST_BROWSER_DIR)node_modules/ create-poly ...@@ -340,9 +340,10 @@ test-browser-monster: $(MONSTER_BUILD_TEST_BROWSER_DIR)node_modules/ create-poly
$(QUIET) $(SED) -i "1 i import \"./prepare.js\";" $(MONSTER_TEST_DIR)web/import.js $(QUIET) $(SED) -i "1 i import \"./prepare.js\";" $(MONSTER_TEST_DIR)web/import.js
$(QUIET) $(SED) -i "1 i /** this file was created automatically by the make target test-browser-monster */" $(MONSTER_TEST_DIR)web/import.js $(QUIET) $(SED) -i "1 i /** this file was created automatically by the make target test-browser-monster */" $(MONSTER_TEST_DIR)web/import.js
$(QUIET) $(CD) $(MONSTER_BUILD_TEST_BROWSER_DIR); $(WEBPACK) ; $(CD) - $(QUIET) $(CD) $(MONSTER_BUILD_TEST_BROWSER_DIR); $(WEBPACK) ; $(CD) -
$(QUIET) $(SED) -i -E "/<h1/s_.*_ <h1 style='margin-bottom: 0.1em;'>Monster $(MONSTER_CORE_VERSION)</h1>_" $(MONSTER_TEST_DIR)web/test.html $(QUIET) $(SED) -i -E "/<h1/s_.*_ <h1 style='margin-bottom: 0.1em;'>Monster $(MONSTER_CORE_VERSION)</h1>_" $(MONSTER_TEST_DIR)web/test.html $(MONSTER_TEST_DIR)web/monster.html $(MONSTER_TEST_DIR)web/monster-dev.html
$(QUIET) $(SED) -i -E "/id=\"lastupdate\"/s_.*_ <div id=\"lastupdate\" style='font-size:0.7em'>last update $(shell date)</div>_" $(MONSTER_TEST_DIR)web/test.html $(QUIET) $(SED) -i -E "/id=\"lastupdate\"/s_.*_ <div id=\"lastupdate\" style='font-size:0.7em'>last update $(shell date)</div>_" $(MONSTER_TEST_DIR)web/test.html $(MONSTER_TEST_DIR)web/monster.html $(MONSTER_TEST_DIR)web/monster-dev.html
$(QUIET) $(SED) -i -E "s_src=\"([\"]*)\.js.*\"_src=\"\1.js?r=$(shell date +"%T")\"_" $(MONSTER_TEST_DIR)web/test.html $(QUIET) $(SED) -i -E "s_src=\"([\"]*)\.js.*\"_src=\"\1.js?r=$(shell date +"%T")\"_" $(MONSTER_TEST_DIR)web/test.html $(MONSTER_TEST_DIR)web/monster.html $(MONSTER_TEST_DIR)web/monster-dev.html
$(QUIET) $(SED) -i -E "s_dist/([0-9]+\.[0-9]+\.[0-9]+)*/dist/monster_dist/$(MONSTER_CORE_VERSION)/dist/monster_" $(MONSTER_TEST_DIR)web/monster.html $(MONSTER_TEST_DIR)web/monster-dev.html
$(QUIET) if $(OPENBROWSER) ; then google-chrome --profile-directory="Default" $(MONSTER_TEST_DIR)web/test.html ; fi $(QUIET) if $(OPENBROWSER) ; then google-chrome --profile-directory="Default" $(MONSTER_TEST_DIR)web/test.html ; fi
.PHONY: test-monster .PHONY: test-monster
......
packages/monster/test/web/monster-dev.html
+ 3
− 3
View file @ eeb97122
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
crossorigin="anonymous" crossorigin="anonymous"
referrerpolicy="no-referrer"></script> referrerpolicy="no-referrer"></script>
<script src="https://monsterjs.org/dist/1.11.0/dist/monster.dev.js"></script> <script src="https://monsterjs.org/dist/1.11.1/dist/monster.dev.js"></script>
</head> </head>
<body> <body>
<div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;"> <div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;">
<h1 style='margin-bottom: 0.1em;'>Monster 1.11.0</h1> <h1 style='margin-bottom: 0.1em;'>Monster 1.11.1</h1>
<div id="lastupdate" style='font-size:0.7em'>last update Sa 4. Sep 17:12:21 CEST 2021</div> <div id="lastupdate" style='font-size:0.7em'>last update So 5. Sep 00:31:44 CEST 2021</div>
</div> </div>
</body> </body>
</html> </html>
packages/monster/test/web/monster.html
+ 3
− 3
View file @ eeb97122
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
crossorigin="anonymous" crossorigin="anonymous"
referrerpolicy="no-referrer"></script> referrerpolicy="no-referrer"></script>
<script src="https://monsterjs.org/dist/1.11.0/dist/monster.js"></script> <script src="https://monsterjs.org/dist/1.11.1/dist/monster.js"></script>
</head> </head>
<body> <body>
<div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;"> <div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;">
<h1 style='margin-bottom: 0.1em;'>Monster 1.11.0</h1> <h1 style='margin-bottom: 0.1em;'>Monster 1.11.1</h1>
<div id="lastupdate" style='font-size:0.7em'>last update Sa 4. Sep 17:12:21 CEST 2021</div> <div id="lastupdate" style='font-size:0.7em'>last update So 5. Sep 00:31:44 CEST 2021</div>
</div> </div>
</body> </body>
</html> </html>
packages/monster/test/web/test.html
+ 1
− 1
View file @ eeb97122
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<body> <body>
<div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;"> <div id="headline" style="display: flex;align-items: center;justify-content: center;flex-direction: column;">
<h1 style='margin-bottom: 0.1em;'>Monster 1.11.1</h1> <h1 style='margin-bottom: 0.1em;'>Monster 1.11.1</h1>
<div id="lastupdate" style='font-size:0.7em'>last update So 5. Sep 00:03:30 CEST 2021</div> <div id="lastupdate" style='font-size:0.7em'>last update So 5. Sep 00:31:44 CEST 2021</div>
</div> </div>
<div id="mocks"></div> <div id="mocks"></div>
<div id="mocha"></div> <div id="mocha"></div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment