Skip to content

Commit

Permalink
Fixed problems
Browse files Browse the repository at this point in the history
  • Loading branch information
AmitBenAmi committed Mar 28, 2017
1 parent 9d604a7 commit 3b0df4e
Show file tree
Hide file tree
Showing 28 changed files with 1,085 additions and 1 deletion.
19 changes: 19 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# http://editorconfig.org
root = true

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


[*.md]
max_line_length = 0
trim_trailing_whitespace = false

# Indentation override
#[lib/**.js]
#[{package.json,.travis.yml}]
#[**/**.js]
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.idea
node_modules
jspm_packages
npm-debug.log
debug.log
src/**/*.js
!src/systemjs.config.extras.js
!src/systemjs.config.js
!src/systemjs-angular-loader.js
*.js.map
e2e/**/*.js
e2e/**/*.js.map
_test-output
_temp
20 changes: 20 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
dist: trusty
sudo: required
language: node_js
node_js:
- "5"
os:
- linux
env:
global:
- DBUS_SESSION_BUS_ADDRESS=/dev/null
- DISPLAY=:99.0
- CHROME_BIN=chromium-browser
before_script:
- sh -e /etc/init.d/xvfb start
install:
- npm install
script:
- npm run lint
- npm run test:once
- npm run e2e
1 change: 0 additions & 1 deletion AngularJS
Submodule AngularJS deleted from 456b84
213 changes: 213 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
## Angular Documentation QuickStart Changelog
Upgraders: for a fresh start, consider running these commands
* `git clean -xdf`
* `npm install`

<a name="0.4.1"></a>
# 0.4.1 (2017-03-24)
* Replace systemjs-angular-loader with version that works for IE

<a name="0.4.0"></a>
# 0.4.0 (2017-03-24)
* Update to Angular 4.0.0

<a name="0.3.0"></a>
# 0.3.0 (2017-03-22)
* Remove moduleId with a systemjs loader.

<a name="0.2.22"></a>
# 0.2.22 (2017-01-05)
* Add `non-essential-files.txt` and instructions to use it to README

<a name="0.2.21"></a>
# 0.2.21 (2016-12-14)
* Update to in-memory-web-api v.0.2.1

<a name="0.2.20"></a>
# 0.2.20 (2016-12-07)
* Update to Angular 2.3.0

<a name="0.2.19"></a>
# 0.2.19 (2016-11-30)
* remove upgrade mappings from `systemjs.config.js` PR #301

