Skip to content

Commit 3604698

Browse files
committed
cleanup
1 parent cea5753 commit 3604698

File tree

5 files changed

+34
-23
lines changed

5 files changed

+34
-23
lines changed

bs-config.json

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
{
2-
"port": 3000,
3-
"files": ["./**/*.{html,htm,css,js}"],
4-
"server": { "baseDir": "./" },
5-
"watchOptions": {
6-
"ignored": [
7-
"node_modules",
8-
"bower_components",
9-
"_test-output",
10-
"*.spec.*"
11-
]
12-
}
2+
"port": 3001,
3+
"files": [
4+
"./**/*.{html,htm,css,js}"
5+
],
6+
"server": {
7+
"baseDir": "./"
8+
},
9+
"watchOptions": {
10+
"ignored": [
11+
"node_modules",
12+
"bower_components",
13+
"_test-output",
14+
"*.spec.*"
15+
]
16+
}
1317
}

index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434
<script src="//js.arcgis.com/4.0/"></script>
3535
<script src="//npmcdn.com/esri-system-js@0.0.3/dist/esriSystem.js"></script>
3636

37-
<!--<script src="systemjs.config.js"></script>-->
38-
<script src="systemjs.config.cdn.js"></script>
37+
<!-- non-cdn config works w/ chrome dev tools -->
38+
<script src="systemjs.config.js"></script>
39+
<!--<script src="systemjs.config.cdn.js"></script>-->
3940
</head>
4041

4142
<!-- 3. Display the application -->

package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
"scripts": {
66
"preinstall": "bower install",
77
"start": "tsc && concurrently \"tsc -w\" \"lite-server\" ",
8-
"docker-build": "docker build -t ng2-quickstart .",
9-
"docker": "npm run docker-build && docker run -it --rm -p 3000:3000 -p 3001:3001 ng2-quickstart",
10-
"e2e": "tsc && concurrently \"http-server\" \"protractor protractor.config.js\"",
118
"lint": "tslint ./app/**/*.ts -t verbose",
129
"lite": "lite-server",
1310
"postinstall": "typings install",
1411
"test": "tsc && concurrently \"tsc -w\" \"karma start karma.conf.js\"",
1512
"tsc": "tsc",
1613
"tsc:w": "tsc -w",
17-
"typings": "typings",
18-
"webdriver:update": "webdriver-manager update"
14+
"typings": "typings"
1915
},
2016
"keywords": [],
2117
"author": "",
@@ -57,7 +53,6 @@
5753
"karma-cli": "^0.1.2",
5854
"karma-htmlfile-reporter": "^0.2.2",
5955
"karma-jasmine": "^0.3.8",
60-
"protractor": "^3.3.0",
6156
"rimraf": "^2.5.2"
6257
},
6358
"repository": {}

systemjs.config.cdn.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
(function(global) {
66

7-
var ngVer = '@2.0.0-rc.2'; // lock in the angular package version; do not let it float to current!
7+
var ngVer = '@2.0.0-rc.3'; // lock in the angular package version; do not let it float to current!
88

99
// map tells the System loader where to look for things
1010
var map = {
@@ -13,6 +13,8 @@
1313
'@angular': 'https://npmcdn.com/@angular', // sufficient if we didn't pin the version
1414
'angular2-in-memory-web-api': 'https://npmcdn.com/angular2-in-memory-web-api', // get latest
1515
'rxjs': 'https://npmcdn.com/rxjs@5.0.0-beta.6',
16+
// 'ts': 'https://npmcdn.com/plugin-typescript@4.0.10/lib/plugin.js',
17+
// 'typescript': 'https://npmcdn.com/typescript@1.8.10/lib/typescript.js'
1618
};
1719

1820
// packages tells the System loader how to load when no filename and/or no extension
@@ -52,7 +54,17 @@
5254

5355
var config = {
5456
map: map,
55-
packages: packages
57+
packages: packages,
58+
// DEMO ONLY! REAL CODE SHOULD NOT TRANSPILE IN THE BROWSER
59+
// transpiler: 'ts',
60+
// typescriptOptions: {
61+
// tsconfig: true
62+
// },
63+
// meta: {
64+
// 'typescript': {
65+
// "exports": "ts"
66+
// }
67+
// }
5668
};
5769

5870
System.config(config);

tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
},
1313
"exclude": [
1414
"node_modules",
15-
"typings/main",
16-
"typings/main.d.ts"
15+
"bower_components"
1716
]
1817
}

0 commit comments

Comments
 (0)