From 8a7a783ff212f53cf5d6c1ea84340b6689525c02 Mon Sep 17 00:00:00 2001 From: Ian Riley Date: Fri, 14 Aug 2015 15:06:16 -0700 Subject: [PATCH] chore(build): Modifies replace scripts to reflect new changes in systemjs. --- modules/examples/src/message_broker/loader.js | 7 +++++-- .../examples/src/web_workers/images/loader.js | 7 ++++++- .../src/web_workers/kitchen_sink/loader.js | 7 ++++++- .../examples/src/web_workers/todo/loader.js | 7 ++++++- tools/broccoli/html-replace/SCRIPTS.html | 17 +++++++++++++---- .../html-replace/SCRIPTS_benchmarks.html | 17 +++++++++++++---- .../SCRIPTS_benchmarks_external.html | 17 +++++++++++++---- tools/broccoli/js-replace/.SCRIPTS.js.swp | Bin 12288 -> 0 bytes tools/broccoli/js-replace/SCRIPTS.js | 3 +-- tools/build/snippets/runtime_paths.js | 7 ------- 10 files changed, 63 insertions(+), 26 deletions(-) delete mode 100644 tools/broccoli/js-replace/.SCRIPTS.js.swp delete mode 100644 tools/build/snippets/runtime_paths.js diff --git a/modules/examples/src/message_broker/loader.js b/modules/examples/src/message_broker/loader.js index aa449f2b4e..f8f15ec8d7 100644 --- a/modules/examples/src/message_broker/loader.js +++ b/modules/examples/src/message_broker/loader.js @@ -1,4 +1,5 @@ $SCRIPTS$ + //importScripts("math_worker.js").execute(); //System.import("examples/src/web_workers/math_worker").then(function(m){console.log("got", m)}); //importScripts("rx.js"); @@ -13,10 +14,12 @@ window = { RegExp: RegExp, Promise: Promise, Date: Date -} -assert = function(){} +}; +assert = function(){}; +System.config({baseURL: '/', defaultJSExtensions: true}); + System.import("examples/src/message_broker/background_index").then(function(m){ console.log("running main"); try{ diff --git a/modules/examples/src/web_workers/images/loader.js b/modules/examples/src/web_workers/images/loader.js index 444cec555a..17ac00fb41 100644 --- a/modules/examples/src/web_workers/images/loader.js +++ b/modules/examples/src/web_workers/images/loader.js @@ -1,4 +1,6 @@ -$SCRIPTS$ window = { +$SCRIPTS$ + +window = { setTimeout: setTimeout, Map: Map, Set: Set, @@ -12,6 +14,9 @@ $SCRIPTS$ window = { assert = function() {}; importScripts("b64.js"); + +System.config({baseURL: '/', defaultJSExtensions: true}); + System.import("examples/src/web_workers/images/background_index") .then( function(m) { diff --git a/modules/examples/src/web_workers/kitchen_sink/loader.js b/modules/examples/src/web_workers/kitchen_sink/loader.js index 09eabf9538..245bcf66ac 100644 --- a/modules/examples/src/web_workers/kitchen_sink/loader.js +++ b/modules/examples/src/web_workers/kitchen_sink/loader.js @@ -1,4 +1,6 @@ -$SCRIPTS$ window = { +$SCRIPTS$ + +window = { setTimeout: setTimeout, Map: Map, Set: Set, @@ -11,6 +13,9 @@ $SCRIPTS$ window = { }; assert = function() {}; + +System.config({baseURL: '/', defaultJSExtensions: true}); + System.import("examples/src/web_workers/kitchen_sink/background_index") .then( function(m) { diff --git a/modules/examples/src/web_workers/todo/loader.js b/modules/examples/src/web_workers/todo/loader.js index 47bc93fe4a..b531e6e63a 100644 --- a/modules/examples/src/web_workers/todo/loader.js +++ b/modules/examples/src/web_workers/todo/loader.js @@ -1,4 +1,6 @@ -$SCRIPTS$ window = { +$SCRIPTS$ + +window = { setTimeout: setTimeout, Map: Map, Set: Set, @@ -11,6 +13,9 @@ $SCRIPTS$ window = { }; assert = function() {}; + +System.config({baseURL: '/', defaultJSExtensions: true}); + System.import("examples/src/web_workers/todo/background_index") .then( function(m) { diff --git a/tools/broccoli/html-replace/SCRIPTS.html b/tools/broccoli/html-replace/SCRIPTS.html index 5f356d8314..816acf781b 100644 --- a/tools/broccoli/html-replace/SCRIPTS.html +++ b/tools/broccoli/html-replace/SCRIPTS.html @@ -3,8 +3,17 @@ - - - - + diff --git a/tools/broccoli/html-replace/SCRIPTS_benchmarks.html b/tools/broccoli/html-replace/SCRIPTS_benchmarks.html index 3e2813b704..321e3063bb 100644 --- a/tools/broccoli/html-replace/SCRIPTS_benchmarks.html +++ b/tools/broccoli/html-replace/SCRIPTS_benchmarks.html @@ -4,8 +4,17 @@ - - - - + diff --git a/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html b/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html index 4005350e4d..d29db40bad 100644 --- a/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html +++ b/tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html @@ -5,8 +5,17 @@ - - - - + diff --git a/tools/broccoli/js-replace/.SCRIPTS.js.swp b/tools/broccoli/js-replace/.SCRIPTS.js.swp deleted file mode 100644 index e31b22634ad9245429dc93b8061f874d90973479..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&yH3L}6b4|Ig$aRRVJz(e2qy(9E@EWrfP`9#*pTbGAt8w)+mQevnAur)0Y;vP zm*5RJ=|!yoRb7jIOGl26k7N1UqPSDLY@C%3y*i_|!r0f#d%NDeVz1jJ7CDv0p?fH% zrnONWPlW7feVZBW87&e|YLj_^)$KT8zi4@powhUPAOL}x1ajBoM@wvfZ?{&|S1TLkwbk}aOHl*?2tWV=5P$##AOHaf z{0{+_mDn>KWnp-n#bICi(GQ2{AOHafKmY;|fB*y_009U<00I!0LjlocthCJ7F-7tJ zfAszTN#hTSH;PA!E=7}~sH;+}Q=mZr0uX=z1Rwwb2tWV=5P$##=3byotzz=jh2y70 zU1!4GSh|&7`8&IH!uk_U)r*yMMd8jMqwbtaZKzW&qy7ti<&6qL>y(*TWbY}Fc-F{? zq_PJ*(cL^&Jl3MC47Vb+oNnDGp;dNV9VVGJt|d*FIlEbLhA!6UhW8JZsKFb*0Ws)- A=>Px# diff --git a/tools/broccoli/js-replace/SCRIPTS.js b/tools/broccoli/js-replace/SCRIPTS.js index 13ccb2b98c..04a75f799c 100644 --- a/tools/broccoli/js-replace/SCRIPTS.js +++ b/tools/broccoli/js-replace/SCRIPTS.js @@ -1,3 +1,2 @@ importScripts("/examples/src/assets/zone-microtask-web-workers.js", "long-stack-trace-zone.js", - "traceur-runtime.js", "es6-module-loader-sans-promises.src.js", "system.src.js", - "extension-register.js", "extension-cjs.js", "Reflect.js", "runtime_paths.js"); + "traceur-runtime.js", "es6-module-loader-sans-promises.src.js", "system.src.js", "Reflect.js"); diff --git a/tools/build/snippets/runtime_paths.js b/tools/build/snippets/runtime_paths.js deleted file mode 100644 index a1ff444772..0000000000 --- a/tools/build/snippets/runtime_paths.js +++ /dev/null @@ -1,7 +0,0 @@ -System.paths = { - '*': '/*.js', - 'rx': 'rx.js' -}; -register(System); -cjs(System); -