<a name="0.2.18"></a>
# 0.2.18 (2016-11-30)
* remove `exclude` clause from `tsconfig.json`; it was just confusing people
* karma.config + karma-test-shim can handle multiple spec source paths (issue #294)
* cosmetic `app.component.spec.ts` changes
* cosmetic `karma.config.js` changes

<a name="0.2.17"></a>
# 0.2.17 (2016-11-16)
* Conform to updated QuickStart advice
* removed docker everywhere (was nice but not necessary)
* removed wallaby
* shrink styles.css
* refine tsconfig.json
* `AppComponent` uses interpolation

<a name="0.2.16"></a>
# 0.2.16 (2016-11-14)
* Update to Angular 2.2.0

<a name="0.2.15"></a>
# 0.2.15 (2016-10-29)
* Revert to Jasmine 2.4.1 because bug in 2.5.x (see [jasmine issue #1231](https://github.com/jasmine/jasmine/issues/1231))

<a name="0.2.14"></a>
# 0.2.14 (2016-10-29)
* Remove bootstrap.css install
* Angular v2.1.2

<a name="0.2.13"></a>
# 0.2.13 (2016-10-20)
* Protractor 4
* Move from `typings` to `@types`. See `tsconfig.json` changes.
* Angular v2.1.1

<a name="0.2.12"></a>
# 0.2.12 (2016-10-06)
* Angular v2.1.0

<a name="0.2.11"></a>
# 0.2.11 (2016-10-06)
* Angular v2.0.2
* License is MIT
* Current testing configuration
* No code changes

<a name="0.2.10"></a>
# 0.2.10 (2016-09-19)
* All "Angular 2" references become just "Angular"
* No code changes

<a name="0.2.9"></a>
# 0.2.9 (2016-09-14)
* Angular 2.0.0 version
* Update to Typescript 2.0.2
* Fix e2e test missing dir

<a name="0.2.8"></a>
# 0.2.8 (2016-09-01)
* remove @angular test libraries from system.js (now in shim)
* update test related files
* wallaby doesn't completely work. Researching.

<a name="0.2.7"></a>
# 0.2.7 (2016-08-31)
* Angular 2 RC6 version
* Updated new forms, router, angular2-in-memory-web-api, karma, core-js, rxjs and zone.js packages
* Removed router-deprecated package
* Updated karma.conf.js and systemjs.config.js

<a name="0.2.6"></a>
# 0.2.6 (2016-08-09)
* Angular 2 RC5 version
* Updated new forms, router and angular2-in-memory-web-api

<a name="0.2.5"></a>
# 0.2.5 (2016-06-30)
* Angular 2 RC4 version
* Updated new forms and router

<a name="0.2.4"></a>
# 0.2.4 (2016-06-21)
* Angular 2 RC3 version
* Add new forms and router
* Add support for TS e2e tests

<a name="0.2.3"></a>
# 0.2.3 (2016-06-15)
* Angular 2 RC2 version

<a name="0.2.2"></a>
# 0.2.2 (2016-05-21)
* Update to Typings 1.x

<a name="0.2.1"></a>
# 0.2.1 (2016-05-03)
* Angular 2 RC01 version

<a name="0.2.0"></a>
# 0.2.0 (2016-05-02)
* Angular 2 RC0 version

<a name="0.1.17"></a>
# 0.1.17 (2016-04-29)
* update packages
* Angular 2 beta 17
* RxJS 5.0.0-beta.6
* a2-in-memory-web-api 0.1.17

<a name="0.1.16"></a>
# 0.1.16 (2016-04-26)
* update packages
* Angular 2 beta 16
* a2-in-memory-web-api 0.1.6
* protractor 3.3.0
* typings 0.8.1
* zone.js 0.6.12

* added favicon.ico

* testing
- updated wallaby.js and karma.conf.js
- updated app.component.spec.ts


<a name="0.1.15"></a>
# 0.1.15 (2016-04-13)
* Add testing support
* npm scripts
* karma/jasmine
* protractor

* update packages
* Angular 2 beta 15
* lite-server 2.2.0
* systemjs 0.19.26
* typescript 1.8.10
* typings 0.7.12

* add run packages
* a2-in-memory-web-api

* add testing dev-dependency packages
* canonical-path: 0.0.2,
* http-server: ^0.9.0,
* jasmine-core: ~2.4.1,
* karma: ^0.13.22,
* karma-chrome-launcher: ^0.2.3,
* karma-cli: ^0.1.2,
* karma-htmlfile-reporter: ^0.2.2,
* karma-jasmine: ^0.3.8,
* protractor: ^3.2.2,
* rimraf: ^2.5.2

<a name="0.1.14"></a>
# 0.1.14 (2016-04-07)
* update packages
* Angular 2 beta 14
* lite-server 2.2.0
* typings 0.7.12

<a name="0.1.13"></a>
# 0.1.13 (2016-03-31)
* update packages
* Angular 2 beta 13

<a name="0.1.12"></a>
# 0.1.12 (2016-03-23)
* update packages
* Angular 2 beta 12
* zones 0.6.6
* remove es6-promise because no longer needed.

<a name="0.1.11"></a>
# 0.1.11 (2016-03-18)
* update packages
* Angular 2 beta 11
* zones 0.6.4
* typescript 1.8.9
* typings 0.7.9
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License

Copyright (c) 2014-2016 Google, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
14 changes: 14 additions & 0 deletions bs-config.e2e.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"open": false,
"logLevel": "silent",
"port": 8080,
"server": {
"baseDir": "src",
"routes": {
"/node_modules": "node_modules"
},
"middleware": {
"0": null
}
}
}
8 changes: 8 additions & 0 deletions bs-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"server": {
"baseDir": "src",
"routes": {
"/node_modules": "node_modules"
}
}
}
15 changes: 15 additions & 0 deletions e2e/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { browser, element, by } from 'protractor';

describe('QuickStart E2E Tests', function () {

let expectedMsg = 'Hello Angular';

beforeEach(function () {
browser.get('');
});

it('should display: ' + expectedMsg, function () {
expect(element(by.css('h1')).getText()).toEqual(expectedMsg);
});

});
13 changes: 13 additions & 0 deletions e2e/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"compilerOptions": {
"target": "es5",
"module": "commonjs",
"moduleResolution": "node",
"sourceMap": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"lib": [ "es2015", "dom" ],
"noImplicitAny": true,
"suppressImplicitAnyIndexErrors": true
}
}
Loading

0 comments on commit 3b0df4e

Please sign in to comment.