Merge tag '4.15.1' into demo

.github/workflows/update.yml

@@ -0,0 +1,44 @@
+name: Update CKEditor 4 submodule
+
+on:
+  schedule:
+  - cron: "0 0,10,16 * * *"
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        branch: [master, major]
+
+    steps:
+      - name: Fetch changes
+        # https://github.com/marketplace/actions/checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ matrix.branch }}
+
+      - name: Checkout submodules
+        run: |
+          git submodule update --init --recursive
+
+      - name: Bump "ckeditor" submodule
+        run: |
+          cd ckeditor
+          git fetch --all
+          git checkout ${{ matrix.branch }}
+          cd ..
+          if [[ $(git diff origin/${{ matrix.branch }} | wc -c) -ne 0 ]]; then
+            git config --local user.email "[email protected]"
+            git config --local user.name "CKEditor Bot"
+            git add ckeditor
+            git commit -m "Update CKEditor 4 submodule HEAD."
+          fi
+
+      - name: Push changes
+        # https://github.com/marketplace/actions/github-push
+        uses: ad-m/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ matrix.branch }}

.gitmodules

@@ -1,9 +1,3 @@
 [submodule "ckeditor"]
 	path = ckeditor
 	url = https://github.com/ckeditor/ckeditor4.git
-[submodule "plugins/wsc"]
-	path = plugins/wsc
-	url = https://github.com/WebSpellChecker/ckeditor-plugin-wsc.git
-[submodule "plugins/scayt"]
-	path = plugins/scayt
-	url = https://github.com/WebSpellChecker/ckeditor-plugin-scayt.git

.nvmrc

@@ -0,0 +1 @@
+10

build.sh

@@ -4,32 +4,36 @@
 
 # Build CKEditor using the default settings (and build.js)
 
+# Move to the script directory.
+cd $(dirname $0)
+
 # Install NPM deps and move external plugins from `node_modules` to `plugins` directory.
-echo ""
-echo "Installing NPM dependencies..."
+if [ "$1" != "-v" ]; then
+	echo ""
+	echo "Installing NPM dependencies..."
 
-npm i
+	npm i
 
-echo ""
-echo "Copying plugins from NPM directory..."
-echo ""
+	if [[ ! -d "plugins" ]]; then
+		echo "Creating plugins directory..."
+		mkdir "plugins"
+	fi
 
-cp -r  "node_modules/ckeditor4-plugin-exportpdf" "plugins/exportpdf"
+	echo ""
+	echo "Copying plugins from NPM directory..."
+	echo ""
 
-# Move to the script directory.
-cd $(dirname $0)
+	cp -r "node_modules/ckeditor4-plugin-exportpdf" "plugins/exportpdf"
+	cp -r "node_modules/ckeditor-plugin-scayt" "plugins/scayt"
+	cp -r "node_modules/ckeditor-plugin-wsc" "plugins/wsc"
+fi
 
 # Use the ckeditor4 commit hash as the revision.
 cd ckeditor/
-rev=`git rev-parse --verify --short HEAD`
-CKEDITOR_VERSION=`node -pe "require('./package.json').version"`
+rev=$(git rev-parse --verify --short HEAD)
+CKEDITOR_VERSION=$(node -pe "require('./package.json').version")
 cd ..
 
-CKBUILDER_VERSION="2.3.2"
-CKBUILDER_URL="https://download.cksource.com/CKBuilder/$CKBUILDER_VERSION/ckbuilder.jar"
-
-MATHJAX_LIB_PATH="../mathjax/2.2"
-
 versionFolder="${CKEDITOR_VERSION// /-}"
 
 if [ "$1" == "-v" ]
@@ -40,6 +44,18 @@ fi
 
 set -e
 
+# Variables
+CKBUILDER_VERSION="2.3.2"
+CKBUILDER_URL="https://download.cksource.com/CKBuilder/$CKBUILDER_VERSION/ckbuilder.jar"
+MATHJAX_LIB_PATH="../mathjax/2.2"
+
+MSG_UPDATE_FAILED="Warning: The attempt to update ckbuilder.jar failed. The existing file will be used."
+MSG_DOWNLOAD_FAILED="It was not possible to download ckbuilder.jar"
+
+PROGNAME=$(basename "$0")
+ARGS=" $@ "
+JAVA_ARGS=${ARGS// -t / } # Remove -t from args
+
 echo "CKEditor Presets Builder"
 echo "========================"
 
@@ -75,11 +91,6 @@ then
 	target="$target-all"
 fi
 
-PROGNAME=$(basename $0)
-MSG_UPDATE_FAILED="Warning: The attempt to update ckbuilder.jar failed. The existing file will be used."
-MSG_DOWNLOAD_FAILED="It was not possible to download ckbuilder.jar"
-ARGS=" $@ "
-
 function error_exit
 {
 	echo "${PROGNAME}: ${1:-"Unknown Error"}" 1>&2
@@ -115,18 +126,14 @@ echo ""
 echo "Copying extra plugins..."
 cp -r plugins/* ckeditor/plugins/
 
-
 echo ""
 echo "Deleting $target..."
 rm -rf $target
 
-
 # Run the builder.
 echo ""
 echo "Building the '$1' preset..."
 
-JAVA_ARGS=${ARGS// -t / } # Remove -t from arrgs
-
 java -jar ckbuilder/$CKBUILDER_VERSION/ckbuilder.jar --build ckeditor $target $skip --version="$CKEDITOR_VERSION ($name)" --revision $rev --build-config presets/$1-build-config.js --no-zip --no-tar --overwrite $JAVA_ARGS
 
 if [ -f "presets/$1-contents.css" ]; then
@@ -135,7 +142,6 @@ fi
 cp presets/$1-ckeditor-config.js $target/ckeditor/config.js
 cp presets/README.md $target/ckeditor/
 
-
 echo "Removing added plugins..."
 cd ckeditor
 git clean -d -f -f
@@ -158,7 +164,7 @@ if [[ "$ARGS" == *\ \-t\ * ]]; then
 		dir=${dir%*/}
 		dir=${dir##*/}
 
-		if [ -d "plugins/$dir/tests" ]; then
+		if [ -d "plugins/$dir/tests" ] && [ -d "$target/ckeditor/plugins/$dir" ]; then
 			cp -r "plugins/$dir/tests" "$target/ckeditor/plugins/$dir/tests"
 			echo "    $dir"
 		fi
@@ -186,7 +192,7 @@ fi
 echo ""
 echo "Cleaning plugins directory from NPM artifacts..."
 
-rm -rf "plugins/exportpdf"
+rm -rf "plugins"
 
 echo ""
 echo "Build created into the \"build\" directory."

package.json

@@ -1,10 +1,8 @@
 {
+  "private": true,
   "name": "ckeditor4-presets",
   "version": "4.15.0",
   "description": "CKEditor 4 Presets Builder.",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "keywords": [
     "ckeditor4",
     "ckeditor",
@@ -27,7 +25,8 @@
   },
   "homepage": "https://ckeditor.com",
   "dependencies": {
-    "ckeditor4-plugin-exportpdf": "1.0.0"
-  },
-  "private": true
+    "ckeditor4-plugin-exportpdf": "1.0.1",
+    "ckeditor-plugin-scayt": "https://github.com/WebSpellChecker/ckeditor-plugin-scayt#release.5.7.0.0",
+    "ckeditor-plugin-wsc": "https://github.com/WebSpellChecker/ckeditor-plugin-wsc#release.5.7.0.0"
+  }
 }