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

Commit 0143d8f

Browse files
authored
feat(cli-quickstart): add updated cli-quickstart (#3112)
* feat(cli-quickstart): add updated cli-quickstart * incorporate Ward's feedback
1 parent 9fb5e0a commit 0143d8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+526
-469
lines changed

public/docs/_examples/_boilerplate/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"start:webpack": "webpack-dev-server --inline --progress --port 8080",
1818
"test:webpack": "karma start karma.webpack.conf.js",
1919
"build:webpack": "rimraf dist && webpack --config config/webpack.prod.js --bail",
20-
"build:cli": "ng build",
20+
"build:cli": "ng build --no-progress",
2121
"build:aot": "ngc -p tsconfig-aot.json && rollup -c rollup-config.js",
2222
"build:babel": "babel app -d app --extensions \".es6\" --source-maps",
2323
"copy-dist-files": "node ./copy-dist-files.js",
@@ -27,6 +27,8 @@
2727
"author": "",
2828
"license": "MIT",
2929
"dependencies": {},
30-
"devDependencies": {},
30+
"devDependencies": {
31+
"angular-cli": "^1.0.0-beta.26"
32+
},
3133
"repository": {}
3234
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'use strict'; // necessary for es6 output in node
1+
'use strict'; // necessary for es6 output in node
22

33
import { browser, element, by } from 'protractor';
44

@@ -8,7 +8,7 @@ describe('cli-quickstart App', () => {
88
});
99

1010
it('should display message saying app works', () => {
11-
let pageTitle = element(by.css('cli-quickstart-app h1')).getText();
11+
let pageTitle = element(by.css('app-root h1')).getText();
1212
expect(pageTitle).toEqual('My First Angular App');
1313
});
1414
});

public/docs/_examples/cli-quickstart/ts/.gitignore

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,21 @@
66

77
# dependencies
88
/node_modules
9-
/bower_components
109

1110
# IDEs and editors
1211
/.idea
12+
.project
13+
.classpath
14+
.c9/
15+
*.launch
16+
.settings/
17+
18+
# IDE - VSCode
19+
.vscode/
20+
!.vscode/settings.json
21+
!.vscode/tasks.json
22+
!.vscode/launch.json
23+
!.vscode/extensions.json
1324

1425
# misc
1526
/.sass-cache
@@ -18,6 +29,7 @@
1829
/libpeerconnection.log
1930
npm-debug.log
2031
testem.log
32+
/typings
2133

2234
# e2e
2335
/e2e/*.js
@@ -27,12 +39,4 @@ testem.log
2739
.DS_Store
2840
Thumbs.db
2941

30-
# angular.io overrides
31-
!angular-cli.json
32-
!angular-cli-build.js
33-
!config/environment.js
34-
!config/karma-test.js
35-
!config/karma.conf.js
36-
!config/protractor.conf.js
37-
!src/typings.d.ts
38-
!src/tsconfig.json
42+
!src/styles.css
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# MyApp
2+
3+
This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.25.5.
4+
5+
## Development server
6+
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
7+
8+
## Code scaffolding
9+
10+
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class/module`.
11+
12+
## Build
13+
14+
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
15+
16+
## Running unit tests
17+
18+
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
19+
20+
## Running end-to-end tests
21+
22+
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
23+
Before running the tests make sure you are serving the app via `ng serve`.
24+
25+
## Deploying to GitHub Pages
26+
27+
Run `ng github-pages:deploy` to deploy to GitHub Pages.
28+
29+
## Further help
30+
31+
To get more help on the `angular-cli` use `ng help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

public/docs/_examples/cli-quickstart/ts/angular-cli-build.js

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,59 @@
11
{
22
"project": {
3-
"version": "1.0.0-beta.5",
4-
"name": "cli-quickstart"
3+
"version": "1.0.0-beta.25.5",
4+
"name": "my-app"
55
},
66
"apps": [
77
{
8-
"main": "src/main.ts",
9-
"tsconfig": "src/tsconfig.json",
10-
"mobile": false
8+
"root": "src",
9+
"outDir": "dist",
10+
"assets": [
11+
"assets",
12+
"favicon.ico"
13+
],
14+
"index": "index.html",
15+
"main": "main.ts",
16+
"test": "test.ts",
17+
"tsconfig": "tsconfig.json",
18+
"prefix": "app",
19+
"mobile": false,
20+
"styles": [
21+
"styles.css"
22+
],
23+
"scripts": [],
24+
"environments": {
25+
"source": "environments/environment.ts",
26+
"dev": "environments/environment.ts",
27+
"prod": "environments/environment.prod.ts"
28+
}
1129
}
1230
],
1331
"addons": [],
1432
"packages": [],
1533
"e2e": {
1634
"protractor": {
17-
"config": "config/protractor.conf.js"
35+
"config": "./protractor.conf.js"
1836
}
1937
},
2038
"test": {
2139
"karma": {
22-
"config": "config/karma.conf.js"
40+
"config": "./karma.conf.js"
2341
}
2442
},
2543
"defaults": {
26-
"prefix": "app",
27-
"sourceDir": "src",
2844
"styleExt": "css",
29-
"prefixInterfaces": false
45+
"prefixInterfaces": false,
46+
"inline": {
47+
"style": false,
48+
"template": false
49+
},
50+
"spec": {
51+
"class": false,
52+
"component": true,
53+
"directive": true,
54+
"module": false,
55+
"pipe": true,
56+
"service": true
57+
}
3058
}
3159
}

public/docs/_examples/cli-quickstart/ts/config/environment.dev.ts

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

public/docs/_examples/cli-quickstart/ts/config/environment.js

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

public/docs/_examples/cli-quickstart/ts/config/karma.conf.js

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

public/docs/_examples/cli-quickstart/ts/config/protractor.conf.js

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

0 commit comments

Comments
 (0)