Skip to content

Commit

Permalink
Merge pull request #63 from hallysonh/ng6
Browse files Browse the repository at this point in the history
Add Angular 6+ Support
  • Loading branch information
salemdar committed May 22, 2018
2 parents 95d0994 + cf7c5f4 commit 119c41f
Show file tree
Hide file tree
Showing 34 changed files with 4,488 additions and 3,316 deletions.
25 changes: 7 additions & 18 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
# Editor configuration, see http://editorconfig.org
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,css,scss,html}]
charset = utf-8

# 4 space indentation
[*.{js,css,scss,html}]
indent_style = space
indent_size = 4

# Matches the exact files either package.json or .travis.yml
[{package.json,.travis.yml,bower.json}]
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
64 changes: 32 additions & 32 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
#################
## Misc
#################
**/.DS_Store
nbproject
manifest.mf
build.xml
node_modules/*
npm-debug.log
yarn-error.log
coverage
*.metadata.json
bundles
dist
# See http://help.github.com/ignore-files/ for more about ignoring files.

#################
## JetBrains
#################
.idea
.project
.settings
# compiled output
/dist
/tmp
/out-tsc

############
## Windows
############
# dependencies
/node_modules

# Windows image file caches
Thumbs.db
# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# Folder config file
Desktop.ini
# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

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

# Mac crap
# System Files
.DS_Store

Thumbs.db
42 changes: 0 additions & 42 deletions .npmignore

This file was deleted.

41 changes: 24 additions & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
language: node_js

cache: yarn
sudo: required
dist: trusty

sudo: false
addons.apt:
update: true
sources: google-chrome
packages: google-chrome-stable

notifications:
email: false
language: node_js

node_js:
- "8"
cache:
yarn: true
directories:
- node_modules

branches:
except:
- "/^v\\d+\\.\\d+\\.\\d+$/"
notifications.email: false

before_install:
- export CHROME_BIN=chromium-browser
node_js: '8'

before_script:
- npm prune
branches.except: "/^v\\d+\\.\\d+\\.\\d+$/"

before_install:
- yarn global add greenkeeper-lockfile@1
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- greenkeeper-lockfile-update
script:
- yarn build
- yarn test
after_script:
- greenkeeper-lockfile-upload
after_success:
- yarn travis-deploy-once "yarn semantic-release"
48 changes: 48 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"ngx-cookie": {
"root": "lib",
"sourceRoot": "lib/src",
"projectType": "library",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "lib/tsconfig.lib.json",
"project": "lib/ng-package.json"
},
"configurations": {
"production": {
"project": "lib/ng-package.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "lib/src/test.ts",
"tsConfig": "lib/tsconfig.spec.json",
"karmaConfig": "lib/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"lib/tsconfig.lib.json",
"lib/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"defaultProject": "ngx-cookie"
}
32 changes: 0 additions & 32 deletions config/helpers.js

This file was deleted.

77 changes: 0 additions & 77 deletions config/karma.conf.js

This file was deleted.

Loading

0 comments on commit 119c41f

Please sign in to comment.