feat(loader): Improved loader to manage specific versions

Added name/version stamping to each package Add version stamping into DDL Signed-off-by: Gordon Smith <gordonjsmith@gmail.com>
hpcc-systems · Mar 20, 2019 · cfcdfac · cfcdfac
1 parent 2020057
commit cfcdfac
Show file tree

Hide file tree

Showing 91 changed files with 459 additions and 210 deletions.
diff --git a/demos/dashy/index.html b/demos/dashy/index.html
@@ -4,23 +4,25 @@
 <head>
     <meta charset="utf-8">
     <title>Dashy</title>
+    <link href="style/index.css" rel="stylesheet">
 
     <script>
         var mode = "dev";  // "dev" | "rollup" | "webpack" |  "unpkg"
         switch (window.location.protocol) {
             case "file:":
                 document.write('<link rel="stylesheet" href="../../packages/common/font-awesome/css/font-awesome.min.css">');
                 switch(mode) {
+                    case "dev":
+                        document.write('<script type="text/javascript" src="../../packages/loader/dist/index.js" charset=\"utf-8\"><' + '/script>');
+                        break;
                     case "rollup":
                         document.write('<script type="text/javascript" src="dist/rollupLib.js" charset=\"utf-8\"><' + '/script>');
                         break;
                     case "webpack":
                         document.write('<script type="text/javascript" src="dist/webpackLib.js" charset=\"utf-8\"><' + '/script>');
                         break;
-                    case "dev":
-                    default:
-                        mode = "dev"; 
-                        document.write('<script type="text/javascript" src="../../packages/loader/dist/index.js" charset=\"utf-8\"><' + '/script>');
+                    case "unpkg":
+                        document.write('<script type="text/javascript" src="https://unpkg.com/@hpcc-js/loader" charset=\"utf-8\"><' + '/script>');
                         break;
                 }
                 break;
@@ -34,30 +36,19 @@
     <script>
         var hpccLoader = window["@hpcc-js/loader"];
         var vizLib = window["vizLib"];
-        var require;
-        if (hpccLoader) {
-            if (mode === "dev") {
-                var require = hpccLoader.dev();
-            } else {
-                if (mode === "unpkg") {
-                    var require = hpccLoader.unpkg(true);
-                } else {
-                    var require = hpccLoader.cdn("../../packages", false);
-                }
-            }
-        }
     </script>
-    <link href="style/index.css" rel="stylesheet">
 </head>
 
 <body>
     <div id="placeholder">
     </div>
     <script>
         if (hpccLoader) {
-            require(["lib-umd/index"], function (indexMod) {
-                indexMod.loadDashy("placeholder");
-                // indexMod.loadDashboard("placeholder");
+            hpccLoader.amd().then(function(require) {
+                require(["lib-umd/index"], function (indexMod) {
+                    indexMod.loadDashy("placeholder");
+                    // indexMod.loadDashboard("placeholder");
+                });
             });
         } else if (vizLib) {
             vizLib.loadDashy("placeholder");