feat: load webcg scripts from libs subdirectory

indr · Aug 7, 2018 · f671a85 · f671a85
1 parent f2ebe6a
commit f671a85
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 9 deletions.
diff --git a/adobe-animate/Adobe-Animate-Publish-Template.html b/adobe-animate/Adobe-Animate-Publish-Template.html
@@ -13,7 +13,7 @@
 <meta name="authoring-tool" content="$VERSION">
 <title>$TITLE</title>
 <!-- write your code here -->
-<script src="webcg-adobe-animate-adapter.umd.js"></script>
+<script src="libs/webcg-adobe-animate-adapter.umd.js"></script>
 $CENTER_STYLE
 $CREATEJS_LIBRARY_SCRIPTS
 $ANIMATE_CC_SCRIPTS

diff --git a/dist/Adobe-Animate-Publish-Template.html b/dist/Adobe-Animate-Publish-Template.html
@@ -13,7 +13,7 @@
 <meta name="authoring-tool" content="$VERSION">
 <title>$TITLE</title>
 <!-- write your code here -->
-<script src="webcg-adobe-animate-adapter.umd.js"></script>
+<script src="libs/webcg-adobe-animate-adapter.umd.js"></script>
 $CENTER_STYLE
 $CREATEJS_LIBRARY_SCRIPTS
 $ANIMATE_CC_SCRIPTS

diff --git a/dist/webcg-adobe-animate-adapter-1.1.0.zip b/dist/webcg-adobe-animate-adapter-1.1.0.zip
diff --git a/dist/webcg-adobe-animate-adapter.umd.js b/dist/webcg-adobe-animate-adapter.umd.js
@@ -14,7 +14,7 @@
 	(function (global, factory) {
 	  factory();
 	}(commonjsGlobal, (function () {
-	  var version = "1.1.0";
+	  var version = "1.2.1";
 
 	  var Parser = (function () {
 	    function Parser () {}
@@ -133,13 +133,21 @@
 	    window.webcg = new WebCG(window);
 	  };
 
+	  var getCurrentScriptPathWithTrailingSlash = function (document) {
+	    if (!document || typeof document !== 'object') { return '' }
+	    if (!document.currentScript) { return '' }
+	    if (!document.currentScript.src || typeof document.currentScript.src !== 'string') { return '' }
+	    var src = document.currentScript.src;
+	    return src.substring(0, src.lastIndexOf('/') + 1)
+	  };
+
 	  var initDevTools = function (window) {
 	    var debug = (window.location.search.match(/[?&]debug=([^&$]+)/) || [])[1] === 'true';
 	    if (!debug) { return }
 
 	    var document = window.document;
 	    var script = document.createElement('script');
-	    script.src = 'webcg-devtools.umd.js';
+	    script.src = getCurrentScriptPathWithTrailingSlash(document) + 'webcg-devtools.umd.js';
 	    console.log('[webcg-framework] injecting ' + script.src);
 	    document.head.append(script);
 	  };

diff --git a/docs/example-lower-third.fla b/docs/example-lower-third.fla
diff --git a/docs/example-lower-third.html b/docs/example-lower-third.html
@@ -13,7 +13,7 @@
 <meta name="authoring-tool" content="Adobe_Animate_CC">
 <title>example-lower-third</title>
 <!-- write your code here -->
-<script src="webcg-adobe-animate-adapter.umd.js"></script>
+<script src="libs/webcg-adobe-animate-adapter.umd.js"></script>
 <script src="libs/createjs-2015.11.26.min.js"></script>
 <script src="example-lower-third.js"></script>
 <script>

diff --git a/docs/webcg-adobe-animate-adapter.umd.js → docs/libs/webcg-adobe-animate-adapter.umd.js b/docs/webcg-adobe-animate-adapter.umd.js → docs/libs/webcg-adobe-animate-adapter.umd.js
@@ -14,7 +14,7 @@
 	(function (global, factory) {
 	  factory();
 	}(commonjsGlobal, (function () {
-	  var version = "1.1.0";
+	  var version = "1.2.1";
 
 	  var Parser = (function () {
 	    function Parser () {}
@@ -133,13 +133,21 @@
 	    window.webcg = new WebCG(window);
 	  };
 
+	  var getCurrentScriptPathWithTrailingSlash = function (document) {
+	    if (!document || typeof document !== 'object') { return '' }
+	    if (!document.currentScript) { return '' }
+	    if (!document.currentScript.src || typeof document.currentScript.src !== 'string') { return '' }
+	    var src = document.currentScript.src;
+	    return src.substring(0, src.lastIndexOf('/') + 1)
+	  };
+
 	  var initDevTools = function (window) {
 	    var debug = (window.location.search.match(/[?&]debug=([^&$]+)/) || [])[1] === 'true';
 	    if (!debug) { return }
 
 	    var document = window.document;
 	    var script = document.createElement('script');
-	    script.src = 'webcg-devtools.umd.js';
+	    script.src = getCurrentScriptPathWithTrailingSlash(document) + 'webcg-devtools.umd.js';
 	    console.log('[webcg-framework] injecting ' + script.src);
 	    document.head.append(script);
 	  };

diff --git a/docs/webcg-devtools.umd.js → docs/libs/webcg-devtools.umd.js b/docs/webcg-devtools.umd.js → docs/libs/webcg-devtools.umd.js
diff --git a/scripts/postbuild.sh b/scripts/postbuild.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-cp dist/*.umd.js docs/
+cp dist/*.umd.js docs/libs/
 cd dist
 zip webcg-adobe-animate-adapter-$npm_package_version.zip *
 cd ..
diff --git a/server.js b/server.js
@@ -2,7 +2,6 @@ const express = require('express')
 const path = require('path')
 
 const app = express()
-app.use(express.static(path.join(__dirname, 'dist')))
 app.use(express.static(path.join(__dirname, 'docs')))
 
 const port = process.env.PORT || 8080