Skip to content

Commit

Permalink
Merge pull request Teradata#8 from Teradata/feature/upgrade-angular5.1
Browse files Browse the repository at this point in the history
chore(Upgrade to Angular 5.2.0)
  • Loading branch information
jeremysmartt authored Jan 26, 2018
2 parents c205d89 + aad1e45 commit e3e8a17
Show file tree
Hide file tree
Showing 6 changed files with 7,958 additions and 29 deletions.
44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@covalent/text-editor",
"version": "1.0.0-beta.1",
"version": "1.0.0-rc.1",
"private": false,
"description": "Covalent text and markdown editor component for Angular based on SimpleMDE",
"keywords": [
Expand Down Expand Up @@ -56,27 +56,27 @@
"Ilsun Park <ilsun.park@teradata.com>"
],
"dependencies": {
"@angular/core": "^4.0.0",
"@angular/compiler": "^4.0.0",
"@angular/common": "^4.0.0",
"@angular/forms": "^4.0.0",
"@angular/platform-browser": "^4.0.0",
"@angular/platform-browser-dynamic": "^4.0.0",
"@angular/router": "^4.0.0",
"rxjs": "^5.2.0",
"@angular/core": "^5.2.0",
"@angular/compiler": "^5.2.0",
"@angular/common": "^5.2.0",
"@angular/forms": "^5.2.0",
"@angular/platform-browser": "^5.2.0",
"@angular/platform-browser-dynamic": "^5.2.0",
"@angular/router": "^5.2.0",
"rxjs": "^5.5.2",
"hammerjs": "^2.0.8",
"zone.js": "0.8.12",
"zone.js": "^0.8.17",
"showdown": "1.6.4",
"simplemde": "^1.11.2"
},
"devDependencies": {
"@angular/cli": "1.0.0",
"@angular/compiler-cli": "^4.0.0",
"@angular/cli": "1.6.5",
"@angular/compiler-cli": "^5.2.0",
"@types/hammerjs": "^2.0.30",
"@types/jasmine": "2.5.38",
"@types/node": "~6.0.60",
"@types/selenium-webdriver": "^2.52.0",
"codelyzer": "~2.0.0",
"codelyzer": "~4.0.0",
"coveralls": "^2.12.0",
"glob": "^6.0.4",
"gulp": "3.9.1",
Expand All @@ -91,22 +91,22 @@
"karma": "~1.4.1",
"karma-chrome-launcher": "~2.0.0",
"karma-cli": "~1.0.1",
"karma-electron": "^5.1.1",
"karma-electron": "^5.2.2",
"karma-coverage-istanbul-reporter": "^0.3.0",
"karma-firefox-launcher": "^1.0.1",
"karma-jasmine": "^1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"merge2": "1.0.2",
"node-sass": "3.8.0",
"protractor": "~5.1.0",
"require-dir": "0.3.0",
"rollup": "^0.35.9",
"rollup-plugin-commonjs": "4.1.0",
"rollup-plugin-node-resolve": "2.0.0",
"require-dir": "0.3.2",
"rollup": "^0.41.6",
"rollup-plugin-commonjs": "8.0.2",
"rollup-plugin-node-resolve": "^3.0.0",
"semver": "5.2.0",
"ts-node": "~2.0.0",
"tslint": "^4.5.1",
"typescript": "2.3.2",
"electron": "^1.6.6"
"ts-node": "^3.0.4",
"tslint": "5.2.0",
"typescript": "~2.6.2",
"electron": "^1.8.1"
}
}
6 changes: 3 additions & 3 deletions src/platform/text-editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@covalent/text-editor",
"version": "1.0.0-beta.1",
"version": "1.0.0-rc.1",
"private": false,
"description": "Covalent text and markdown editor component for Angular based on SimpleMDE",
"main": "./text-editor.umd.js",
Expand Down Expand Up @@ -40,7 +40,7 @@
"simplemde": "^1.11.2"
},
"peerDependencies": {
"@angular/common": "^4.2.0",
"@angular/core": "^4.2.0"
"@angular/common": "^5.0.0",
"@angular/core": "^5.0.0"
}
}
6 changes: 3 additions & 3 deletions src/platform/text-editor/text-editor.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe('Component: TextEditor', () => {
@Component({
template: `
<div>
<td-text-editor #editor1></td-text-editor>
<td-text-editor #editor1></td-text-editor>
</div>`,
})
class TestTextEditorComponent {
Expand All @@ -116,7 +116,7 @@ class TestTextEditorComponent {
@Component({
template: `
<div>
<td-text-editor #editor1 [value]="Something"></td-text-editor>
<td-text-editor #editor1 [value]="Something"></td-text-editor>
</div>`,
})
class TestTextEditorResetComponent {
Expand All @@ -126,7 +126,7 @@ class TestTextEditorResetComponent {
@Component({
template: `
<div>
<td-text-editor #editor1 [options]="opts"></td-text-editor>
<td-text-editor #editor1 [options]="opts"></td-text-editor>
</div>`,
})
class TestTextEditorOptionsComponent {
Expand Down
4 changes: 3 additions & 1 deletion src/platform/text-editor/text-editor.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import { DomSanitizer } from '@angular/platform-browser';
import { DOCUMENT } from '@angular/platform-browser';
import { Observable } from 'rxjs/Observable';
import { Subject } from 'rxjs/Subject';
import * as SimpleMDECss from 'simplemde/dist/simplemde.min.css';
import * as SimpleMDE from 'simplemde';
// using 'import * as' not working in Angular 5 for some reason
/* tslint:disable-next-line */
let SimpleMDECss = require('simplemde/dist/simplemde.min.css');

const noop: any = () => {
// empty method
Expand Down
1 change: 1 addition & 0 deletions src/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
]
},
"include": [
"test.ts",
"**/*.spec.*"
]
}
Loading

0 comments on commit e3e8a17

Please sign in to comment.