Merge remote-tracking branch 'upstream/master'

ckeditor · Jan 31, 2023 · 3445927 · 3445927
2 parents 92036a5 + 6aaa0b7
commit 3445927
Show file tree

Hide file tree

Showing 21 changed files with 6,635 additions and 23 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -11,7 +11,7 @@ module.exports = {
 	'rules': {
 		'ckeditor5-rules/license-header': [ 'error', { headerLines: [
 			'/**',
-			' * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.',
+			' * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.',
 			' * For licensing, see LICENSE.md.',
 			' */'
 		] } ]

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
 coverage/
+.idea
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+# For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn lint-staged
diff --git a/.travis.yml b/.travis.yml
@@ -7,12 +7,17 @@ language: node_js
 services:
 - xvfb
 node_js:
-- node
+- lts/*
 cache:
 - node_modules
+before_install:
+- export START_TIME=$( date +%s )
 install:
 - npm install
 script:
 - npm run coverage
 - npm run test -- --browsers=Firefox
 - if [[ $TRAVIS_TEST_RESULT -eq 0 ]]; then cat coverage/lcov.info | ./node_modules/.bin/coveralls; fi
+after_script:
+- export END_TIME=$( date +%s )
+- ckeditor5-dev-ci-notify-travis-status
diff --git a/LICENSE.md b/LICENSE.md
@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 **CKEditor 5 component for Vue.js 3+** – https://github.com/ckeditor/ckeditor5-vue <br>
-Copyright (c) 2003-2022, [CKSource](http://cksource.com) Holding sp. z o.o. All rights reserved.
+Copyright (c) 2003-2023, [CKSource](http://cksource.com) Holding sp. z o.o. All rights reserved.
 
 Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).
 

diff --git a/package.json b/package.json
@@ -21,7 +21,9 @@
   "devDependencies": {
     "@babel/core": "^7.17.7",
     "@ckeditor/ckeditor5-build-classic": "^34.0.0",
-    "@ckeditor/ckeditor5-dev-env": "^30.3.5",
+    "@ckeditor/ckeditor5-dev-bump-year": "^32.0.1",
+    "@ckeditor/ckeditor5-dev-ci": "^32.0.1",
+    "@ckeditor/ckeditor5-dev-release-tools": "^32.0.1",
     "@ckeditor/ckeditor5-dev-utils": "^30.3.5",
     "@ckeditor/ckeditor5-utils": "^34.0.0",
     "@ckeditor/ckeditor5-watchdog": "^34.0.0",
@@ -32,6 +34,7 @@
     "chai": "^4.3.6",
     "eslint": "^7.32.0",
     "eslint-config-ckeditor5": "^4.0.0",
+    "husky": "^8.0.2",
     "karma": "^6.3.17",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^3.1.1",
@@ -42,6 +45,7 @@
     "karma-sinon": "^1.0.5",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-webpack": "^5.0.0",
+    "lint-staged": "^10.2.11",
     "lodash-es": "^4.17.21",
     "minimist": "^1.2.5",
     "mocha": "^7.2.0",
@@ -56,6 +60,7 @@
     "npm": ">=5.7.1"
   },
   "scripts": {
+    "postinstall": "node ./scripts/postinstall.js",
     "build": "webpack --mode production",
     "develop": "webpack --mode development --watch",
     "changelog": "node ./scripts/changelog.js",
@@ -82,5 +87,10 @@
   "homepage": "https://github.com/ckeditor/ckeditor5-vue",
   "eslintIgnore": [
     "dist/**"
-  ]
+  ],
+  "lint-staged": {
+    "**/*.js": [
+      "eslint --quiet"
+    ]
+  }
 }
diff --git a/scripts/bump-version.js b/scripts/bump-version.js
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
 /* eslint-env node */
 
-require( '@ckeditor/ckeditor5-dev-env' )
+require( '@ckeditor/ckeditor5-dev-release-tools' )
 	.bumpVersions( {
 		cwd: process.cwd(),
 		packages: null,

diff --git a/scripts/bump-year.js b/scripts/bump-year.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -17,7 +17,7 @@ git commit -am "Internal: Bumped the year." && git push
 
 */
 
-require( '@ckeditor/ckeditor5-dev-env' )
+require( '@ckeditor/ckeditor5-dev-bump-year' )
 	.bumpYear( {
 		cwd: process.cwd(),
 		globPatterns: [
@@ -27,6 +27,9 @@ require( '@ckeditor/ckeditor5-dev-env' )
 					dot: true
 				}
 			},
+			{
+				pattern: '.husky/*'
+			},
 			{
 				pattern: '!(coverage|.nyc_output|dist)/**'
 			}

diff --git a/scripts/changelog.js b/scripts/changelog.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
@@ -11,4 +11,4 @@
  * Scripts for generating the changelog before starting the release process.
  */
 
-require( '@ckeditor/ckeditor5-dev-env' ).generateChangelogForSinglePackage();
+require( '@ckeditor/ckeditor5-dev-release-tools' ).generateChangelogForSinglePackage();
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
@@ -0,0 +1,18 @@
+/**
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+'use strict';
+
+/* eslint-env node */
+
+const path = require( 'path' );
+const fs = require( 'fs' );
+const ROOT_DIRECTORY = path.join( __dirname, '..' );
+
+// When installing a repository as a dependency, the `.git` directory does not exist.
+// In such a case, husky should not attach its hooks as npm treats it as a package, not a git repository.
+if ( fs.existsSync( path.join( ROOT_DIRECTORY, '.git' ) ) ) {
+	require( 'husky' ).install();
+}
diff --git a/scripts/publish.js b/scripts/publish.js
@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 
 /* eslint-env node */
 
-require( '@ckeditor/ckeditor5-dev-env' )
+require( '@ckeditor/ckeditor5-dev-release-tools' )
 	.releaseSubRepositories( {
 		cwd: process.cwd(),
 		packages: null,

diff --git a/scripts/test.js b/scripts/test.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

diff --git a/scripts/utils/getkarmaconfig.js b/scripts/utils/getkarmaconfig.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

diff --git a/src/ckeditor.js b/src/ckeditor.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

diff --git a/src/plugin.js b/src/plugin.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

diff --git a/tests/_utils/mockeditor.js b/tests/_utils/mockeditor.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

diff --git a/tests/ckeditor.js b/tests/ckeditor.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

diff --git a/tests/plugin/integration.js b/tests/plugin/integration.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

diff --git a/tests/plugin/localcomponent.js b/tests/plugin/localcomponent.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */