From 90b11feb28110ccb10355c5be372cc632279dddf Mon Sep 17 00:00:00 2001
From: kovacsv <viktorkovacs@gmail.com>
Date: Mon, 8 Nov 2021 19:31:42 +0100
Subject: [PATCH] Remove version postfix from lib files.

---
 libs/{jquery-3.5.1.min.js => jquery.min.js}   |  0
 ...ickr.es5.min-1.8.2.js => pickr.es5.min.js} |  0
 ...h.min-1.8.2.css => pickr.monolith.min.css} |  0
 libs/{three.min-r134.js => three.min.js}      |  0
 package.json                                  |  6 ++-
 sandbox/embed_selfhost_errors.html            |  2 +-
 sandbox/embed_selfhost_externallibs.html      |  2 +-
 sandbox/embed_selfhost_fullscreen.html        |  2 +-
 sandbox/embed_selfhost_manual.html            |  2 +-
 sandbox/embed_selfhost_multiple.html          |  2 +-
 sandbox/embed_selfhost_single.html            |  2 +-
 sandbox/embed_selfhost_single_scroll.html     |  2 +-
 sandbox/invalid_driver_detector.html          |  2 +-
 sandbox/three_minimal.html                    |  2 +-
 tools/build.py                                | 14 +++---
 tools/config.json                             |  8 +--
 tools/updatelibs.py                           | 49 +++----------------
 website/embed.html                            | 14 +++---
 website/index.html                            |  8 +--
 19 files changed, 42 insertions(+), 75 deletions(-)
 rename libs/{jquery-3.5.1.min.js => jquery.min.js} (100%)
 rename libs/{pickr.es5.min-1.8.2.js => pickr.es5.min.js} (100%)
 rename libs/{pickr.monolith.min-1.8.2.css => pickr.monolith.min.css} (100%)
 rename libs/{three.min-r134.js => three.min.js} (100%)

diff --git a/libs/jquery-3.5.1.min.js b/libs/jquery.min.js
similarity index 100%
rename from libs/jquery-3.5.1.min.js
rename to libs/jquery.min.js
diff --git a/libs/pickr.es5.min-1.8.2.js b/libs/pickr.es5.min.js
similarity index 100%
rename from libs/pickr.es5.min-1.8.2.js
rename to libs/pickr.es5.min.js
diff --git a/libs/pickr.monolith.min-1.8.2.css b/libs/pickr.monolith.min.css
similarity index 100%
rename from libs/pickr.monolith.min-1.8.2.css
rename to libs/pickr.monolith.min.css
diff --git a/libs/three.min-r134.js b/libs/three.min.js
similarity index 100%
rename from libs/three.min-r134.js
rename to libs/three.min.js
diff --git a/package.json b/package.json
index 4136a39..29ea1db 100644
--- a/package.json
+++ b/package.json
@@ -20,10 +20,12 @@
 		"test": "mocha test",
 		"build": "node tools/run_python.js tools/build.py",
 		"update": "node tools/run_python.js tools/update.py",
-		"updatelibs": "node tools/run_python.js tools/updatelibs.py && npm run update",
+		"updatelibs": "npm install && node tools/run_python.js tools/updatelibs.py",
 		"svg": "node tools/run_python.js tools/svg.py"
 	},
-	"dependencies": {},
+	"dependencies": {
+		"three": "0.134.0"
+	},
 	"eslintConfig": {
 		"env": {
 			"browser": true,
diff --git a/sandbox/embed_selfhost_errors.html b/sandbox/embed_selfhost_errors.html
index 76285f2..c561800 100644
--- a/sandbox/embed_selfhost_errors.html
+++ b/sandbox/embed_selfhost_errors.html
@@ -7,7 +7,7 @@
 
 	<title>Online 3D Viewer</title>
 
-    <script type="text/javascript" src="../../libs/three.min-r134.js"></script>
+    <script type="text/javascript" src="../../libs/three.min.js"></script>
 
 	<!-- engine start -->
 	<script type="text/javascript" src="../source/core/core.js"></script>
diff --git a/sandbox/embed_selfhost_externallibs.html b/sandbox/embed_selfhost_externallibs.html
index 2c2a03a..c615b63 100644
--- a/sandbox/embed_selfhost_externallibs.html
+++ b/sandbox/embed_selfhost_externallibs.html
@@ -7,7 +7,7 @@
 
 	<title>Online 3D Viewer</title>
 
-    <script type="text/javascript" src="../../libs/three.min-r134.js"></script>
+    <script type="text/javascript" src="../../libs/three.min.js"></script>
 
 	<!-- engine start -->
 	<script type="text/javascript" src="../source/core/core.js"></script>
diff --git a/sandbox/embed_selfhost_fullscreen.html b/sandbox/embed_selfhost_fullscreen.html
index 566005d..f70cce1 100644
--- a/sandbox/embed_selfhost_fullscreen.html
+++ b/sandbox/embed_selfhost_fullscreen.html
@@ -7,7 +7,7 @@
 
     <title>Online 3D Viewer</title>
 
-    <script type="text/javascript" src="../../libs/three.min-r134.js"></script>
+    <script type="text/javascript" src="../../libs/three.min.js"></script>
 	<!-- engine start -->
 	<script type="text/javascript" src="../source/core/core.js"></script>
 	<script type="text/javascript" src="../source/core/taskrunner.js"></script>
diff --git a/sandbox/embed_selfhost_manual.html b/sandbox/embed_selfhost_manual.html
index 36027a1..40ac3ad 100644
--- a/sandbox/embed_selfhost_manual.html
+++ b/sandbox/embed_selfhost_manual.html
@@ -7,7 +7,7 @@
 
 	<title>Online 3D Viewer</title>
 
-    <script type="text/javascript" src="../../libs/three.min-r134.js"></script>
+    <script type="text/javascript" src="../../libs/three.min.js"></script>
 
 	<!-- engine start -->
 	<script type="text/javascript" src="../source/core/core.js"></script>
diff --git a/sandbox/embed_selfhost_multiple.html b/sandbox/embed_selfhost_multiple.html
index 046fc58..17533d9 100644
--- a/sandbox/embed_selfhost_multiple.html
+++ b/sandbox/embed_selfhost_multiple.html
@@ -7,7 +7,7 @@
 
 	<title>Online 3D Viewer</title>
 
-    <script type="text/javascript" src="../../libs/three.min-r134.js"></script>
+    <script type="text/javascript" src="../../libs/three.min.js"></script>
 
 	<!-- engine start -->
 	<script type="text/javascript" src="../source/core/core.js"></script>
diff --git a/sandbox/embed_selfhost_single.html b/sandbox/embed_selfhost_single.html
index 84f2aa1..ae7d0e6 100644
--- a/sandbox/embed_selfhost_single.html
+++ b/sandbox/embed_selfhost_single.html
@@ -7,7 +7,7 @@
 
     <title>Online 3D Viewer</title>
 
-    <script type="text/javascript" src="../../libs/three.min-r134.js"></script>
+    <script type="text/javascript" src="../../libs/three.min.js"></script>
 	<!-- engine start -->
 	<script type="text/javascript" src="../source/core/core.js"></script>
 	<script type="text/javascript" src="../source/core/taskrunner.js"></script>
diff --git a/sandbox/embed_selfhost_single_scroll.html b/sandbox/embed_selfhost_single_scroll.html
index 14318ae..4bf3491 100644
--- a/sandbox/embed_selfhost_single_scroll.html
+++ b/sandbox/embed_selfhost_single_scroll.html
@@ -7,7 +7,7 @@
 
     <title>Online 3D Viewer</title>
 
-    <script type="text/javascript" src="../../libs/three.min-r134.js"></script>
+    <script type="text/javascript" src="../../libs/three.min.js"></script>
 	<!-- engine start -->
 	<script type="text/javascript" src="../source/core/core.js"></script>
 	<script type="text/javascript" src="../source/core/taskrunner.js"></script>
diff --git a/sandbox/invalid_driver_detector.html b/sandbox/invalid_driver_detector.html
index 7270cc5..c9794eb 100644
--- a/sandbox/invalid_driver_detector.html
+++ b/sandbox/invalid_driver_detector.html
@@ -7,7 +7,7 @@
 
 	<title>Online 3D Viewer</title>
 
-	<script type="text/javascript" src="../../libs/three.min-r134.js"></script>
+	<script type="text/javascript" src="../../libs/three.min.js"></script>
 	<script type='text/javascript'>
 		function HasHighpDriverIssue ()
 		{
diff --git a/sandbox/three_minimal.html b/sandbox/three_minimal.html
index 7e69ddb..d6f5e3f 100644
--- a/sandbox/three_minimal.html
+++ b/sandbox/three_minimal.html
@@ -7,7 +7,7 @@
 
 	<title>Online 3D Viewer</title>
 
-	<script type="text/javascript" src="../../libs/three.min-r134.js"></script>
+	<script type="text/javascript" src="../../libs/three.min.js"></script>
 	<script type='text/javascript'>
 		function Sandbox3D ()
 		{
diff --git a/tools/build.py b/tools/build.py
index 6df8cd5..570a501 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -63,14 +63,14 @@ def CreateDestinationDir (config, rootDir, websiteDir, version, testBuild):
 	shutil.copytree (os.path.join (rootDir, 'website', 'o3dv', 'css', 'Quicksand'), os.path.join (websiteDir, 'o3dv', 'Quicksand'))
 	shutil.copytree (os.path.join (rootDir, 'website', 'o3dv', 'css', 'O3DVIcons'), os.path.join (websiteDir, 'o3dv', 'O3DVIcons'))
 	shutil.copytree (os.path.join (rootDir, 'website', 'info'), os.path.join (websiteDir, 'info'))
-	
+
 	libFiles = config['lib_files']
 	importerFiles = ['o3dv/o3dv.min.js']
 	websiteFiles = [
 		'o3dv/o3dv.website.min.css',
 		'o3dv/o3dv.website.min.js'
 	]
-	
+
 	htmlFileNames = [
 		'index.html',
 		'embed.html',
@@ -112,9 +112,9 @@ def CreatePackage (rootDir, websiteDir, packageDir, version):
 		zip.write (os.path.join (websiteDir, 'libs', 'loaders', lib), 'libs/loaders/' + lib)
 	for lib in os.listdir (os.path.join (websiteDir, 'libs', 'three_loaders')):
 		zip.write (os.path.join (websiteDir, 'libs', 'three_loaders', lib), 'libs/three_loaders/' + lib)
-	zip.write (os.path.join (websiteDir, 'libs', 'three.min-r134.js'), 'three.min-r134.js')
+	zip.write (os.path.join (websiteDir, 'libs', 'three.min.js'), 'three.min.js')
 	zip.write (os.path.join (websiteDir, 'libs', 'three.license.md'), 'three.license.md')
-	zip.write (os.path.join (websiteDir, 'o3dv', 'o3dv.min.js'), 'o3dv.min-' + version + '.js')
+	zip.write (os.path.join (websiteDir, 'o3dv', 'o3dv.min.js'), 'o3dv.min.js')
 	zip.write (os.path.join (rootDir, 'LICENSE.md'), 'o3dv.license.md')
 	zip.close ()
 	return True
@@ -123,7 +123,7 @@ def Main (argv):
 	toolsDir = os.path.dirname (os.path.abspath (__file__))
 	rootDir = os.path.dirname (toolsDir)
 	os.chdir (rootDir)
-	
+
 	testBuild = False
 	buildDir = os.path.join (rootDir, 'build', 'final')
 	if len (argv) >= 2 and argv[1] == 'test':
@@ -145,7 +145,7 @@ def Main (argv):
 	if not esLintResult:
 		PrintError ('ESLint importer sources failed.')
 		return 1
-	
+
 	PrintInfo ('ESLint website sources.')
 	esLintResult = ESLintFolder (os.path.join (rootDir, 'website', 'o3dv'))
 	if not esLintResult:
@@ -181,5 +181,5 @@ def Main (argv):
 		return 1
 
 	return 0
-	
+
 sys.exit (Main (sys.argv))
diff --git a/tools/config.json b/tools/config.json
index 16c1766..8ab061a 100644
--- a/tools/config.json
+++ b/tools/config.json
@@ -1,9 +1,9 @@
 {
 	"lib_files" : [
-		"libs/jquery-3.5.1.min.js",
-		"libs/pickr.monolith.min-1.8.2.css",
-		"libs/pickr.es5.min-1.8.2.js",
-		"libs/three.min-r134.js"
+		"libs/jquery.min.js",
+		"libs/pickr.monolith.min.css",
+		"libs/pickr.es5.min.js",
+		"libs/three.min.js"
 	],
 	"engine_files" : [
 		"source/core/core.js",
diff --git a/tools/updatelibs.py b/tools/updatelibs.py
index c606654..3185baf 100644
--- a/tools/updatelibs.py
+++ b/tools/updatelibs.py
@@ -9,7 +9,7 @@ import urllib.request
 from lib import tools_lib as Tools
 
 threeJsFilesMap = [
-    [os.path.join ('build', 'three.min.js'), os.path.join ('three.min-$TAG_NAME$.js')],
+    [os.path.join ('build', 'three.min.js'), os.path.join ('three.min.js')],
     [os.path.join ('examples', 'js', 'libs', 'chevrotain.min.js'), os.path.join ('three_loaders', 'chevrotain.min.js')],
     [os.path.join ('examples', 'js', 'loaders', '3MFLoader.js'), os.path.join ('three_loaders', '3MFLoader.js')],
     [os.path.join ('examples', 'js', 'loaders', 'ColladaLoader.js'), os.path.join ('three_loaders', 'ColladaLoader.js')],
@@ -23,57 +23,22 @@ def PrintInfo (message):
 def PrintError (message):
     print ('ERROR: ' + message)
 
-def DownloadFile (url, resultPath):
-    PrintInfo ('Downloading ' + url)
-    urllib.request.urlretrieve (url, resultPath)
-
-def UnzipFile (zipPath, resultFolder):
-	PrintInfo ('Unzipping ' + zipPath)
-	with zipfile.ZipFile (zipPath, 'r') as zipFile:
-		zipFile.extractall (resultFolder)
-
-def UpdateThreeJs (rootDir, tempDir):
-    libsDir = os.path.join (rootDir, 'libs')
-    for fileName in os.listdir (libsDir):
-        if (fileName.startswith ('three.min-')):
-            os.remove (os.path.join (libsDir, fileName))
-
-    response = urllib.request.urlopen ('https://api.github.com/repos/mrdoob/three.js/releases/latest')
-    responseJson = json.loads (response.read ())
-
-    threeJsTagName = responseJson['tag_name']
-
-    threeJsFileName = 'three.js-' + threeJsTagName
-    threeJsZipPath = os.path.join (tempDir, threeJsFileName + '.zip')
-    threeJsExtractedFolderPath = os.path.join (tempDir, threeJsFileName)
-
-    DownloadFile ('https://github.com/mrdoob/three.js/archive/refs/tags/' + threeJsTagName + '.zip', threeJsZipPath)
-    UnzipFile (threeJsZipPath, threeJsExtractedFolderPath)
-
+def UpdateThreeJs (moduleDir, libsDir):
     for threeJsFile in threeJsFilesMap:
-        src = os.path.join (tempDir, threeJsFileName, threeJsFileName, threeJsFile[0])
-        dst = os.path.join (libsDir, threeJsFile[1].replace ('$TAG_NAME$', threeJsTagName))
+        src = os.path.join (moduleDir, threeJsFile[0])
+        dst = os.path.join (libsDir, threeJsFile[1])
         PrintInfo ('Copying file ' + os.path.split (src)[1])
         shutil.copy2 (src, dst)
 
-    PrintInfo ('Replacing file name')
-    configFilePath = os.path.join (rootDir, 'tools', 'config.json')
-    Tools.ReplaceRegexInFile (configFilePath, 'three.min-r?[0-9]+.js', 'three.min-' + threeJsTagName + '.js')
-    buildScriptPath = os.path.join (rootDir, 'tools', 'build.py')
-    Tools.ReplaceRegexInFile (buildScriptPath, 'three.min-r?[0-9]+.js', 'three.min-' + threeJsTagName + '.js')
-
 def Main (argv):
     toolsDir = os.path.dirname (os.path.abspath (__file__))
     rootDir = os.path.dirname (toolsDir)
     os.chdir (rootDir)
 
-    tempDir = os.path.join (rootDir, 'build', 'temp')
-    if os.path.exists (tempDir):
-        shutil.rmtree (tempDir)
-    os.makedirs (tempDir)
+    libsDir = os.path.join (rootDir, 'libs')
 
-    UpdateThreeJs (rootDir, tempDir)
-    shutil.rmtree (tempDir)
+    threeJsModuleDir = os.path.join (rootDir, 'node_modules', 'three')
+    UpdateThreeJs (threeJsModuleDir, libsDir)
 
     return 0
 
diff --git a/website/embed.html b/website/embed.html
index 50881a1..311d550 100644
--- a/website/embed.html
+++ b/website/embed.html
@@ -5,19 +5,19 @@
 	<meta http-equiv="content-type" content="text/html;charset=utf-8">
 	<meta name="viewport" content="width=device-width, user-scalable=no">
 	<link rel="icon" type="image/png" href="assets/images/3dviewer_net_favicon.ico">
-	
+
 	<title>Online 3D Viewer Embedded</title>
 
 	<!-- meta start -->
 	<!-- meta end -->
 
 	<!-- libs start -->
-	<script type="text/javascript" src="../libs/jquery-3.5.1.min.js"></script>
-	<link rel="stylesheet" type="text/css" href="../libs/pickr.monolith.min-1.8.2.css">
-	<script type="text/javascript" src="../libs/pickr.es5.min-1.8.2.js"></script>
-	<script type="text/javascript" src="../libs/three.min-r134.js"></script>
+	<script type="text/javascript" src="../libs/jquery.min.js"></script>
+	<link rel="stylesheet" type="text/css" href="../libs/pickr.monolith.min.css">
+	<script type="text/javascript" src="../libs/pickr.es5.min.js"></script>
+	<script type="text/javascript" src="../libs/three.min.js"></script>
 	<!-- libs end -->
-	
+
 	<!-- engine start -->
 	<script type="text/javascript" src="../source/core/core.js"></script>
 	<script type="text/javascript" src="../source/core/taskrunner.js"></script>
@@ -81,7 +81,7 @@
 	<script type="text/javascript" src="../source/viewer/viewer.js"></script>
 	<script type="text/javascript" src="../source/viewer/domviewer.js"></script>
 	<!-- engine end -->
-	
+
 	<!-- website start -->
 	<link rel="stylesheet" type="text/css" href="o3dv/css/icons.css">
 	<link rel="stylesheet" type="text/css" href="o3dv/css/themes.css">
diff --git a/website/index.html b/website/index.html
index e713d53..533640f 100644
--- a/website/index.html
+++ b/website/index.html
@@ -9,10 +9,10 @@
 	<title>Online 3D Viewer</title>
 
 	<!-- libs start -->
-	<script type="text/javascript" src="../libs/jquery-3.5.1.min.js"></script>
-	<link rel="stylesheet" type="text/css" href="../libs/pickr.monolith.min-1.8.2.css">
-	<script type="text/javascript" src="../libs/pickr.es5.min-1.8.2.js"></script>
-	<script type="text/javascript" src="../libs/three.min-r134.js"></script>
+	<script type="text/javascript" src="../libs/jquery.min.js"></script>
+	<link rel="stylesheet" type="text/css" href="../libs/pickr.monolith.min.css">
+	<script type="text/javascript" src="../libs/pickr.es5.min.js"></script>
+	<script type="text/javascript" src="../libs/three.min.js"></script>
 	<!-- libs end -->
 
 	<!-- meta start -->