Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump dependencies (i.a. Angular 8->10) #124

Merged
merged 11 commits into from Aug 5, 2020
Merged

Bump dependencies (i.a. Angular 8->10) #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d46f0f6
Run 'npm audit fix' and downgrade '@angular-devkit/build-angular'.
Dumluregn Jul 29, 2020
121facc
Bump 'tsickle' dep.
Dumluregn Jul 29, 2020
8f22e22
Update 'ng-packagr' and 'typescript' packages.
Dumluregn Jul 29, 2020
86d6529
Update Angular from 8 to 10.
Dumluregn Jul 29, 2020
946975e
Fix failing test on Chrome.
Dumluregn Jul 29, 2020
158331c
Restore accidentally changed Karma config.
Dumluregn Jul 29, 2020
6f2e774
Update the rest of deps.
Dumluregn Jul 29, 2020
3124e19
Remove budgets warning.
Dumluregn Aug 4, 2020
fa0f9c5
Restore removed tslint rule.
Dumluregn Aug 4, 2020
5fb0d7c
Remove the deprecated linter rule after all.
Dumluregn Aug 4, 2020
4ec55d8
Added changelog entry. [skip ci]
jacekbogdanski Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
@@ -1,5 +1,11 @@
# CKEditor 4 Angular Integration Changelog

## ckeditor4-angular 1.2.3

Other Changes:

* [#98](https://github.com/ckeditor/ckeditor4-angular/issues/98): Updated repository dependencies (no changes in the actual `ckeditor4-angular` package).

## ckeditor4-angular 1.2.2

Fixed Issues:
Expand Down
1 change: 1 addition & 0 deletions angular.json
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
jacekbogdanski marked this conversation as resolved.
Show resolved Hide resolved
"outputPath": "samples/ckeditor4-angular",
"index": "src/index.html",
"main": "src/main.ts",
Expand Down
2 changes: 1 addition & 1 deletion e2e/tsconfig.e2e.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "commonjs",
Expand Down
22,100 changes: 12,829 additions & 9,271 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

143 changes: 71 additions & 72 deletions package.json
View file
Open in desktop
@@ -1,74 +1,73 @@
{
"name": "ckeditor4-angular",
"version": "1.2.2",
"description": "Official CKEditor 4 component for Angular.",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"build-package": "node ./scripts/build-package.js",
"test": "node ./scripts/test.js",
"lint": "ng lint",
"e2e": "ng e2e",
"bump": "node ./scripts/bump.js",
"publish:dry": "npm publish dist/ --dry-run",
"publish": "npm publish dist/",
"preversion": "npm test",
"version": "npm run build-package && git add -f dist/",
"postversion": "git rm -r --cached dist/ && git commit -m \"Clean after release [ci skip]\" && git push origin && git push origin --tags"
},
"author": "CKSource (https://cksource.com/)",
"license": "(GPL-2.0-or-later OR LGPL-2.1-or-later OR MPL-1.1-or-later)",
"homepage": "https://ckeditor.com/",
"bugs": "https://github.com/ckeditor/ckeditor4-angular/issues",
"repository": {
"type": "git",
"url": "https://github.com/ckeditor/ckeditor4-angular.git"
},
"private": true,
"dependencies": {
"@angular/animations": "^8.2.13",
"@angular/common": "^8.2.13",
"@angular/compiler": "^8.2.13",
"@angular/core": "^8.2.13",
"@angular/forms": "^8.2.13",
"@angular/platform-browser": "^8.2.13",
"@angular/platform-browser-dynamic": "^8.2.13",
"@angular/router": "^8.2.13",
"core-js": "^3.3.6",
"load-script": "^1.0.0",
"minimalist": "^1.0.0",
"rxjs": "~6.5.3",
"tslib": "^1.10.0",
"zone.js": "^0.10.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.803.17",
"@angular/cli": "^8.3.17",
"@angular/compiler-cli": "^8.2.13",
"@angular/language-service": "^8.2.13",
"@types/jasmine": "^3.4.5",
"@types/jasminewd2": "^2.0.8",
"@types/node": "^12.12.5",
"classlist.js": "^1.1.20150312",
"codelyzer": "^5.2.0",
"fs-extra": "^8.1.0",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.4.1",
"karma-browserstack-launcher": "^1.5.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "^2.1.0",
"karma-firefox-launcher": "^1.2.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"karma-spec-reporter": "0.0.32",
"ng-packagr": "^5.7.1",
"protractor": "^5.4.3",
"ts-node": "~8.4.1",
"tsickle": "^0.37.0",
"tslint": "~5.20.0",
"typescript": "~3.5.3",
"wait-until-promise": "^1.0.0"
}
"name": "ckeditor4-angular",
"version": "1.2.2",
"description": "Official CKEditor 4 component for Angular.",
"scripts": {
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"build-package": "node ./scripts/build-package.js",
"test": "node ./scripts/test.js",
"lint": "ng lint",
"e2e": "ng e2e",
"bump": "node ./scripts/bump.js",
"publish:dry": "npm publish dist/ --dry-run",
"publish": "npm publish dist/",
"preversion": "npm test",
"version": "npm run build-package && git add -f dist/",
"postversion": "git rm -r --cached dist/ && git commit -m \"Clean after release [ci skip]\" && git push origin && git push origin --tags"
},
"author": "CKSource (https://cksource.com/)",
"license": "(GPL-2.0-or-later OR LGPL-2.1-or-later OR MPL-1.1-or-later)",
"homepage": "https://ckeditor.com/",
"bugs": "https://github.com/ckeditor/ckeditor4-angular/issues",
"repository": {
"type": "git",
"url": "https://github.com/ckeditor/ckeditor4-angular.git"
},
"private": true,
"dependencies": {
"@angular/animations": "^10.0.6",
"@angular/common": "^10.0.6",
"@angular/compiler": "^10.0.6",
"@angular/core": "^10.0.6",
"@angular/forms": "^10.0.6",
"@angular/platform-browser": "^10.0.6",
"@angular/platform-browser-dynamic": "^10.0.6",
"@angular/router": "^10.0.6",
"core-js": "^3.3.6",
"load-script": "^1.0.0",
"minimalist": "^1.0.0",
"rxjs": "^6.6.0",
"tslib": "^2.0.0",
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.4",
"@angular/cli": "^10.0.4",
"@angular/compiler-cli": "^10.0.6",
"@angular/language-service": "^10.0.6",
"@types/jasmine": "^3.4.5",
"@types/jasminewd2": "^2.0.8",
"@types/node": "^14.0.27",
"classlist.js": "^1.1.20150312",
"codelyzer": "^6.0.0",
"fs-extra": "~9.0.0",
"jasmine-core": "^3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma-browserstack-launcher": "^1.5.1",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-firefox-launcher": "^1.2.0",
"karma-jasmine": "~3.3.0",
"karma-jasmine-html-reporter": "^1.5.0",
"karma-spec-reporter": "0.0.32",
"ng-packagr": "^10.0.0",
"protractor": "~7.0.0",
"ts-node": "~8.10.2",
"tslint": "~6.1.0",
"typescript": "~3.9.0",
"wait-until-promise": "^1.0.0"
}
}
0 src/browserslist → src/.browserslistrc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/app/simple-usage/simple-usage.component.spec.ts
View file
Open in desktop
Expand Up @@ -92,7 +92,7 @@ describe( 'SimpleUsageComponent', () => {
} );

