From 63b6ffb281f8d575a0e059f930103fc30b26710a Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Tue, 27 Jan 2015 17:04:40 -0800
Subject: [PATCH] Normalize import paths for Sky modules

This CL simplifies the sky_server to only map the build directory into /gen,
which will make the deploy script simpler. This CL updates all the imports to
use the /gen prefix when referring to generated files.

TBR=eseidel@chromium.org

Review URL: https://codereview.chromium.org/881093003
---
 framework/embedder.sky                        |  2 +-
 framework/inspector/inspector.sky             | 22 +++++++++----------
 framework/inspector/page-agent.sky            |  2 +-
 framework/shell.sky                           |  4 ++--
 framework/sky-box.sky                         |  2 +-
 framework/sky-button.sky                      |  2 +-
 framework/sky-checkbox.sky                    |  2 +-
 framework/sky-input.sky                       |  6 ++---
 framework/sky-radio.sky                       |  2 +-
 framework/sky-scrollable.sky                  |  4 ++--
 framework/xmlhttprequest.sky                  | 10 ++++-----
 tests/framework/templates.sky                 |  6 ++---
 .../xmlhttprequest/empty-responseType.sky     |  4 ++--
 .../framework/xmlhttprequest/responseType.sky |  4 ++--
 .../framework/xmlhttprequest/unicode-post.sky |  4 ++--
 .../xmlhttprequest/xhr-does-not-exist.sky     |  4 ++--
 .../framework/xmlhttprequest/xhr-relative.sky |  4 ++--
 tests/framework/xmlhttprequest/xhr.sky        |  4 ++--
 .../page-agent-get-resource-tree.sky          |  4 ++--
 tests/resources/event-sender.sky              |  8 +++----
 tests/services/buffer.sky                     |  2 +-
 tests/services/codec.sky                      |  2 +-
 tests/services/core.sky                       |  2 +-
 tests/services/event-sender.sky               |  6 ++---
 tests/services/network.sky                    | 12 +++++-----
 tools/skygo/sky_server.go                     |  7 ------
 tools/skygo/sky_server.sha1                   |  2 +-
 27 files changed, 63 insertions(+), 70 deletions(-)

