Skip to content

Commit

Permalink
Upgrade to angular 9 (#322)
Browse files Browse the repository at this point in the history
* Bump moment & codemirror

* Upgrade to angular 9 rc.4

* Update deps

* (release): 28.0.0-rc.1

* Disable Ivy

* Fix import of coerce-boolean

* Update moment import

* Prettier

* Extract template

* (release): 28.0.0-rc.3

* Remove unused imports

* Update travis config

* Ommit html from prettier check

* Bump packages

* Remove node_modules cache from travis build

* Remove cypress from travis

* Try bionic for travis

* Run prettier

* Update readme; demo page title
  • Loading branch information
marjan-georgiev authored and luisb90 committed Dec 17, 2019
1 parent e8eb67d commit 4bd8cd3
Show file tree
Hide file tree
Showing 77 changed files with 3,333 additions and 1,561 deletions.
14 changes: 10 additions & 4 deletions .travis.yml
@@ -1,25 +1,31 @@
language: node_js

dist: bionic

node_js:
- 12
- 'node'

cache:
directories:
- ~/.npm
- ~/.cache
- node_modules

addons:
chrome: stable
apt:
packages:
- libgconf-2-4
- libgconf-2-4

services:
- xvfb

before_install:
- export NG_CLI_ANALYTICS=ci

install:
- npm ci
- npm install
- npm run build
- npm run build:lib

script:
- npm run ci
8 changes: 4 additions & 4 deletions README.md
@@ -1,4 +1,4 @@
# ngx-ui [![Code Climate](https://codeclimate.com/github/swimlane/ngx-ui/badges/gpa.svg)](https://codeclimate.com/github/swimlane/ngx-ui)
# ngx-ui

Component & Style Library for Angular by Swimlane.

Expand All @@ -17,11 +17,11 @@ Run `npm run build:lib` to build ngx-ui. This must be done prior to building the

## Development server

Run `ng serve` to serve the demo at `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
Run `npm run start` to serve the demo at `http://localhost:4200/`. The app will automatically reload if you change any of the source files.

## Build
## Building

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.
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.

## Running tests

Expand Down
10 changes: 10 additions & 0 deletions angular.json
Expand Up @@ -17,6 +17,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist/ngx-ui",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down Expand Up @@ -51,6 +52,10 @@
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
}
Expand Down Expand Up @@ -105,6 +110,11 @@
"options": {
"tsConfig": "projects/swimlane/ngx-ui/tsconfig.lib.json",
"project": "projects/swimlane/ngx-ui/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/swimlane/ngx-ui/tsconfig.lib.prod.json"
}
}
},
"test": {
Expand Down
8 changes: 3 additions & 5 deletions cypress/integration/basic-spec.js
Expand Up @@ -10,16 +10,14 @@ describe('ngx-ui demo', () => {

const visitSection = str => {
return () => {
cy.get('ul.nav-items')
.contains('a', str)
.click();
cy.contains('h3', str).should('to.exist');
cy.visit('/inputs');
cy.get('.page-loader').should('not.be.visible', { timeout: 20000 });
};
};

describe('Forms', () => {
describe('Inputs', () => {
beforeEach(visitSection('Inputs'));
beforeEach(visitSection('/inputs'));

describe('Text Input', () => {
beforeEach(() => {
Expand Down

0 comments on commit 4bd8cd3

Please sign in to comment.