Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 0b541d5

Browse files
teropanaomiblack
authored andcommitted
chore(upgrade) fix .gitignore for PhoneCat examples
Add a .gitignore under the upgrade example that keeps package.json, tsconfig.json and karma.conf.js. Also restore the files under each example.
1 parent 584d797 commit 0b541d5

File tree

16 files changed

+518
-0
lines changed

16 files changed

+518
-0
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
!karma.conf.js
2+
!package.json
3+
!tsconfig.json
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"version": "0.0.0",
3+
"private": true,
4+
"name": "angular-phonecat",
5+
"description": "A tutorial application for AngularJS",
6+
"repository": "https://github.com/angular/angular-phonecat",
7+
"license": "MIT",
8+
"dependencies": {
9+
"systemjs": "0.19.6"
10+
},
11+
"devDependencies": {
12+
"karma": "^0.12.16",
13+
"karma-chrome-launcher": "^0.1.4",
14+
"karma-firefox-launcher": "^0.1.3",
15+
"karma-jasmine": "~0.2.0",
16+
"protractor": "^3.0.0",
17+
"http-server": "^0.6.1",
18+
"tmp": "0.0.23",
19+
"bower": "^1.3.1",
20+
"shelljs": "^0.2.6",
21+
"typescript": "1.7.3"
22+
},
23+
"scripts": {
24+
"postinstall": "bower install",
25+
26+
"prestart": "npm install",
27+
"start": "http-server -a 0.0.0.0 -p 8000",
28+
29+
"pretest": "npm install",
30+
"test": "node node_modules/karma/bin/karma start test/karma.conf.js",
31+
"test-single-run": "node node_modules/karma/bin/karma start test/karma.conf.js --single-run",
32+
33+
"preupdate-webdriver": "npm install",
34+
"update-webdriver": "webdriver-manager update",
35+
36+
"preprotractor": "npm run update-webdriver",
37+
"protractor": "protractor test/protractor-conf.js",
38+
39+
"tsc": "tsc -p . -w"
40+
}
41+
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
module.exports = function(config){
2+
config.set({
3+
4+
basePath : '..',
5+
6+
// #docregion files
7+
files : [
8+
'app/bower_components/angular/angular.js',
9+
'app/bower_components/angular-route/angular-route.js',
10+
'app/bower_components/angular-resource/angular-resource.js',
11+
'app/bower_components/angular-animate/angular-animate.js',
12+
'app/bower_components/angular-mocks/angular-mocks.js',
13+
'node_modules/systemjs/dist/system.src.js',
14+
'test/karma_test_shim.js',
15+
{pattern: 'app/js/**/*.js', included: false, watched: true},
16+
{pattern: 'test/unit/**/*.js', included: false, watched: true}
17+
],
18+
// #enddocregion files
19+
20+
autoWatch : true,
21+
22+
frameworks: ['jasmine'],
23+
24+
browsers : ['Chrome', 'Firefox'],
25+
26+
plugins : [
27+
'karma-chrome-launcher',
28+
'karma-firefox-launcher',
29+
'karma-jasmine'
30+
],
31+
32+
junitReporter : {
33+
outputFile: 'test_out/unit.xml',
34+
suite: 'unit'
35+
},
36+
37+
logLevel: 'LOG_DEBUG'
38+
39+
});
40+
};
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"compilerOptions": {
3+
"target": "ES5",
4+
"module": "system",
5+
"sourceMap": true,
6+
"emitDecoratorMetadata": true,
7+
"experimentalDecorators": true,
8+
"removeComments": false
9+
},
10+
"exclude": [
11+
"node_modules"
12+
]
13+
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"version": "0.0.0",
3+
"private": true,
4+
"name": "angular-phonecat",
5+
"description": "A tutorial application for AngularJS",
6+
"repository": "https://github.com/angular/angular-phonecat",
7+
"license": "MIT",
8+
"dependencies": {
9+
"angular2": "2.0.0-alpha.53",
10+
"es6-promise": "^3.0.2",
11+
"es6-shim": "^0.33.3",
12+
"reflect-metadata": "0.1.2",
13+
"rxjs": "5.0.0-alpha.14",
14+
"zone.js": "0.5.8",
15+
"systemjs": "0.19.6"
16+
},
17+
"devDependencies": {
18+
"karma": "^0.12.16",
19+
"karma-chrome-launcher": "^0.1.4",
20+
"karma-firefox-launcher": "^0.1.3",
21+
"karma-jasmine": "~0.2.0",
22+
"protractor": "^3.0.0",
23+
"http-server": "^0.6.1",
24+
"tmp": "0.0.23",
25+
"bower": "^1.3.1",
26+
"shelljs": "^0.2.6",
27+
"typescript": "1.7.3"
28+
},
29+
"scripts": {
30+
"postinstall": "bower install",
31+
32+
"prestart": "npm install",
33+
"start": "http-server -a 0.0.0.0 -p 8000",
34+
35+
"pretest": "npm install",
36+
"test": "node node_modules/karma/bin/karma start test/karma.conf.js",
37+
"test-single-run": "node node_modules/karma/bin/karma start test/karma.conf.js --single-run",
38+
39+
"preupdate-webdriver": "npm install",
40+
"update-webdriver": "webdriver-manager update",
41+
42+
"preprotractor": "npm run update-webdriver",
43+
"protractor": "protractor test/protractor-conf.js",
44+
45+
"tsc": "tsc -p . -w"
46+
}
47+
}
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
module.exports = function(config){
2+
config.set({
3+
4+
basePath : '..',
5+
6+
// #docregion html
7+
files : [
8+
// #enddocregion html
9+
'app/bower_components/angular/angular.js',
10+
'app/bower_components/angular-route/angular-route.js',
11+
'app/bower_components/angular-resource/angular-resource.js',
12+
'app/bower_components/angular-animate/angular-animate.js',
13+
'app/bower_components/angular-mocks/angular-mocks.js',
14+
// #docregion ng2
15+
'node_modules/systemjs/dist/system.src.js',
16+
'node_modules/angular2/bundles/angular2.dev.js',
17+
// #enddocregion ng2
18+
// #docregion ng2-http
19+
'node_modules/angular2/bundles/http.dev.js',
20+
// #enddocregion ng2-http
21+
'test/karma_test_shim.js',
22+
{pattern: 'app/js/**/*.js', included: false, watched: true},
23+
{pattern: 'test/unit/**/*.js', included: false, watched: true},
24+
// #docregion ng2-testing
25+
'node_modules/angular2/bundles/testing.js',
26+
{pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false},
27+
// #enddocregion ng2-testing
28+
29+
// #docregion html
30+
{pattern: 'js/**/*.html', included: false, watched: true}
31+
],
32+
33+
proxies: {
34+
// required for component assests fetched by Angular's compiler
35+
"/js/": "/base/app/js"
36+
},
37+
// #enddocregion html
38+
39+
autoWatch : true,
40+
41+
frameworks: ['jasmine'],
42+
43+
browsers : ['Chrome', 'Firefox'],
44+
45+
plugins : [
46+
'karma-chrome-launcher',
47+
'karma-firefox-launcher',
48+
'karma-jasmine'
49+
],
50+
51+
junitReporter : {
52+
outputFile: 'test_out/unit.xml',
53+
suite: 'unit'
54+
},
55+
56+
logLevel: 'LOG_DEBUG'
57+
58+
});
59+
};
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"compilerOptions": {
3+
"target": "ES5",
4+
"module": "system",
5+
"moduleResolution": "node",
6+
"sourceMap": true,
7+
"emitDecoratorMetadata": true,
8+
"experimentalDecorators": true,
9+
"removeComments": false
10+
},
11+
"exclude": [
12+
"node_modules"
13+
]
14+
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"version": "0.0.0",
3+
"private": true,
4+
"name": "angular-phonecat",
5+
"description": "A tutorial application for AngularJS",
6+
"repository": "https://github.com/angular/angular-phonecat",
7+
"license": "MIT",
8+
"dependencies": {
9+
"angular2": "2.0.0-alpha.53",
10+
"es6-promise": "^3.0.2",
11+
"es6-shim": "^0.33.3",
12+
"reflect-metadata": "0.1.2",
13+
"rxjs": "5.0.0-alpha.14",
14+
"zone.js": "0.5.8",
15+
"systemjs": "0.19.6"
16+
},
17+
"devDependencies": {
18+
"karma": "^0.12.16",
19+
"karma-chrome-launcher": "^0.1.4",
20+
"karma-firefox-launcher": "^0.1.3",
21+
"karma-jasmine": "~0.2.0",
22+
"protractor": "^3.0.0",
23+
"http-server": "^0.6.1",
24+
"tmp": "0.0.23",
25+
"bower": "^1.3.1",
26+
"shelljs": "^0.2.6",
27+
"typescript": "1.7.3"
28+
},
29+
"scripts": {
30+
"postinstall": "bower install",
31+
32+
"prestart": "npm install",
33+
"start": "http-server -a 0.0.0.0 -p 8000",
34+
35+
"pretest": "npm install",
36+
"test": "node node_modules/karma/bin/karma start test/karma.conf.js",
37+
"test-single-run": "node node_modules/karma/bin/karma start test/karma.conf.js --single-run",
38+
39+
"preupdate-webdriver": "npm install",
40+
"update-webdriver": "webdriver-manager update",
41+
42+
"preprotractor": "npm run update-webdriver",
43+
"protractor": "protractor test/protractor-conf.js",
44+
45+
"tsc": "tsc -p . -w"
46+
}
47+
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// #docregion
2+
module.exports = function(config){
3+
config.set({
4+
basePath : '..',
5+
files : [
6+
'node_modules/systemjs/dist/system.src.js',
7+
'node_modules/angular2/bundles/angular2.dev.js',
8+
'node_modules/angular2/bundles/http.dev.js',
9+
'node_modules/angular2/bundles/testing.js',
10+
'node_modules/angular2/bundles/router.dev.js',
11+
'test/karma_test_shim.js',
12+
{pattern: 'app/js/**/*.js', included: false, watched: true},
13+
{pattern: 'app/**/*.html', included: false, watched: true},
14+
{pattern: 'test/unit/**/*.js', included: false, watched: true},
15+
{pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false}
16+
],
17+
autoWatch : true,
18+
frameworks: ['jasmine'],
19+
browsers : ['Chrome', 'Firefox'],
20+
plugins : [
21+
'karma-chrome-launcher',
22+
'karma-firefox-launcher',
23+
'karma-jasmine'
24+
],
25+
junitReporter : {
26+
outputFile: 'test_out/unit.xml',
27+
suite: 'unit'
28+
},
29+
proxies: {
30+
// required for component assests fetched by Angular's compiler
31+
"/app/js/": "/base/src/app/js/"
32+
}
33+
});
34+
};
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"compilerOptions": {
3+
"target": "ES5",
4+
"module": "system",
5+
"moduleResolution": "node",
6+
"sourceMap": true,
7+
"emitDecoratorMetadata": true,
8+
"experimentalDecorators": true,
9+
"removeComments": false
10+
},
11+
"exclude": [
12+
"node_modules"
13+
]
14+
}

0 commit comments

Comments
 (0)