Merge pull request #28 from tinymce/feature/INT-2767

INT-2767: Prepare for TinyMCE 6; change license to MIT

Author: tiny-james

CHANGELOG.md

@@ -4,32 +4,36 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## 2.0.0
+### Changed
+- License changed to MIT (from Apache 2) this matches TinyMCE 6 license
+- Changed default cloudChannel to `'6'`.
+
 ### Fixed
 - Updated dependencies to latest available versions.
 
-## [1.2.0] - 2021-03-11
+## 1.2.0 - 2021-03-11
 ### Fixed
 - Updated dependencies to latest available versions.
 
-## [1.1.0] - 2021-01-07
+## 1.1.0 - 2021-01-07
 ### Changed
 - Converted demo server app to TypeScript.
 - Updated dependencies.
 - Added eslint.
 - Adopted beehive-flow branching and versioning process/tooling.
 
-## [1.0.2] - 2020-09-22
+## 1.0.2 - 2020-09-22
 ### Changed
 - Updated dependencies to latest available versions
 
-## [1.0.1] - 2020-08-31
+## 1.0.1 - 2020-08-31
 ### Added
 - Added CDN demo.
 
 ### Changed
 - Updated README.md
 
-## [1.0.0] - 2020-08-27
+## 1.0.0 - 2020-08-27
 ### Added
 - Initial release of web component wrapper around TinyMCE.

Jenkinsfile

@@ -1,5 +1,5 @@
 #!groovy
-@Library('waluigi@v4.0.0') _
+@Library('waluigi@v5.0.0') _
 
 standardProperties()
 
@@ -12,7 +12,7 @@ node("primary") {
   }
 
   stage("dependencies") {
-    sh "yarn install --frozen-lockfile"
+    yarnInstall()
   }
 
   stage("stamp") {

LICENSE.txt

@@ -1,13 +1,21 @@
-Copyright 2020-present Tiny Technologies, Inc.
+MIT License
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+Copyright (c) 2022 Ephox Corporation DBA Tiny Technologies, Inc.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package.json

@@ -21,7 +21,7 @@
     "webcomponent"
   ],
   "author": "Tiny Technologies",
-  "license": "Apache-2.0",
+  "license": "MIT",
   "devDependencies": {
     "@ephox/agar": "^7.0.1",
     "@ephox/bedrock-client": "^13.0.0",
@@ -33,22 +33,22 @@
     "@tinymce/eslint-plugin": "^2.0.1",
     "@types/esm": "^3.2.0",
     "@types/express": "^4.17.13",
-    "@types/node": "^17.0.21",
-    "@typescript-eslint/eslint-plugin": "^5.13.0",
-    "@typescript-eslint/parser": "^5.13.0",
-    "eslint": "^8.10.0",
+    "@types/node": "^17.0.22",
+    "@typescript-eslint/eslint-plugin": "^5.16.0",
+    "@typescript-eslint/parser": "^5.16.0",
+    "eslint": "^8.11.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "esm": "^3.2.25",
     "express": "^4.17.3",
-    "rollup": "^2.69.0",
-    "tinymce": "^5.10.0",
-    "ts-loader": "^9.2.7",
-    "ts-node": "^10.6.0",
+    "rollup": "^2.70.1",
+    "tinymce": "^6.0.0",
+    "ts-loader": "^9.2.8",
+    "ts-node": "^10.7.0",
     "typescript": "~4.6.2",
-    "webpack": "^5.0.0"
+    "webpack": "^5.70.0"
   },
   "dependencies": {},
-  "version": "1.2.1-rc",
+  "version": "2.0.0-rc",
   "name": "@tinymce/tinymce-webcomponent"
 }