Skip to content

Commit 26a38c8

Browse files
AshleyGrantEisenbergEffect
AshleyGrant
authored and
EisenbergEffect
committed
chore(all): fixes for all systemjs skeletons
1 parent 93efe1e commit 26a38c8

File tree

15 files changed

+75
-38
lines changed

15 files changed

+75
-38
lines changed

‎skeleton-esnext-aspnetcore/src/skeleton/build/bundles.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ module.exports = {
2929
"aurelia-logging-console",
3030
"bootstrap",
3131
"bootstrap/css/bootstrap.css!text",
32-
"fetch"
32+
"fetch",
33+
"jquery"
3334
],
3435
"options": {
3536
"inject": true,

‎skeleton-esnext-aspnetcore/src/skeleton/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,11 @@
8181
"aurelia-templating-binding": "npm:aurelia-templating-binding@^1.0.0-rc.1.0.0",
8282
"aurelia-templating-resources": "npm:aurelia-templating-resources@^1.0.0-rc.1.0.0",
8383
"aurelia-templating-router": "npm:aurelia-templating-router@^1.0.0-rc.1.0.0",
84+
"bluebird": "npm:[email protected]",
8485
"bootstrap": "github:twbs/bootstrap@^3.3.6",
8586
"fetch": "github:github/fetch@^1.0.0",
8687
"font-awesome": "npm:[email protected]",
88+
"jquery": "npm:jquery@^2.2.4",
8789
"text": "github:systemjs/plugin-text@^0.0.8"
8890
},
8991
"devDependencies": {

‎skeleton-esnext-aspnetcore/src/skeleton/views/home/Index.cshtml

+7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44
<div class="fa fa-spinner fa-spin"></div>
55
</div>
66

7+
<!-- The bluebird version is locked at 4.6.3 in the package.json file to keep this from breaking -->
8+
<!-- We include bluebird to bypass Edge's very slow Native Promise implementation. The Edge team -->
9+
<!-- has fixed the issues with their implementation with these fixes being distributed with the -->
10+
<!-- Windows 10 Anniversary Update on 2 August 2016. Once that update has pushed out, you may -->
11+
<!-- consider removing bluebird from your project and simply using native promises if you do -->
12+
<!-- not need to support Internet Explorer. -->
13+
<script src="jspm_packages/npm/[email protected]/js/browser/bluebird.min.js"></script>
714
<script src="jspm_packages/system.js"></script>
815

916
<script src="config.js"></script>

‎skeleton-esnext-aspnetcore/src/skeleton/wwwroot/config.js

+10-5
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ System.config({
88
},
99
map: {
1010
"aurelia-animator-css": "npm:[email protected]",
11-
"aurelia-bootstrapper": "npm:[email protected].0",
11+
"aurelia-bootstrapper": "npm:[email protected].1",
1212
"aurelia-fetch-client": "npm:[email protected]",
13-
"aurelia-framework": "npm:[email protected].0",
13+
"aurelia-framework": "npm:[email protected].1",
1414
"aurelia-history-browser": "npm:[email protected]",
1515
"aurelia-loader-default": "npm:[email protected]",
1616
"aurelia-logging-console": "npm:[email protected]",
@@ -22,10 +22,12 @@ System.config({
2222
"aurelia-templating-router": "npm:[email protected]",
2323
"babel": "npm:[email protected]",
2424
"babel-runtime": "npm:[email protected]",
25+
"bluebird": "npm:[email protected]",
2526
"bootstrap": "github:twbs/[email protected]",
2627
"core-js": "npm:[email protected]",
2728
"fetch": "github:github/[email protected]",
2829
"font-awesome": "npm:[email protected]",
30+
"jquery": "npm:[email protected]",
2931
"text": "github:systemjs/[email protected]",
3032
"github:jspm/[email protected]": {
3133
"assert": "npm:[email protected]"
@@ -65,9 +67,9 @@ System.config({
6567
"aurelia-pal": "npm:[email protected]",
6668
"aurelia-task-queue": "npm:[email protected]"
6769
},
68-
"npm:[email protected].0": {
70+
"npm:[email protected].1": {
6971
"aurelia-event-aggregator": "npm:[email protected]",
70-
"aurelia-framework": "npm:[email protected].0",
72+
"aurelia-framework": "npm:[email protected].1",
7173
"aurelia-history": "npm:[email protected]",
7274
"aurelia-history-browser": "npm:[email protected]",
7375
"aurelia-loader-default": "npm:[email protected]",
@@ -88,7 +90,7 @@ System.config({
8890
"npm:[email protected]": {
8991
"aurelia-logging": "npm:[email protected]"
9092
},
91-
"npm:[email protected].0": {
93+
"npm:[email protected].1": {
9294
"aurelia-binding": "npm:[email protected]",
9395
"aurelia-dependency-injection": "npm:[email protected]",
9496
"aurelia-loader": "npm:[email protected]",
@@ -176,6 +178,9 @@ System.config({
176178
"npm:[email protected]": {
177179
"process": "github:jspm/[email protected]"
178180
},
181+
"npm:[email protected]": {
182+
"process": "github:jspm/[email protected]"
183+
},
179184
"npm:[email protected]": {
180185
"base64-js": "npm:[email protected]",
181186
"child_process": "github:jspm/[email protected]",

‎skeleton-esnext/config.js

+12-19
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,11 @@ System.config({
66
"github:*": "jspm_packages/github/*",
77
"npm:*": "jspm_packages/npm/*"
88
},
9-
10-
meta: {
11-
"bootstrap": {
12-
"deps": [
13-
"jquery"
14-
]
15-
}
16-
},
17-
189
map: {
1910
"aurelia-animator-css": "npm:[email protected]",
20-
"aurelia-bootstrapper": "npm:[email protected].0",
11+
"aurelia-bootstrapper": "npm:[email protected].1",
2112
"aurelia-fetch-client": "npm:[email protected]",
22-
"aurelia-framework": "npm:[email protected].0",
13+
"aurelia-framework": "npm:[email protected].1",
2314
"aurelia-history-browser": "npm:[email protected]",
2415
"aurelia-loader-default": "npm:[email protected]",
2516
"aurelia-logging-console": "npm:[email protected]",
@@ -29,9 +20,11 @@ System.config({
2920
"aurelia-templating-binding": "npm:[email protected]",
3021
"aurelia-templating-resources": "npm:[email protected]",
3122
"aurelia-templating-router": "npm:[email protected]",
23+
"bluebird": "npm:[email protected]",
3224
"bootstrap": "github:twbs/[email protected]",
3325
"fetch": "github:github/[email protected]",
3426
"font-awesome": "npm:[email protected]",
27+
"jquery": "npm:[email protected]",
3528
"text": "github:systemjs/[email protected]",
3629
"github:jspm/[email protected]": {
3730
"assert": "npm:[email protected]"
@@ -49,7 +42,7 @@ System.config({
4942
"vm-browserify": "npm:[email protected]"
5043
},
5144
"github:twbs/[email protected]": {
52-
"jquery": "npm:jquery@3.0.0"
45+
"jquery": "npm:jquery@2.2.4"
5346
},
5447
"npm:[email protected]": {
5548
"assert": "github:jspm/[email protected]",
@@ -68,9 +61,9 @@ System.config({
6861
"aurelia-pal": "npm:[email protected]",
6962
"aurelia-task-queue": "npm:[email protected]"
7063
},
71-
"npm:[email protected].0": {
64+
"npm:[email protected].1": {
7265
"aurelia-event-aggregator": "npm:[email protected]",
73-
"aurelia-framework": "npm:[email protected].0",
66+
"aurelia-framework": "npm:[email protected].1",
7467
"aurelia-history": "npm:[email protected]",
7568
"aurelia-history-browser": "npm:[email protected]",
7669
"aurelia-loader-default": "npm:[email protected]",
@@ -91,7 +84,7 @@ System.config({
9184
"npm:[email protected]": {
9285
"aurelia-logging": "npm:[email protected]"
9386
},
94-
"npm:[email protected].0": {
87+
"npm:[email protected].1": {
9588
"aurelia-binding": "npm:[email protected]",
9689
"aurelia-dependency-injection": "npm:[email protected]",
9790
"aurelia-loader": "npm:[email protected]",
@@ -176,6 +169,9 @@ System.config({
176169
"aurelia-path": "npm:[email protected]",
177170
"aurelia-task-queue": "npm:[email protected]"
178171
},
172+
"npm:[email protected]": {
173+
"process": "github:jspm/[email protected]"
174+
},
179175
"npm:[email protected]": {
180176
"base64-js": "npm:[email protected]",
181177
"child_process": "github:jspm/[email protected]",
@@ -190,9 +186,6 @@ System.config({
190186
"npm:[email protected]": {
191187
"util": "github:jspm/[email protected]"
192188
},
193-
"npm:[email protected]": {
194-
"process": "github:jspm/[email protected]"
195-
},
196189
"npm:[email protected]": {
197190
"assert": "github:jspm/[email protected]",
198191
"fs": "github:jspm/[email protected]",
@@ -206,4 +199,4 @@ System.config({
206199
"indexof": "npm:[email protected]"
207200
}
208201
}
209-
});
202+
});

‎skeleton-esnext/index.html

+8-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<!--The FontAwesome version is locked at 4.6.3 in the package.json file to keep this from breaking.-->
66
<link rel="stylesheet" href="jspm_packages/npm/[email protected]/css/font-awesome.min.css">
77
<!--JSPM Has a Bug with Bootstrap so We Have to Include jQuery Here-->
8-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
98
<link rel="stylesheet" href="styles/styles.css">
109
<meta name="viewport" content="width=device-width, initial-scale=1">
1110
</head>
@@ -15,7 +14,14 @@
1514
<div class="message">Aurelia Navigation Skeleton</div>
1615
<i class="fa fa-spinner fa-spin"></i>
1716
</div>
18-
17+
18+
<!-- The bluebird version is locked at 4.6.3 in the package.json file to keep this from breaking -->
19+
<!-- We include bluebird to bypass Edge's very slow Native Promise implementation. The Edge team -->
20+
<!-- has fixed the issues with their implementation with these fixes being distributed with the -->
21+
<!-- Windows 10 Anniversary Update on 2 August 2016. Once that update has pushed out, you may -->
22+
<!-- consider removing bluebird from your project and simply using native promises if you do -->
23+
<!-- not need to support Internet Explorer. -->
24+
<script src="jspm_packages/npm/[email protected]/js/browser/bluebird.min.js"></script>
1925
<script src="jspm_packages/system.js"></script>
2026
<script src="config.js"></script>
2127
<script>

‎skeleton-esnext/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,11 @@
8080
"aurelia-templating-binding": "npm:aurelia-templating-binding@^1.0.0-rc.1.0.0",
8181
"aurelia-templating-resources": "npm:aurelia-templating-resources@^1.0.0-rc.1.0.0",
8282
"aurelia-templating-router": "npm:aurelia-templating-router@^1.0.0-rc.1.0.0",
83+
"bluebird": "npm:[email protected]",
8384
"bootstrap": "github:twbs/bootstrap@^3.3.6",
8485
"fetch": "github:github/fetch@^1.0.0",
8586
"font-awesome": "npm:[email protected]",
87+
"jquery": "npm:jquery@^2.2.4",
8688
"text": "github:systemjs/plugin-text@^0.0.8"
8789
},
8890
"devDependencies": {}

‎skeleton-typescript-aspnetcore/src/skeleton/build/bundles.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ module.exports = {
2929
"aurelia-logging-console",
3030
"bootstrap",
3131
"bootstrap/css/bootstrap.css!text",
32-
"fetch"
32+
"fetch",
33+
"jquery"
3334
],
3435
"options": {
3536
"inject": true,

‎skeleton-typescript-aspnetcore/src/skeleton/package.json

+2
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@
6868
"aurelia-templating-binding": "npm:aurelia-templating-binding@^1.0.0-rc.1.0.0",
6969
"aurelia-templating-resources": "npm:aurelia-templating-resources@^1.0.0-rc.1.0.0",
7070
"aurelia-templating-router": "npm:aurelia-templating-router@^1.0.0-rc.1.0.0",
71+
"bluebird": "npm:[email protected]",
7172
"bootstrap": "github:twbs/bootstrap@^3.3.6",
7273
"fetch": "github:github/fetch@^1.0.0",
7374
"font-awesome": "npm:[email protected]",
75+
"jquery": "npm:jquery@^2.2.4",
7476
"text": "github:systemjs/plugin-text@^0.0.8"
7577
},
7678
"devDependencies": {

‎skeleton-typescript-aspnetcore/src/skeleton/views/home/Index.cshtml

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,14 @@
44
<div class="fa fa-spinner fa-spin"></div>
55
</div>
66

7+
<!-- The bluebird version is locked at 4.6.3 in the package.json file to keep this from breaking -->
8+
<!-- We include bluebird to bypass Edge's very slow Native Promise implementation. The Edge team -->
9+
<!-- has fixed the issues with their implementation with these fixes being distributed with the -->
10+
<!-- Windows 10 Anniversary Update on 2 August 2016. Once that update has pushed out, you may -->
11+
<!-- consider removing bluebird from your project and simply using native promises if you do -->
12+
<!-- not need to support Internet Explorer. -->
13+
<script src="jspm_packages/npm/[email protected]/js/browser/bluebird.min.js"></script>
714
<script src="jspm_packages/system.js"></script>
8-
915
<script src="config.js"></script>
1016

1117
<script>

‎skeleton-typescript-aspnetcore/src/skeleton/wwwroot/config.js

+10-5
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ System.config({
88
},
99
map: {
1010
"aurelia-animator-css": "npm:[email protected]",
11-
"aurelia-bootstrapper": "npm:[email protected].0",
11+
"aurelia-bootstrapper": "npm:[email protected].1",
1212
"aurelia-fetch-client": "npm:[email protected]",
13-
"aurelia-framework": "npm:[email protected].0",
13+
"aurelia-framework": "npm:[email protected].1",
1414
"aurelia-history-browser": "npm:[email protected]",
1515
"aurelia-loader-default": "npm:[email protected]",
1616
"aurelia-logging-console": "npm:[email protected]",
@@ -22,10 +22,12 @@ System.config({
2222
"aurelia-templating-router": "npm:[email protected]",
2323
"babel": "npm:[email protected]",
2424
"babel-runtime": "npm:[email protected]",
25+
"bluebird": "npm:[email protected]",
2526
"bootstrap": "github:twbs/[email protected]",
2627
"core-js": "npm:[email protected]",
2728
"fetch": "github:github/[email protected]",
2829
"font-awesome": "npm:[email protected]",
30+
"jquery": "npm:[email protected]",
2931
"text": "github:systemjs/[email protected]",
3032
"github:jspm/[email protected]": {
3133
"assert": "npm:[email protected]"
@@ -65,9 +67,9 @@ System.config({
6567
"aurelia-pal": "npm:[email protected]",
6668
"aurelia-task-queue": "npm:[email protected]"
6769
},
68-
"npm:[email protected].0": {
70+
"npm:[email protected].1": {
6971
"aurelia-event-aggregator": "npm:[email protected]",
70-
"aurelia-framework": "npm:[email protected].0",
72+
"aurelia-framework": "npm:[email protected].1",
7173
"aurelia-history": "npm:[email protected]",
7274
"aurelia-history-browser": "npm:[email protected]",
7375
"aurelia-loader-default": "npm:[email protected]",
@@ -88,7 +90,7 @@ System.config({
8890
"npm:[email protected]": {
8991
"aurelia-logging": "npm:[email protected]"
9092
},
91-
"npm:[email protected].0": {
93+
"npm:[email protected].1": {
9294
"aurelia-binding": "npm:[email protected]",
9395
"aurelia-dependency-injection": "npm:[email protected]",
9496
"aurelia-loader": "npm:[email protected]",
@@ -176,6 +178,9 @@ System.config({
176178
"npm:[email protected]": {
177179
"process": "github:jspm/[email protected]"
178180
},
181+
"npm:[email protected]": {
182+
"process": "github:jspm/[email protected]"
183+
},
179184
"npm:[email protected]": {
180185
"base64-js": "npm:[email protected]",
181186
"child_process": "github:jspm/[email protected]",

‎skeleton-typescript/build/bundles.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ module.exports = {
2929
"aurelia-logging-console",
3030
"bootstrap",
3131
"bootstrap/css/bootstrap.css!text",
32-
"fetch"
32+
"fetch",
33+
"jquery"
3334
],
3435
"options": {
3536
"inject": true,

‎skeleton-typescript/config.js

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ System.config({
3131
"bootstrap": "github:twbs/[email protected]",
3232
"fetch": "github:github/[email protected]",
3333
"font-awesome": "npm:[email protected]",
34+
"jquery": "npm:[email protected]",
3435
"text": "github:systemjs/[email protected]",
3536
"github:jspm/[email protected]": {
3637
"assert": "npm:[email protected]"

‎skeleton-typescript/index.html

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
<title>Aurelia</title>
55
<!--The FontAwesome version is locked at 4.6.3 in the package.json file to keep this from breaking.-->
66
<link rel="stylesheet" href="jspm_packages/npm/[email protected]/css/font-awesome.min.css">
7-
<!--JSPM Has a Bug with Bootstrap so We Have to Include jQuery Here-->
8-
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
97
<link rel="stylesheet" href="styles/styles.css">
108
<meta name="viewport" content="width=device-width, initial-scale=1">
119
</head>
@@ -15,7 +13,13 @@
1513
<div class="message">Aurelia Navigation Skeleton</div>
1614
<i class="fa fa-spinner fa-spin"></i>
1715
</div>
18-
16+
17+
<!-- The bluebird version is locked at 4.6.3 in the package.json file to keep this from breaking -->
18+
<!-- We include bluebird to bypass Edge's very slow Native Promise implementation. The Edge team -->
19+
<!-- has fixed the issues with their implementation with these fixes being distributed with the -->
20+
<!-- Windows 10 Anniversary Update on 2 August 2016. Once that update has pushed out, you may -->
21+
<!-- consider removing bluebird from your project and simply using native promises if you do -->
22+
<!-- not need to support Internet Explorer. -->
1923
<script src="jspm_packages/npm/[email protected]/js/browser/bluebird.min.js"></script>
2024
<script src="jspm_packages/system.js"></script>
2125
<script src="config.js"></script>

‎skeleton-typescript/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"bootstrap": "github:twbs/bootstrap@^3.3.6",
7979
"fetch": "github:github/fetch@^1.0.0",
8080
"font-awesome": "npm:[email protected]",
81+
"jquery": "npm:jquery@^2.2.4",
8182
"text": "github:systemjs/plugin-text@^0.0.8"
8283
},
8384
"devDependencies": {}

0 commit comments

Comments
 (0)