Skip to content

Commit 8a7a783

Browse files
ttowncompiledttowncompiled
committed
chore(build): Modifies replace scripts to reflect new changes in systemjs.
1 parent e68c978 commit 8a7a783

File tree

10 files changed

+63
-26
lines changed

10 files changed

+63
-26
lines changed

‎modules/examples/src/message_broker/loader.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
$SCRIPTS$
2+
23
//importScripts("math_worker.js").execute();
34
//System.import("examples/src/web_workers/math_worker").then(function(m){console.log("got", m)});
45
//importScripts("rx.js");
@@ -13,9 +14,11 @@ window = {
1314
RegExp: RegExp,
1415
Promise: Promise,
1516
Date: Date
16-
}
17-
assert = function(){}
17+
};
18+
assert = function(){};
19+
1820

21+
System.config({baseURL: '/', defaultJSExtensions: true});
1922

2023
System.import("examples/src/message_broker/background_index").then(function(m){
2124
console.log("running main");

‎modules/examples/src/web_workers/images/loader.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
$SCRIPTS$ window = {
1+
$SCRIPTS$
2+
3+
window = {
24
setTimeout: setTimeout,
35
Map: Map,
46
Set: Set,
@@ -12,6 +14,9 @@ $SCRIPTS$ window = {
1214
assert = function() {};
1315
importScripts("b64.js");
1416

17+
18+
System.config({baseURL: '/', defaultJSExtensions: true});
19+
1520
System.import("examples/src/web_workers/images/background_index")
1621
.then(
1722
function(m) {

‎modules/examples/src/web_workers/kitchen_sink/loader.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
$SCRIPTS$ window = {
1+
$SCRIPTS$
2+
3+
window = {
24
setTimeout: setTimeout,
35
Map: Map,
46
Set: Set,
@@ -11,6 +13,9 @@ $SCRIPTS$ window = {
1113
};
1214
assert = function() {};
1315

16+
17+
System.config({baseURL: '/', defaultJSExtensions: true});
18+
1419
System.import("examples/src/web_workers/kitchen_sink/background_index")
1520
.then(
1621
function(m) {

‎modules/examples/src/web_workers/todo/loader.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
$SCRIPTS$ window = {
1+
$SCRIPTS$
2+
3+
window = {
24
setTimeout: setTimeout,
35
Map: Map,
46
Set: Set,
@@ -11,6 +13,9 @@ $SCRIPTS$ window = {
1113
};
1214
assert = function() {};
1315

16+
17+
System.config({baseURL: '/', defaultJSExtensions: true});
18+
1419
System.import("examples/src/web_workers/todo/background_index")
1520
.then(
1621
function(m) {

‎tools/broccoli/html-replace/SCRIPTS.html‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,17 @@
33
<script src="traceur-runtime.js" type="text/javascript"></script>
44
<script src="es6-module-loader-sans-promises.src.js" type="text/javascript"></script>
55
<script src="system.src.js" type="text/javascript"></script>
6-
<script src="extension-register.js" type="text/javascript"></script>
7-
<script src="extension-cjs.js" type="text/javascript"></script>
86
<script src="Reflect.js" type="text/javascript"></script>
9-
<script src="runtime_paths.js" type="text/javascript"></script>
10-
<script type="text/javascript">System.import('@@FILENAME_NO_EXT').then(function(m) { m.main(); }, console.error.bind(console))</script>
7+
<script type="text/javascript">
8+
var filename = '@@FILENAME_NO_EXT';
9+
var parent = filename.split('/');
10+
parent = parent.splice(0, parent.length-1).join('/');
11+
System.config({
12+
baseURL: '/',
13+
defaultJSExtensions: true,
14+
paths: {
15+
'rx': parent + '/rx.js'
16+
}
17+
});
18+
System.import(filename).then(function(m) { m.main(); }, console.error.bind(console));
19+
</script>

‎tools/broccoli/html-replace/SCRIPTS_benchmarks.html‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@
44
<script src="traceur-runtime.js" type="text/javascript"></script>
55
<script src="es6-module-loader-sans-promises.src.js" type="text/javascript"></script>
66
<script src="system.src.js" type="text/javascript"></script>
7-
<script src="extension-register.js" type="text/javascript"></script>
8-
<script src="extension-cjs.js" type="text/javascript"></script>
97
<script src="Reflect.js" type="text/javascript"></script>
10-
<script src="runtime_paths.js" type="text/javascript"></script>
11-
<script type="text/javascript">System.import('@@FILENAME_NO_EXT').then(function(m) { m.main(); }, console.error.bind(console))</script>
8+
<script type="text/javascript">
9+
var filename = '@@FILENAME_NO_EXT';
10+
var parent = filename.split('/');
11+
parent = parent.splice(0, parent.length-1).join('/');
12+
System.config({
13+
baseURL: '/',
14+
defaultJSExtensions: true,
15+
paths: {
16+
'rx': parent + '/rx.js'
17+
}
18+
});
19+
System.import(filename).then(function(m) { m.main(); }, console.error.bind(console));
20+
</script>

‎tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,17 @@
55
<script src="traceur-runtime.js" type="text/javascript"></script>
66
<script src="es6-module-loader-sans-promises.src.js" type="text/javascript"></script>
77
<script src="system.src.js" type="text/javascript"></script>
8-
<script src="extension-register.js" type="text/javascript"></script>
9-
<script src="extension-cjs.js" type="text/javascript"></script>
108
<script src="Reflect.js" type="text/javascript"></script>
11-
<script src="runtime_paths.js" type="text/javascript"></script>
12-
<script type="text/javascript">System.import('@@FILENAME_NO_EXT').then(function(m) { m.main(); }, console.error.bind(console))</script>
9+
<script type="text/javascript">
10+
var filename = '@@FILENAME_NO_EXT';
11+
var parent = filename.split('/');
12+
parent = parent.splice(0, parent.length-1).join('/');
13+
System.config({
14+
baseURL: '/',
15+
defaultJSExtensions: true,
16+
paths: {
17+
'rx': parent + '/rx.js'
18+
}
19+
});
20+
System.import(filename).then(function(m) { m.main(); }, console.error.bind(console));
21+
</script>

‎tools/broccoli/js-replace/.SCRIPTS.js.swp‎

-12 KB
Binary file not shown.

‎tools/broccoli/js-replace/SCRIPTS.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
importScripts("/examples/src/assets/zone-microtask-web-workers.js", "long-stack-trace-zone.js",
2-
"traceur-runtime.js", "es6-module-loader-sans-promises.src.js", "system.src.js",
3-
"extension-register.js", "extension-cjs.js", "Reflect.js", "runtime_paths.js");
2+
"traceur-runtime.js", "es6-module-loader-sans-promises.src.js", "system.src.js", "Reflect.js");

‎tools/build/snippets/runtime_paths.js‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)