it( 'should be synced with editorData property', () => {
getEditorNamespace( ckeditorComponents[ 0 ].editorUrl )
return getEditorNamespace( ckeditorComponents[ 0 ].editorUrl )
jacekbogdanski marked this conversation as resolved.
Show resolved Hide resolved
.then( CKEDITOR => {
if ( CKEDITOR.env.ie ) {
// Ignore on IE11/Edge for now since it throws "Permission denied" error (#72).
Expand Down
11 changes: 7 additions & 4 deletions src/tsconfig.app.json
View file
Open in desktop
@@ -1,11 +1,14 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"types": []
},
"exclude": [
"test.ts",
"**/*.spec.ts"
"files": [
"main.ts",
"polyfills.ts"
],
"include": [
"src/**/*.d.ts"
]
}
2 changes: 1 addition & 1 deletion src/tsconfig.spec.json
View file
Open in desktop
@@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/spec",
"types": [
Expand Down
22 changes: 22 additions & 0 deletions tsconfig.base.json
View file
Open in desktop
@@ -0,0 +1,22 @@
{
jacekbogdanski marked this conversation as resolved.
Show resolved Hide resolved
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"importHelpers": true,
"outDir": "./samples/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2020",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2017",
"dom"
]
}
}
40 changes: 19 additions & 21 deletions tsconfig.json
View file
Open in desktop
@@ -1,22 +1,20 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.

To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./",
"importHelpers": true,
"outDir": "./samples/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2015",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"target": "es5",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2017",
"dom"
]
}
}
"files": [],
"references": [
{
"path": "./src/tsconfig.app.json"
},
{
"path": "./src/tsconfig.spec.json"
},
{
"path": "./e2e/tsconfig.e2e.json"
}
]
}
3 changes: 1 addition & 2 deletions tslint.json
View file
Open in desktop
Expand Up @@ -70,8 +70,7 @@
"no-string-throw": true,
"no-switch-case-fall-through": true,
"no-trailing-whitespace": true,
"no-unnecessary-initializer": true,
"no-use-before-declare": true,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This rule seems to make sense, why it has been removed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It got removed together with a Typescript version bump as it is deprecated since 2.9 - see palantir/tslint#4695. The explanation for the removal is here (tl;dr - it isn't useful when you don't use var keyword, and we don't in the integration code). However, as mentioned in this comment, there are still cases where it may be useful, so I'll bring it back.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't know that, nice research 👍 But if it has been deprecated, maybe we should keep it removed then?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, until we fix #30 it doesn't really matter 😄 but sure, let's keep it away while we can and if we encounter a valid use case for it in our code we can restore it.

"no-unnecessary-initializer": true,
"no-var-keyword": true,
"object-literal-sort-keys": false,
"one-line": [
Expand Down