Skip to content

Commit

Permalink
Cli migration (#120)
Browse files Browse the repository at this point in the history
* init non code

* everything but e2e fix

* e2e oops and zones fix

* fix the e2e test to pass
  • Loading branch information
johnpapa authored Apr 25, 2017
1 parent 66160f4 commit 444d878
Show file tree
Hide file tree
Showing 55 changed files with 489 additions and 410 deletions.
57 changes: 57 additions & 0 deletions .angular-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "blank"
},
"apps": [
{
"root": "src",
"outDir": "dist",
"assets": [
"assets",
"favicon.ico"
],
"index": "index.html",
"main": "main.ts",
"polyfills": "polyfills.ts",
"test": "test.ts",
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "my",
"styles": [
"styles.css"
],
"scripts": [],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",
"prod": "environments/environment.prod.ts"
}
}
],
"e2e": {
"protractor": {
"config": "./protractor.conf.js"
}
},
"lint": [
{
"project": "src/tsconfig.app.json"
},
{
"project": "src/tsconfig.spec.json"
},
{
"project": "e2e/tsconfig.e2e.json"
}
],
"test": {
"karma": {
"config": "./karma.conf.js"
}
},
"defaults": {
"styleExt": "css",
"component": {}
}
}
5 changes: 2 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# http://editorconfig.org
# Editor configuration, see http://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = 0
max_line_length = off
trim_trailing_whitespace = false
51 changes: 42 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,42 @@
system-config.js*
app/**/*.js
app/**/*.map
node_modules
jspm_packages
bower_components
aot/*
dist/*
yarn.lock
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
testem.log
/typings

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db
7 changes: 0 additions & 7 deletions app/main-aot.ts

This file was deleted.

8 changes: 0 additions & 8 deletions app/main.ts

This file was deleted.

10 changes: 0 additions & 10 deletions bs-config.js

This file was deleted.

14 changes: 14 additions & 0 deletions e2e/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { BlankPage } from './app.po';

describe('blank App', () => {
let page: BlankPage;

beforeEach(() => {
page = new BlankPage();
});

it('should display message saying app works', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Tour of Heroes');
});
});
11 changes: 11 additions & 0 deletions e2e/app.po.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { browser, element, by } from 'protractor';

export class BlankPage {
navigateTo() {
return browser.get('/');
}

getParagraphText() {
return element(by.css('my-root h1')).getText();
}
}
12 changes: 12 additions & 0 deletions e2e/tsconfig.e2e.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"types":[
"jasmine",
"node"
]
}
}
75 changes: 0 additions & 75 deletions gulpfile.js

This file was deleted.

23 changes: 0 additions & 23 deletions index-aot-gzip.html

This file was deleted.

24 changes: 0 additions & 24 deletions index-aot.html

This file was deleted.

26 changes: 0 additions & 26 deletions index-jit.html

This file was deleted.

26 changes: 0 additions & 26 deletions index.html

This file was deleted.

Loading

0 comments on commit 444d878

Please sign in to comment.