summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-03-19 18:11:58 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-03-19 18:11:58 -0400
commitb4b52cf59f8acb0fe8c3f35bb360b6c136240151 (patch)
tree43200a2685779d6726698bc500a9dbbaaf9df805
parent60fd3a9845987713e9f0971e2eabfe847c68ff57 (diff)
disable requirejs fallback urls; make us configure all paths
-rwxr-xr-xpublic-src/index.html.gen2
-rw-r--r--public-src/require.config.js18
2 files changed, 11 insertions, 9 deletions
diff --git a/public-src/index.html.gen b/public-src/index.html.gen
index dfb2e34..2930594 100755
--- a/public-src/index.html.gen
+++ b/public-src/index.html.gen
@@ -20,7 +20,7 @@ echo '<!DOCTYPE html>
<!-- Scripts: Modules (run asynchronously after DOMContentLoaded) -->
<script src="./require.config.js"></script>
- <script src="./3rd-party/yarn/requirejs/require.js" data-main="main"></script>
+ <script src="./3rd-party/yarn/requirejs/require.js" data-main="/main.js"></script>
<!-- CSS -->
<link rel="stylesheet" href="style.css">
diff --git a/public-src/require.config.js b/public-src/require.config.js
index bb48fd7..3e2ff4b 100644
--- a/public-src/require.config.js
+++ b/public-src/require.config.js
@@ -1,5 +1,5 @@
var require = {
- baseUrl: "/",
+ baseUrl: "/bogus",
shim: {
"jarmon": {
deps: [
@@ -27,13 +27,15 @@ var require = {
"cfg/jarmon-proton": { deps: ["jquery", "jarmon"] },
},
paths: {
- //"jquery" : "3rd-party/yarn/jquery/dist/jquery",
- //"flot" : "3rd-party/yarn/flot",
- "requirejs" : "3rd-party/yarn/requirejs/require",
+ //"flot" : "/3rd-party/yarn/flot",
+ //"jquery" : "/3rd-party/yarn/jquery/dist/jquery",
+ "requirejs" : "/3rd-party/yarn/requirejs/require",
- "flot" : "jarmon-dependencies/flot-0.8.3",
- "javascriptrrd" : "jarmon-dependencies/javascriptrrd-1.1.1",
- "jquery" : "jarmon-dependencies/jquery-1.6.3",
- "jquerytools" : "jarmon-dependencies/jquerytools-8ac4636a01d3860f1c4726ba722190a531bf1068",
+ "cfg" : "/cfg",
+ "jarmon" : "/jarmon",
+ "flot" : "/jarmon-dependencies/flot-0.8.3",
+ "javascriptrrd" : "/jarmon-dependencies/javascriptrrd-1.1.1",
+ "jquery" : "/jarmon-dependencies/jquery-1.6.3",
+ "jquerytools" : "/jarmon-dependencies/jquerytools-8ac4636a01d3860f1c4726ba722190a531bf1068",
},
};