diff --git a/framework/embedder.sky b/framework/embedder.sky
index b3c5f9f1a39..742b7fa2ba5 100644
--- a/framework/embedder.sky
+++ b/framework/embedder.sky
@@ -1,4 +1,4 @@
-<import src="/sky/framework/shell.sky" as="shell" />
+<import src="shell.sky" as="shell" />
 <script>
 function connectToEmbedderService(service, client) {
     var handle = internals.connectToEmbedderService(service.name);
diff --git a/framework/inspector/inspector.sky b/framework/inspector/inspector.sky
index 32ff5b13596..18322bc5945 100644
--- a/framework/inspector/inspector.sky
+++ b/framework/inspector/inspector.sky
@@ -1,16 +1,16 @@
-<import src="/mojo/public/sky/connection.sky" as="connection" />
-<import src="/mojo/public/sky/core.sky" as="core" />
-<import src="/mojo/public/sky/support.sky" as="support" />
-<import src="/mojo/public/interfaces/application/shell.mojom.sky" as="shellMojom" />
-<import src="/mojo/services/public/sky/shell.sky" as="shell" />
-<import src="/sky/services/inspector/inspector.mojom.sky" as="inspector" />
+<import src="/gen/mojo/public/interfaces/application/shell.mojom.sky" as="shellMojom" />
+<import src="/gen/mojo/public/sky/connection.sky" as="connection" />
+<import src="/gen/mojo/public/sky/core.sky" as="core" />
+<import src="/gen/mojo/public/sky/support.sky" as="support" />
+<import src="/gen/mojo/services/public/sky/shell.sky" as="shell" />
+<import src="/gen/sky/services/inspector/inspector.mojom.sky" as="inspector" />
 <import src="console-agent.sky" as="ConsoleAgent" />
-<import src="dom-agent.sky" as="DOMAgent" />
-<import src="page-agent.sky" as="PageAgent" />
-<import src="worker-agent.sky" as="WorkerAgent" />
-<import src="runtime-agent.sky" as="RuntimeAgent" />
-<import src="indexeddb-agent.sky" as="IndexedDBAgent" />
 <import src="css-agent.sky" as="CSSAgent" />
+<import src="dom-agent.sky" as="DOMAgent" />
+<import src="indexeddb-agent.sky" as="IndexedDBAgent" />
+<import src="page-agent.sky" as="PageAgent" />
+<import src="runtime-agent.sky" as="RuntimeAgent" />
+<import src="worker-agent.sky" as="WorkerAgent" />
 <script>
 class InspectorBackend extends inspector.InspectorBackend.stubClass {
   constructor(frontend) {
diff --git a/framework/inspector/page-agent.sky b/framework/inspector/page-agent.sky
index a489e4be50e..62598a6b419 100644
--- a/framework/inspector/page-agent.sky
+++ b/framework/inspector/page-agent.sky
@@ -1,4 +1,4 @@
-<import src="/sky/framework/xmlhttprequest.sky" as="XMLHttpRequest" />
+<import src="../xmlhttprequest.sky" as="XMLHttpRequest" />
 <script>
 class Page {
   constructor(delegate) {
diff --git a/framework/shell.sky b/framework/shell.sky
index ca554c829e7..b23b470d4fe 100644
--- a/framework/shell.sky
+++ b/framework/shell.sky
@@ -1,5 +1,5 @@
-<import src="/mojo/public/sky/core.sky" as="core" />
-<import src="/mojo/public/sky/connection.sky" as="connection" />
+<import src="/gen/mojo/public/sky/core.sky" as="core" />
+<import src="/gen/mojo/public/sky/connection.sky" as="connection" />
 <script>
 function wrapHandle(handle, service, client) {
   return connection.bindProxyHandle(handle, service.client, service);
diff --git a/framework/sky-box.sky b/framework/sky-box.sky
index 458ad40679d..24c443d4322 100644
--- a/framework/sky-box.sky
+++ b/framework/sky-box.sky
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-element/sky-element.sky" as="SkyElement" />
+<import src="sky-element/sky-element.sky" as="SkyElement" />
 
 <sky-element name="sky-box" attributes="title:string">
 <template>
diff --git a/framework/sky-button.sky b/framework/sky-button.sky
index 34f255a026b..6fa66a477aa 100644
--- a/framework/sky-button.sky
+++ b/framework/sky-button.sky
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-element/sky-element.sky" as="SkyElement" />
+<import src="sky-element/sky-element.sky" as="SkyElement" />
 
 <sky-element
     name="sky-button"
diff --git a/framework/sky-checkbox.sky b/framework/sky-checkbox.sky
index a2bd8fbe4a2..009b69c326b 100644
--- a/framework/sky-checkbox.sky
+++ b/framework/sky-checkbox.sky
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-button.sky" as="SkyButton" />
+<import src="sky-button.sky" as="SkyButton" />
 
 <sky-element
     name="sky-checkbox"
diff --git a/framework/sky-input.sky b/framework/sky-input.sky
index 5f1130bd047..87f593c1300 100644
--- a/framework/sky-input.sky
+++ b/framework/sky-input.sky
@@ -3,9 +3,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/shell.sky" as="shell" />
-<import src="/sky/framework/sky-element/sky-element.sky" as="SkyElement" />
-<import src="/mojo/services/keyboard/public/interfaces/keyboard.mojom.sky" as="keyboard" />
+<import src="/gen/mojo/services/keyboard/public/interfaces/keyboard.mojom.sky" as="keyboard" />
+<import src="shell.sky" as="shell" />
+<import src="sky-element/sky-element.sky" as="SkyElement" />
 
 <sky-element name="sky-input" attributes="value:string">
 <template>
diff --git a/framework/sky-radio.sky b/framework/sky-radio.sky
index a400261394d..e739e791b7a 100644
--- a/framework/sky-radio.sky
+++ b/framework/sky-radio.sky
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-button.sky" as="SkyButton" />
+<import src="sky-button.sky" as="SkyButton" />
 
 <sky-element
     name="sky-radio"
diff --git a/framework/sky-scrollable.sky b/framework/sky-scrollable.sky
index 972ea2acb04..9e369196a98 100644
--- a/framework/sky-scrollable.sky
+++ b/framework/sky-scrollable.sky
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 -->
-<import src="/sky/framework/sky-element/sky-element.sky" as="SkyElement" />
-<import src="/sky/framework/fling-curve.sky" as="FlingCurve" />
+<import src="sky-element/sky-element.sky" as="SkyElement" />
+<import src="fling-curve.sky" as="FlingCurve" />
 
 <sky-element
   name="sky-scrollable"
diff --git a/framework/xmlhttprequest.sky b/framework/xmlhttprequest.sky
index fc9af685479..ef132650cad 100644
--- a/framework/xmlhttprequest.sky
+++ b/framework/xmlhttprequest.sky
@@ -1,8 +1,8 @@
-<import src="/mojo/public/sky/core.sky" as="core" />
-<import src="/mojo/public/sky/unicode.sky" as="unicode" />
-<import src="/mojo/services/network/public/interfaces/network_service.mojom.sky" as="net" />
-<import src="/mojo/services/network/public/interfaces/url_loader.mojom.sky" as="loader" />
-<import src="/sky/framework/shell.sky" as="shell" />
+<import src="/gen/mojo/public/sky/core.sky" as="core" />
+<import src="/gen/mojo/public/sky/unicode.sky" as="unicode" />
+<import src="/gen/mojo/services/network/public/interfaces/network_service.mojom.sky" as="net" />
+<import src="/gen/mojo/services/network/public/interfaces/url_loader.mojom.sky" as="loader" />
+<import src="shell.sky" as="shell" />
 <script>
 // XHR keeps itself alive.
 var outstandingRequests = new Set();
diff --git a/tests/framework/templates.sky b/tests/framework/templates.sky
index 99047f017d8..de8be685fcf 100644
--- a/tests/framework/templates.sky
+++ b/tests/framework/templates.sky
@@ -1,8 +1,8 @@
 <sky>
-<import src="/sky/tests//resources/chai.sky" />
-<import src="/sky/tests/resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
+<import src="../resources/test-element.sky" as="TestElement" />
 <import src="/sky/framework/sky-element/sky-element.sky" as="SkyElement" />
-<import src="/sky/tests/resources/test-element.sky" as="TestElement" />
 
 <div id="sandbox"></div>
 
diff --git a/tests/framework/xmlhttprequest/empty-responseType.sky b/tests/framework/xmlhttprequest/empty-responseType.sky
index f97e2543364..18a62d5dcfc 100644
--- a/tests/framework/xmlhttprequest/empty-responseType.sky
+++ b/tests/framework/xmlhttprequest/empty-responseType.sky
@@ -1,6 +1,6 @@
 <sky>
-<import src="/sky/tests/resources/chai.sky" />
-<import src="/sky/tests/resources/mocha.sky" />
+<import src="../../resources/chai.sky" />
+<import src="../../resources/mocha.sky" />
 <import src="/sky/framework/xmlhttprequest.sky" as="XMLHttpRequest" />
 <script>
 describe("xmlhttprequest.responseType", function() {
diff --git a/tests/framework/xmlhttprequest/responseType.sky b/tests/framework/xmlhttprequest/responseType.sky
index f220009b878..3ec73d16c55 100644
--- a/tests/framework/xmlhttprequest/responseType.sky
+++ b/tests/framework/xmlhttprequest/responseType.sky
@@ -1,6 +1,6 @@
 <sky>
-<import src="/sky/tests/resources/chai.sky" />
-<import src="/sky/tests/resources/mocha.sky" />
+<import src="../../resources/chai.sky" />
+<import src="../../resources/mocha.sky" />
 <import src="/sky/framework/xmlhttprequest.sky" as="XMLHttpRequest" />
 <script>
 describe("xmlhttprequest.responseType", function() {
diff --git a/tests/framework/xmlhttprequest/unicode-post.sky b/tests/framework/xmlhttprequest/unicode-post.sky
index e785741b703..498b94d6b97 100644
--- a/tests/framework/xmlhttprequest/unicode-post.sky
+++ b/tests/framework/xmlhttprequest/unicode-post.sky
@@ -1,6 +1,6 @@
 <html>
-<import src="/sky/tests/resources/chai.sky" />
-<import src="/sky/tests/resources/mocha.sky" />
+<import src="../../resources/chai.sky" />
+<import src="../../resources/mocha.sky" />
 <import src="/sky/framework/xmlhttprequest.sky" as="XMLHttpRequest" />
 <script>
 describe('XMLHttpRequest', function() {
diff --git a/tests/framework/xmlhttprequest/xhr-does-not-exist.sky b/tests/framework/xmlhttprequest/xhr-does-not-exist.sky
index e88c4c9a39f..7da19d0d1e2 100644
--- a/tests/framework/xmlhttprequest/xhr-does-not-exist.sky
+++ b/tests/framework/xmlhttprequest/xhr-does-not-exist.sky
@@ -1,6 +1,6 @@
 <sky>
-<import src="/sky/tests/resources/chai.sky" />
-<import src="/sky/tests/resources/mocha.sky" />
+<import src="../../resources/chai.sky" />
+<import src="../../resources/mocha.sky" />
 <import src="/sky/framework/xmlhttprequest.sky" as="XMLHttpRequest" />
 <script>
 describe("xmlhttprequest", function() {
diff --git a/tests/framework/xmlhttprequest/xhr-relative.sky b/tests/framework/xmlhttprequest/xhr-relative.sky
index 632810fcb2f..88908c71d91 100644
--- a/tests/framework/xmlhttprequest/xhr-relative.sky
+++ b/tests/framework/xmlhttprequest/xhr-relative.sky
@@ -1,6 +1,6 @@
 <html>
-<import src="/sky/tests/resources/chai.sky" />
-<import src="/sky/tests/resources/mocha.sky" />
+<import src="../../resources/chai.sky" />
+<import src="../../resources/mocha.sky" />
 <import src="/sky/framework/xmlhttprequest.sky" as="XMLHttpRequest" />
 <script>
 describe('XMLHttpRequest', function() {
diff --git a/tests/framework/xmlhttprequest/xhr.sky b/tests/framework/xmlhttprequest/xhr.sky
index d7309637763..4b8345e655c 100644
--- a/tests/framework/xmlhttprequest/xhr.sky
+++ b/tests/framework/xmlhttprequest/xhr.sky
@@ -1,6 +1,6 @@
 <html>
-<import src="/sky/tests/resources/chai.sky" />
-<import src="/sky/tests/resources/mocha.sky" />
+<import src="../../resources/chai.sky" />
+<import src="../../resources/mocha.sky" />
 <import src="/sky/framework/xmlhttprequest.sky" as="XMLHttpRequest" />
 <script>
 describe('XMLHttpRequest', function() {
diff --git a/tests/inspector/page-agent-get-resource-tree.sky b/tests/inspector/page-agent-get-resource-tree.sky
index 99646824ed3..48c78f8a75c 100644
--- a/tests/inspector/page-agent-get-resource-tree.sky
+++ b/tests/inspector/page-agent-get-resource-tree.sky
@@ -1,6 +1,6 @@
 <html>
-<import src="/sky/tests/resources/chai.sky" />
-<import src="/sky/tests/resources/mocha.sky" />
+<import src="../resources/chai.sky" />
+<import src="../resources/mocha.sky" />
 <import src="/sky/framework/inspector/page-agent.sky" as="PageAgent" />
 <img src='does_not_exist.jpg' />
 <script>
diff --git a/tests/resources/event-sender.sky b/tests/resources/event-sender.sky
index fee71f7c89f..5a09dd1f980 100644
--- a/tests/resources/event-sender.sky
+++ b/tests/resources/event-sender.sky
@@ -1,8 +1,8 @@
-<import src="/mojo/services/input_events/public/interfaces/input_event_constants.mojom.sky" as="constants" />
-<import src="/mojo/services/input_events/public/interfaces/input_events.mojom.sky" as="events" />
-<import src="/mojo/services/input_events/public/interfaces/input_key_codes.mojom.sky" as="codes" />
+<import src="/gen/mojo/services/input_events/public/interfaces/input_event_constants.mojom.sky" as="constants" />
+<import src="/gen/mojo/services/input_events/public/interfaces/input_events.mojom.sky" as="events" />
+<import src="/gen/mojo/services/input_events/public/interfaces/input_key_codes.mojom.sky" as="codes" />
+<import src="/gen/sky/services/testing/test_harness.mojom.sky" as="harness" />
 <import src="/sky/framework/shell.sky" as="shell" />
-<import src="/sky/services/testing/test_harness.mojom.sky" as="harness" />
 <script>
 var harness = shell.connectToService("mojo:sky_tester", harness.TestHarness);
 
diff --git a/tests/services/buffer.sky b/tests/services/buffer.sky
index 3a9312000a7..9e2f35afe2b 100644
--- a/tests/services/buffer.sky
+++ b/tests/services/buffer.sky
@@ -1,6 +1,6 @@
 <html>
 <import src="../resources/dump-as-text.sky" />
-<import src="/mojo/public/sky/buffer.sky" as="buffer" />
+<import src="/gen/mojo/public/sky/buffer.sky" as="buffer" />
 <div id="result">FAIL</div>
 <script>
 document.getElementById("result").textContent =
diff --git a/tests/services/codec.sky b/tests/services/codec.sky
index e2a3cbcfd9d..e02a0aa3fa5 100644
--- a/tests/services/codec.sky
+++ b/tests/services/codec.sky
@@ -1,6 +1,6 @@
 <html>
 <import src="../resources/dump-as-text.sky" />
-<import src="/mojo/public/sky/codec.sky" as="codec" />
+<import src="/gen/mojo/public/sky/codec.sky" as="codec" />
 <div id="result">FAIL</div>
 <script>
 document.getElementById("result").textContent =
diff --git a/tests/services/core.sky b/tests/services/core.sky
index 58bbe32b26f..d9bf99823a9 100644
--- a/tests/services/core.sky
+++ b/tests/services/core.sky
@@ -1,6 +1,6 @@
 <html>
 <import src="../resources/dump-as-text.sky" />
-<import src="/mojo/public/sky/core.sky" as="core" />
+<import src="/gen/mojo/public/sky/core.sky" as="core" />
 <div id="result">FAIL</div>
 <script>
 document.getElementById("result").textContent =
diff --git a/tests/services/event-sender.sky b/tests/services/event-sender.sky
index 27965c98147..d7852e1a61f 100644
--- a/tests/services/event-sender.sky
+++ b/tests/services/event-sender.sky
@@ -1,10 +1,10 @@
 <sky>
 <import src="../resources/chai.sky" />
 <import src="../resources/mocha.sky" />
-<import src="/mojo/services/input_events/public/interfaces/input_event_constants.mojom.sky" as="constants" />
-<import src="/mojo/services/input_events/public/interfaces/input_events.mojom.sky" as="events" />
+<import src="/gen/mojo/services/input_events/public/interfaces/input_event_constants.mojom.sky" as="constants" />
+<import src="/gen/mojo/services/input_events/public/interfaces/input_events.mojom.sky" as="events" />
+<import src="/gen/sky/services/testing/test_harness.mojom.sky" as="harness" />
 <import src="/sky/framework/shell.sky" as="shell" />
-<import src="/sky/services/testing/test_harness.mojom.sky" as="harness" />
 
 <script>
 describe('Sky event sender', function() {
diff --git a/tests/services/network.sky b/tests/services/network.sky
index 6514af1b7cc..5b0d407c85e 100644
--- a/tests/services/network.sky
+++ b/tests/services/network.sky
@@ -1,12 +1,12 @@
 <html>
 <import src="../resources/chai.sky" />
 <import src="../resources/mocha.sky" />
-<import src="/mojo/public/sky/core.sky" as="core" />
-<import src="/mojo/public/sky/connection.sky" as="connection" />
-<import src="/mojo/services/network/public/interfaces/network_service.mojom.sky" as="net" />
-<import src="/mojo/services/network/public/interfaces/url_loader.mojom.sky" as="loader" />
-<import src="/mojo/services/public/sky/shell.sky" as="shell" />
-<import src="/mojo/public/interfaces/application/shell.mojom.sky" as="shellMojom" />
+<import src="/gen/mojo/public/interfaces/application/shell.mojom.sky" as="shellMojom" />
+<import src="/gen/mojo/public/sky/connection.sky" as="connection" />
+<import src="/gen/mojo/public/sky/core.sky" as="core" />
+<import src="/gen/mojo/services/network/public/interfaces/network_service.mojom.sky" as="net" />
+<import src="/gen/mojo/services/network/public/interfaces/url_loader.mojom.sky" as="loader" />
+<import src="/gen/mojo/services/public/sky/shell.sky" as="shell" />
 <script>
 const Shell = shell.Shell;
 
diff --git a/tools/skygo/sky_server.go b/tools/skygo/sky_server.go
index e42581f3d62..a1999b94858 100644
--- a/tools/skygo/sky_server.go
+++ b/tools/skygo/sky_server.go
@@ -78,12 +78,5 @@ func main() {
 
     addMapping("/gen/", genRoot)
 
-    // FIXME: Unclear if these are correct now that we have /gen.
-    // /gen is more explicit, but also is less like how a 3rd party might
-    // deploy a sky app.
-    addMapping("/mojo/public/", path.Join(genRoot, "mojo", "public"))
-    addMapping("/mojo/services/", path.Join(genRoot, "mojo", "services"))
-    addMapping("/sky/services/", path.Join(genRoot, "sky", "services"))
-
     http.ListenAndServe(":" + port, nil)
 }
diff --git a/tools/skygo/sky_server.sha1 b/tools/skygo/sky_server.sha1
index dcc96f45f1d..eb7216e31b4 100644
--- a/tools/skygo/sky_server.sha1
+++ b/tools/skygo/sky_server.sha1
@@ -1 +1 @@
-7d2cceb778d3bfd4a710915de8721d10cc89b155
\ No newline at end of file
+00d7f2d6508392278439de82914b9299a85632c1
\ No newline at end of file