Skip to content

Commit 669a29f

Browse files
EisenbergEffectEisenbergEffect
committed
Merge branch 'jspm-skeleton-sync' of https://github.com/doktordirk/skeleton-navigation into doktordirk-jspm-skeleton-sync
2 parents 89765b3 + 7f81e67 commit 669a29f

File tree

13 files changed

+227
-128
lines changed

13 files changed

+227
-128
lines changed

‎skeleton-es2016/README.md

+7
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,13 @@ A gulp task is already configured for that. Use the following command to export
180180
gulp export
181181
```
182182
The app will be exported into ```export``` directory preserving the directory structure.
183+
184+
To start the exported app, execute the following command:
185+
186+
```shell
187+
gulp serve-export
188+
```
189+
183190
#### Configuration
184191
The configuration is done by ```bundles.js``` file.
185192
In addition, ```export.js``` file is available for including individual files.

‎skeleton-es2016/build/tasks/serve.js

+18
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,21 @@ gulp.task('serve-bundle', ['bundle'], function(done) {
3636
}
3737
}, done);
3838
});
39+
40+
// this task utilizes the browsersync plugin
41+
// to create a dev server instance
42+
// at http://localhost:9000
43+
gulp.task('serve-export', ['export'], function(done) {
44+
browserSync({
45+
online: false,
46+
open: false,
47+
port: 9000,
48+
server: {
49+
baseDir: ['./export'],
50+
middleware: function(req, res, next) {
51+
res.setHeader('Access-Control-Allow-Origin', '*');
52+
next();
53+
}
54+
}
55+
}, done);
56+
});

‎skeleton-es2016/config.js

+68-69
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,115 @@
11
System.config({
2-
"defaultJSExtensions": true,
3-
"transpiler": false,
4-
"paths": {
2+
defaultJSExtensions: true,
3+
transpiler: "none",
4+
paths: {
55
"*": "dist/*",
66
"github:*": "jspm_packages/github/*",
77
"npm:*": "jspm_packages/npm/*"
88
},
9-
"meta": {
9+
meta: {
1010
"bootstrap": {
1111
"deps": [
1212
"jquery"
1313
]
1414
}
1515
},
16-
"map": {
16+
map: {
1717
"aurelia-animator-css": "npm:[email protected]",
1818
"aurelia-bootstrapper": "npm:[email protected]",
1919
"aurelia-fetch-client": "npm:[email protected]",
20-
"aurelia-framework": "npm:[email protected].3",
20+
"aurelia-framework": "npm:[email protected].5",
2121
"aurelia-history-browser": "npm:[email protected]",
2222
"aurelia-loader-default": "npm:[email protected]",
23-
"aurelia-logging-console": "npm:[email protected].1",
24-
"aurelia-pal-browser": "npm:[email protected].1.2.1",
25-
"aurelia-polyfills": "npm:[email protected].4",
26-
"aurelia-router": "npm:[email protected].2",
23+
"aurelia-logging-console": "npm:[email protected].2",
24+
"aurelia-pal-browser": "npm:[email protected].2.0.1",
25+
"aurelia-polyfills": "npm:[email protected].6",
26+
"aurelia-router": "npm:[email protected].4",
2727
"aurelia-templating-binding": "npm:[email protected]",
28-
"aurelia-templating-resources": "npm:[email protected].5",
28+
"aurelia-templating-resources": "npm:[email protected].6",
2929
"aurelia-templating-router": "npm:[email protected]",
3030
"bootstrap": "github:twbs/[email protected]",
31-
"fetch": "github:github/fetch@0.11.1",
32-
"font-awesome": "npm:[email protected].1",
33-
"jquery": "npm:[email protected].3",
31+
"fetch": "github:github/fetch@1.0.0",
32+
"font-awesome": "npm:[email protected].3",
33+
"jquery": "npm:[email protected].4",
3434
"text": "github:systemjs/[email protected]",
3535
"github:twbs/[email protected]": {
36-
"jquery": "npm:[email protected].3"
36+
"jquery": "npm:[email protected].4"
3737
},
3838
"npm:[email protected]": {
39-
"aurelia-metadata": "npm:[email protected].1.2.1",
40-
"aurelia-pal": "npm:[email protected].2.2",
41-
"aurelia-templating": "npm:[email protected].6"
39+
"aurelia-metadata": "npm:[email protected].2.0.0",
40+
"aurelia-pal": "npm:[email protected].3.0",
41+
"aurelia-templating": "npm:[email protected].7"
4242
},
43-
"npm:[email protected].5": {
43+
"npm:[email protected].6": {
4444
"aurelia-logging": "npm:[email protected]",
45-
"aurelia-metadata": "npm:[email protected].1.2.1",
46-
"aurelia-pal": "npm:[email protected].2.2",
45+
"aurelia-metadata": "npm:[email protected].2.0.0",
46+
"aurelia-pal": "npm:[email protected].3.0",
4747
"aurelia-task-queue": "npm:[email protected]"
4848
},
4949
"npm:[email protected]": {
5050
"aurelia-event-aggregator": "npm:[email protected]",
51-
"aurelia-framework": "npm:[email protected].3",
51+
"aurelia-framework": "npm:[email protected].5",
5252
"aurelia-history": "npm:[email protected]",
5353
"aurelia-history-browser": "npm:[email protected]",
5454
"aurelia-loader-default": "npm:[email protected]",
55-
"aurelia-logging-console": "npm:[email protected].1",
56-
"aurelia-pal": "npm:[email protected].2.2",
57-
"aurelia-pal-browser": "npm:[email protected].1.2.1",
58-
"aurelia-polyfills": "npm:[email protected].4",
59-
"aurelia-router": "npm:[email protected].2",
60-
"aurelia-templating": "npm:[email protected].6",
55+
"aurelia-logging-console": "npm:[email protected].2",
56+
"aurelia-pal": "npm:[email protected].3.0",
57+
"aurelia-pal-browser": "npm:[email protected].2.0.1",
58+
"aurelia-polyfills": "npm:[email protected].6",
59+
"aurelia-router": "npm:[email protected].4",
60+
"aurelia-templating": "npm:[email protected].7",
6161
"aurelia-templating-binding": "npm:[email protected]",
62-
"aurelia-templating-resources": "npm:[email protected].5",
62+
"aurelia-templating-resources": "npm:[email protected].6",
6363
"aurelia-templating-router": "npm:[email protected]"
6464
},
6565
"npm:[email protected]": {
6666
"aurelia-logging": "npm:[email protected]",
67-
"aurelia-metadata": "npm:[email protected].1.2.1",
68-
"aurelia-pal": "npm:[email protected].2.2"
67+
"aurelia-metadata": "npm:[email protected].2.0.0",
68+
"aurelia-pal": "npm:[email protected].3.0"
6969
},
7070
"npm:[email protected]": {
7171
"aurelia-logging": "npm:[email protected]"
7272
},
73-
"npm:[email protected].3": {
74-
"aurelia-binding": "npm:[email protected].5",
73+
"npm:[email protected].5": {
74+
"aurelia-binding": "npm:[email protected].6",
7575
"aurelia-dependency-injection": "npm:[email protected]",
7676
"aurelia-loader": "npm:[email protected]",
7777
"aurelia-logging": "npm:[email protected]",
78-
"aurelia-metadata": "npm:[email protected].1.2.1",
79-
"aurelia-pal": "npm:[email protected].2.2",
78+
"aurelia-metadata": "npm:[email protected].2.0.0",
79+
"aurelia-pal": "npm:[email protected].3.0",
8080
"aurelia-path": "npm:[email protected]",
8181
"aurelia-task-queue": "npm:[email protected]",
82-
"aurelia-templating": "npm:[email protected].6"
82+
"aurelia-templating": "npm:[email protected].7"
8383
},
8484
"npm:[email protected]": {
8585
"aurelia-history": "npm:[email protected]",
86-
"aurelia-pal": "npm:[email protected].2.2"
86+
"aurelia-pal": "npm:[email protected].3.0"
8787
},
8888
"npm:[email protected]": {
8989
"aurelia-loader": "npm:[email protected]",
90-
"aurelia-metadata": "npm:[email protected].1.2.1",
91-
"aurelia-pal": "npm:[email protected].2.2"
90+
"aurelia-metadata": "npm:[email protected].2.0.0",
91+
"aurelia-pal": "npm:[email protected].3.0"
9292
},
9393
"npm:[email protected]": {
94-
"aurelia-metadata": "npm:[email protected].1.2.1",
94+
"aurelia-metadata": "npm:[email protected].2.0.0",
9595
"aurelia-path": "npm:[email protected]"
9696
},
97-
"npm:[email protected]": {
98-
"aurelia-logging": "npm:[email protected]",
99-
"aurelia-pal": "npm:[email protected]"
97+
"npm:[email protected]": {
98+
"aurelia-logging": "npm:[email protected]"
10099
},
101-
"npm:[email protected].1.2.1": {
102-
"aurelia-pal": "npm:[email protected].2.2"
100+
"npm:[email protected].2.0.0": {
101+
"aurelia-pal": "npm:[email protected].3.0"
103102
},
104-
"npm:[email protected].1.2.1": {
105-
"aurelia-pal": "npm:[email protected].2.2"
103+
"npm:[email protected].2.0.1": {
104+
"aurelia-pal": "npm:[email protected].3.0"
106105
},
107-
"npm:[email protected].4": {
108-
"aurelia-pal": "npm:[email protected].2.2"
106+
"npm:[email protected].6": {
107+
"aurelia-pal": "npm:[email protected].3.0"
109108
},
110109
"npm:[email protected]": {
111110
"aurelia-path": "npm:[email protected]"
112111
},
113-
"npm:[email protected].2": {
112+
"npm:[email protected].4": {
114113
"aurelia-dependency-injection": "npm:[email protected]",
115114
"aurelia-event-aggregator": "npm:[email protected]",
116115
"aurelia-history": "npm:[email protected]",
@@ -119,45 +118,45 @@ System.config({
119118
"aurelia-route-recognizer": "npm:[email protected]"
120119
},
121120
"npm:[email protected]": {
122-
"aurelia-pal": "npm:[email protected].2.2"
121+
"aurelia-pal": "npm:[email protected].3.0"
123122
},
124123
"npm:[email protected]": {
125-
"aurelia-binding": "npm:[email protected].5",
124+
"aurelia-binding": "npm:[email protected].6",
126125
"aurelia-logging": "npm:[email protected]",
127-
"aurelia-templating": "npm:[email protected].6"
126+
"aurelia-templating": "npm:[email protected].7"
128127
},
129-
"npm:[email protected].5": {
130-
"aurelia-binding": "npm:[email protected].5",
128+
"npm:[email protected].6": {
129+
"aurelia-binding": "npm:[email protected].6",
131130
"aurelia-dependency-injection": "npm:[email protected]",
132131
"aurelia-loader": "npm:[email protected]",
133132
"aurelia-logging": "npm:[email protected]",
134-
"aurelia-metadata": "npm:[email protected].1.2.1",
135-
"aurelia-pal": "npm:[email protected].2.2",
133+
"aurelia-metadata": "npm:[email protected].2.0.0",
134+
"aurelia-pal": "npm:[email protected].3.0",
136135
"aurelia-path": "npm:[email protected]",
137136
"aurelia-task-queue": "npm:[email protected]",
138-
"aurelia-templating": "npm:[email protected].6"
137+
"aurelia-templating": "npm:[email protected].7"
139138
},
140139
"npm:[email protected]": {
141140
"aurelia-dependency-injection": "npm:[email protected]",
142141
"aurelia-logging": "npm:[email protected]",
143-
"aurelia-metadata": "npm:[email protected].1.2.1",
144-
"aurelia-pal": "npm:[email protected].2.2",
142+
"aurelia-metadata": "npm:[email protected].2.0.0",
143+
"aurelia-pal": "npm:[email protected].3.0",
145144
"aurelia-path": "npm:[email protected]",
146-
"aurelia-router": "npm:[email protected].2",
147-
"aurelia-templating": "npm:[email protected].6"
145+
"aurelia-router": "npm:[email protected].4",
146+
"aurelia-templating": "npm:[email protected].7"
148147
},
149-
"npm:[email protected].6": {
150-
"aurelia-binding": "npm:[email protected].5",
148+
"npm:[email protected].7": {
149+
"aurelia-binding": "npm:[email protected].6",
151150
"aurelia-dependency-injection": "npm:[email protected]",
152151
"aurelia-loader": "npm:[email protected]",
153152
"aurelia-logging": "npm:[email protected]",
154-
"aurelia-metadata": "npm:[email protected].1.2.1",
155-
"aurelia-pal": "npm:[email protected].2.2",
153+
"aurelia-metadata": "npm:[email protected].2.0.0",
154+
"aurelia-pal": "npm:[email protected].3.0",
156155
"aurelia-path": "npm:[email protected]",
157156
"aurelia-task-queue": "npm:[email protected]"
158157
},
159-
"npm:[email protected].1": {
160-
"css": "github:systemjs/[email protected].21"
158+
"npm:[email protected].3": {
159+
"css": "github:systemjs/[email protected].23"
161160
}
162161
}
163-
})
162+
});

‎skeleton-es2016/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33
<head>
44
<title>Aurelia</title>
5-
<link rel="stylesheet" href="jspm_packages/npm/[email protected].1/css/font-awesome.min.css">
5+
<link rel="stylesheet" href="jspm_packages/npm/[email protected].3/css/font-awesome.min.css">
66
<link rel="stylesheet" href="styles/styles.css">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
</head>

‎skeleton-es2016/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@
7979
"aurelia-templating-binding": "npm:aurelia-templating-binding@^1.0.0-beta.1.1.2",
8080
"aurelia-templating-resources": "npm:aurelia-templating-resources@^1.0.0-beta.1.1.3",
8181
"aurelia-templating-router": "npm:aurelia-templating-router@^1.0.0-beta.1.1.2",
82-
"bootstrap": "github:twbs/bootstrap@^3.3.5",
83-
"fetch": "github:github/fetch@^0.11.0",
84-
"font-awesome": "npm:font-awesome@^4.5.0",
85-
"jquery": "npm:jquery@^2.2.3",
82+
"bootstrap": "github:twbs/bootstrap@^3.3.6",
83+
"fetch": "github:github/fetch@^1.0.0",
84+
"font-awesome": "npm:font-awesome@^4.6.3",
85+
"jquery": "npm:jquery@^2.2.4",
8686
"text": "github:systemjs/plugin-text@^0.0.3"
8787
},
8888
"devDependencies": {}

‎skeleton-typescript/README.md

+7
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,13 @@ A gulp task is already configured for that. Use the following command to export
180180
gulp export
181181
```
182182
The app will be exported into ```export``` directory preserving the directory structure.
183+
184+
To start the exported app, execute the following command:
185+
186+
```shell
187+
gulp serve-export
188+
```
189+
183190
#### Configuration
184191
The configuration is done by ```bundles.js``` file.
185192
In addition, ```export.js``` file is available for including individual files.

