Skip to content

Commit

Permalink
Angular 6 (#151)
Browse files Browse the repository at this point in the history
* update libs and add package lock

* add misssing gitignore files

* upgrade ACS blueprint to Angular 6

* update test

* update travis config

* remove rxjs-compat

* fix lint error

* upgrade ACS+APS blueprint

* update test

* upgrade APS template

* remove rxjs-compat

* remove unused import

* disable faulty tests

* update tests
  • Loading branch information
DenysVuika authored and eromano committed Aug 10, 2018
1 parent ebc76e2 commit edf2b2f
Show file tree
Hide file tree
Showing 73 changed files with 51,453 additions and 629 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -6,4 +6,3 @@ coverage
.history/
local.log
generator-ng2-alfresco-app.iml
/package-lock.json
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -32,7 +32,7 @@ jobs:
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
script: cd app/templates/adf-cli-acs-template && npm install && npm test -- --single-run
script: cd app/templates/adf-cli-acs-template && npm install && npm test -- --watch=false
- stage: acs-e2e
before_install:
- "export DISPLAY=:99.0"
Expand All @@ -42,7 +42,7 @@ jobs:
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
script: cd app/templates/adf-cli-aps-template && npm install && npm test -- --single-run
script: cd app/templates/adf-cli-aps-template && npm install && npm test -- --watch=false
- stage: aps-e2e
before_install:
- "export DISPLAY=:99.0"
Expand All @@ -52,7 +52,7 @@ jobs:
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
script: cd app/templates/adf-cli-acs-aps-template && npm install && npm test -- --single-run
script: cd app/templates/adf-cli-acs-aps-template && npm install && npm test -- --watch=false
- stage: acs-aps-e2e
before_install:
- "export DISPLAY=:99.0"
Expand Down
6 changes: 3 additions & 3 deletions __tests__/app.js
Expand Up @@ -21,7 +21,7 @@ describe('Alfresco component generator', () => {
it('creates files', () => {
const expected = [
'.editorconfig',
'.angular-cli.json',
'angular.json',
'.npmignore',
'.travis.yml',
'LICENSE',
Expand Down Expand Up @@ -75,7 +75,7 @@ describe('Alfresco component generator', () => {

it('creates files', () => {
const expected = [
'.angular-cli.json',
'angular.json',
'.editorconfig',
'.npmignore',
'.travis.yml',
Expand Down Expand Up @@ -135,7 +135,7 @@ describe('Alfresco component generator', () => {
it('creates files', () => {
const expected = [
'.editorconfig',
'.angular-cli.json',
'angular.json',
'.npmignore',
'.travis.yml',
'LICENSE',
Expand Down
106 changes: 0 additions & 106 deletions app/templates/adf-cli-acs-aps-template/.angular-cli.json

This file was deleted.

46 changes: 46 additions & 0 deletions app/templates/adf-cli-acs-aps-template/.gitignore
@@ -0,0 +1,46 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc
/src/versions.json

# 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
.history

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

# e2e
/e2e/*.js
/e2e/*.map
/e2e-output

# System Files
.DS_Store
Thumbs.db

0 comments on commit edf2b2f

Please sign in to comment.