Skip to content

Commit dbf4b9f

Browse files
committed
refactored configuration and scripts for clarity
changed bundle-dev to build:dev for consistency
1 parent 42b5da7 commit dbf4b9f

File tree

7 files changed

+32
-23
lines changed

7 files changed

+32
-23
lines changed

assets/jspm.init.js

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// importing libs should be included in dev-bundle
2-
import './bundle-config.vendor.js';
2+
import './vendor.config.prod.js';
33
import 'plugin-typescript';
44
import 'css';
55
import 'systemjs-hot-reloader';

bundle-config.vendor.js renamed to configs/vendor.config.prod.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ import 'react-router-redux';
77
import 'redux-actions';
88
import 'classnames';
99
import 'seamless-immutable';
10+
import 'csjs';
11+
import 'insert-css';

index.html

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,22 @@
2727
</div>
2828
</div>
2929
<!-- body bottom scripts -->
30+
<!-- below section could be auto-generated and overwritten during build for prod -->
31+
<!-- loading-app:start -->
3032
<script src="jspm_packages/system.js"></script>
3133
<script src="jspm.config.js"></script>
3234
<script src="temp/vendor.dev.js"></script>
33-
<script src="jspm.init.js"></script>
35+
<script>
36+
// hot-reload config
37+
SystemJS.import('systemjs-hot-reloader').then(function(HotReloader) {
38+
// if you're running server on custom port please remember to update below
39+
new HotReloader.default('http://localhost:8888');
40+
});
41+
// load main module of your app with SystemJS
42+
SystemJS.trace = true;
43+
SystemJS.import('src/app');
44+
</script>
45+
<!-- loading-app:end -->
3446
</body>
3547

3648
</html>

assets/index.html renamed to index.prod.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,17 @@
2727
</div>
2828
</div>
2929
<!-- body bottom scripts -->
30+
<!-- loading-app:start -->
3031
<script src="shim.min.js"></script>
3132
<script src="system.js"></script>
3233
<script src="jspm.config.js"></script>
33-
<script src="vendor.js"></script>
34-
<script src="jspm.init.js"></script>
34+
<script src="vendor.prod.js"></script>
35+
<script>
36+
// load main module of your app with SystemJS
37+
SystemJS.production = true;
38+
SystemJS.import('app.js');
39+
</script>
40+
<!-- loading-app:end -->
3541
</body>
3642

3743
</html>

jspm.init.js

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

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,31 @@
1010
"license": "MIT",
1111
"scripts": {
1212
"postinstall": "jspm install && npm run bundle-dev",
13-
"preinit:dist": "rimraf dist/",
14-
"init:dist": "mkdir dist && cp assets/* dist/",
13+
"preinit:dist": "rimraf dist/**/* && mkdir dist || true",
14+
"init:dist": "cp assets/* dist/ && cp index.prod.html dist/index.html",
1515
"preinit:deploy": "npm run init:dist",
1616
"init:deploy": "git clone https://github.com/piotrwitek/react-redux-typescript-starter-kit --branch gh-pages gh-pages-clone",
1717
"postinit:deploy": "mv gh-pages-clone/.git dist/.git && rimraf gh-pages-clone/",
1818
"deploy": "cd dist && git checkout gh-pages && git add --all && git commit -m \"New Release\" && git push",
1919
"precommit": "npm run lint",
2020
"prepush": "npm run lint && npm test",
2121
"preversion": "npm run lint && npm test",
22+
"build:dev": "npm run _jspm-bundle-vendor-dev",
2223
"unbundle": "rimraf temp/vendor.dev.js",
23-
"bundle-dev": "npm run _jspm-bundle-vendor-dev",
2424
"build": "npm run build:app && npm run build:vendor",
2525
"build:app": "npm run _jspm-build-app -- --skip-source-maps --minify",
26-
"build:vendor": "npm run _jspm-bundle-vendor",
26+
"build:vendor": "npm run _jspm-bundle-vendor-prod",
2727
"build:debug": "npm run _jspm-build-app",
2828
"bad": "npm run build:app && npm run deploy",
2929
"bvd": "npm run build:vendor && npm run deploy",
3030
"lint": "tslint ./src/**/*.ts[x]",
3131
"test": "jspm run src/test-runner | faucet",
3232
"tsc": "tsc -p src",
3333
"tsc:watch": "tsc -p src -w",
34-
"_jspm-bundle-vendor-dev": "jspm bundle bundle-config.vendor.dev.js temp/vendor.dev.js -d",
35-
"_jspm-bundle-vendor": "jspm bundle bundle-config.vendor.js dist/vendor.js -ms",
36-
"post_jspm-bundle-vendor": "cp jspm.config.js jspm_packages/system.js dist/",
37-
"_jspm-build-app": "jspm build src/app - bundle-config.vendor.js dist/app.js",
34+
"_jspm-bundle-vendor-dev": "jspm bundle configs/vendor.config.dev.js temp/vendor.dev.js -d",
35+
"_jspm-bundle-vendor-prod": "jspm bundle configs/vendor.config.prod.js dist/vendor.prod.js -ms",
36+
"post_jspm-bundle-vendor-prod": "cp jspm.config.js jspm_packages/system.js dist/",
37+
"_jspm-build-app": "jspm build src/app - configs/vendor.config.prod.js dist/app.js",
3838
"regenerator": "cd temp && cp ../dist/app.js . && regenerator -r app.js > app.regenerator.js && mv app.regenerator.js ../dist/app.js "
3939
},
4040
"devDependencies": {

0 commit comments

Comments
 (0)