‎skeleton-typescript/build/export.js

+31-14
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,34 @@
1+
// this file provides a list of unbundled files that
2+
// need to be included when exporting the application
3+
// for production.
14
module.exports = {
2-
"list": [
3-
"index.html",
4-
"config.js",
5-
"favicon.ico",
6-
"LICENSE",
7-
"jspm_packages/system.js",
8-
"jspm_packages/system-polyfills.js",
9-
"jspm_packages/system-csp-production.js",
10-
"styles/styles.css",
11-
"jspm_packages/npm/[email protected]/css/font-awesome.min.css",
12-
"jspm_packages/npm/[email protected]/fonts/*",
13-
"jspm_packages/github/github/[email protected]",
14-
"jspm_packages/github/github/[email protected]/fetch.js",
15-
"jspm_packages/github/twbs/[email protected]/fonts/*"
5+
'list': [
6+
'index.html',
7+
'config.js',
8+
'favicon.ico',
9+
'LICENSE',
10+
'jspm_packages/system.js',
11+
'jspm_packages/system-polyfills.js',
12+
'jspm_packages/system-csp-production.js',
13+
'styles/styles.css'
14+
],
15+
// this section lists any jspm packages that have
16+
// unbundled resources that need to be exported.
17+
// these files are in versioned folders and thus
18+
// must be 'normalized' by jspm to get the proper
19+
// path.
20+
'normalize': [
21+
[
22+
// include font-awesome.css and its fonts files
23+
'font-awesome', [
24+
'/css/font-awesome.min.css',
25+
'/fonts/*'
26+
]
27+
], [
28+
// include bootstrap's font files
29+
'bootstrap', [
30+
'/fonts/*'
31+
]
32+
]
1633
]
1734
};

‎skeleton-typescript/build/tasks/build.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var sourcemaps = require('gulp-sourcemaps');
66
var paths = require('../paths');
77
var assign = Object.assign || require('object.assign');
88
var notify = require('gulp-notify');
9+
var browserSync = require('browser-sync');
910
var typescript = require('gulp-typescript');
1011

1112
// transpiles changed es6 files to SystemJS format
@@ -20,7 +21,8 @@ gulp.task('build-system', function() {
2021
});
2122
}
2223
return gulp.src(paths.dtsSrc.concat(paths.source))
23-
.pipe(plumber())
24+
.pipe(plumber({errorHandler: notify.onError('Error: <%= error.message %>')}))
25+
.pipe(changed(paths.output, {extension: '.ts'}))
2426
.pipe(sourcemaps.init({loadMaps: true}))
2527
.pipe(typescript(typescriptCompiler))
2628
.pipe(sourcemaps.write('.', {includeContent: false, sourceRoot: '/src'}))
@@ -38,7 +40,8 @@ gulp.task('build-html', function() {
3840
gulp.task('build-css', function() {
3941
return gulp.src(paths.css)
4042
.pipe(changed(paths.output, {extension: '.css'}))
41-
.pipe(gulp.dest(paths.output));
43+
.pipe(gulp.dest(paths.output))
44+
.pipe(browserSync.stream());
4245
});
4346

4447
// this task calls the clean task (located

0 commit comments

Comments
 (0)