Update dependencies, cleanup, bugfixes

Jenkinsfile

@@ -57,6 +57,7 @@ spec:
 	}
 
 	parameters {
+		booleanParam(name: 'checkGitCommit',            defaultValue: false, description: 'If set to true, the current git revision is compared with the git revision of the last successful build. If they are equal, the build is skipped and env.BUILD_SKIPPED is set to true')
 		booleanParam(name: 'unitTests',                 defaultValue: true,  description: 'Whether to run the unit tests')
 		booleanParam(name: 'release',                   defaultValue: false, description: 'Whether to perform a release')
 		booleanParam(name: 'releaseWithNewChangesOnly', defaultValue: true,  description: 'Release: Abort the build if there are no new changes')
@@ -75,7 +76,31 @@ spec:
 	}
 
 	stages {
+		stage('Check git commit') {
+			when {
+				expression {
+					return Boolean.valueOf(params.checkGitCommit)
+				}
+			}
+
+			steps {
+				script {
+					if ( env.GIT_COMMIT == env.GIT_PREVIOUS_SUCCESSFUL_COMMIT ) {
+						echo "env.GIT_COMMIT (" + env.GIT_COMMIT + ") = env.GIT_PREVIOUS_SUCCESSFUL_COMMIT (" + env.GIT_PREVIOUS_SUCCESSFUL_COMMIT + "). Skip building."
+						env.BUILD_SKIPPED = "true"
+					} else {
+						echo "env.GIT_COMMIT (" + env.GIT_COMMIT + ") != env.GIT_PREVIOUS_SUCCESSFUL_COMMIT (" + env.GIT_PREVIOUS_SUCCESSFUL_COMMIT + "). Need to rebuild."
+					}
+ 				}
+			}
+		}
+
 		stage('Build, Deploy') {
+			when {
+				expression {
+					return env.BUILD_SKIPPED != "true"
+				}
+			}
 			steps {
 				githubBuildStarted()
 
@@ -138,7 +163,7 @@ spec:
 		stage("Publish release") {
 			when {
 				expression {
-					return Boolean.valueOf(release)
+					return Boolean.valueOf(params.release) && env.BUILD_SKIPPED != "true"
 				}
 			}
 

bin/build-aloha-editor.sh

@@ -34,9 +34,9 @@ run_command() {
 	echo
 }
 
-run_command "Installing dependencies..." "npm install -SD --no-fund --no-audit"
+run_command "Installing dependencies..." "npm install --no-fund --no-audit"
 run_command "Performing linting..." "npx eslint src/lib"
-run_command "Building Aloha-Editor $BUILD_PROFILE..." "npx r.js -o 'build/aloha/$BUILD_PROFILE.js'"
+run_command "Building Aloha-Editor $BUILD_PROFILE..." "./node_modules/.bin/r_js -o 'build/aloha/$BUILD_PROFILE.js'"
 
 run_command "Building Aloha-Editor $BUILD_PROFILE (full)..." "cat build/aloha/license-header.frag target/$BUILD_PROFILE/lib/require.js target/$BUILD_PROFILE/lib/vendor/jquery-3.7.0.js target/$BUILD_PROFILE/lib/aloha.js > target/$BUILD_PROFILE/lib/aloha-full.js"
 run_command "Building Aloha-Editor $BUILD_PROFILE (full; minified)..." "npx uglifyjs target/$BUILD_PROFILE/lib/require.js target/$BUILD_PROFILE/lib/vendor/jquery-3.7.0.js target/$BUILD_PROFILE/lib/aloha.js --compress --mangle --source-map --output 'target/$BUILD_PROFILE/lib/aloha-full.min.js'"

build/aloha/build-profile-with-common-extra-plugins.js

@@ -47,16 +47,16 @@
 		"jqueryui": 'vendor/jquery-ui-1.13.2',
 
 		// For the repository browser
-		'PubSub': 'vendor/pubsub/js/pubsub-unminified',
+		'PubSub': 'vendor/pubsub',
 		'Class': 'vendor/class',
-		'RepositoryBrowser': 'vendor/repository-browser/js/repository-browser-unminified',
+		'RepositoryBrowser': 'vendor/repository-browser/js/repository-browser',
 		'jstree': 'vendor/jquery.jstree',              // Mutates jquery
 		'jqgrid': 'vendor/jquery.jqgrid',              // Mutates jquery
 		'jquery-layout': 'vendor/jquery.layout',     // Mutates jquery
 		'jqgrid-locale-en': 'vendor/grid.locale.en', // Mutates jqgrid
 		'jqgrid-locale-de': 'vendor/grid.locale.de', // Mutates jqgrid
-		'repository-browser-i18n-de': 'vendor/repository-browser/js/repository-browser-unminified',
-		'repository-browser-i18n-en': 'vendor/repository-browser/js/repository-browser-unminified',
+		'repository-browser-i18n-de': 'vendor/repository-browser/js/repository-browser',
+		'repository-browser-i18n-en': 'vendor/repository-browser/js/repository-browser',
 
 		// Shortcuts for all common plugins
 		"ui": "../plugins/common/ui/lib",

build/aloha/build-profile-with-common-plugins.js

@@ -47,16 +47,16 @@
 		"jqueryui": 'vendor/jquery-ui-1.13.2',
 
 		// For the repository browser
-		'PubSub': 'vendor/pubsub/js/pubsub-unminified',
+		'PubSub': 'vendor/pubsub',
 		'Class': 'vendor/class',
-		'RepositoryBrowser': 'vendor/repository-browser/js/repository-browser-unminified',
+		'RepositoryBrowser': 'vendor/repository-browser/js/repository-browser',
 		'jstree': 'vendor/jquery.jstree',              // Mutates jquery
 		'jqgrid': 'vendor/jquery.jqgrid',              // Mutates jquery
 		'jquery-layout': 'vendor/jquery.layout',     // Mutates jquery
 		'jqgrid-locale-en': 'vendor/grid.locale.en', // Mutates jqgrid
 		'jqgrid-locale-de': 'vendor/grid.locale.de', // Mutates jqgrid
-		'repository-browser-i18n-de': 'vendor/repository-browser/js/repository-browser-unminified',
-		'repository-browser-i18n-en': 'vendor/repository-browser/js/repository-browser-unminified',
+		'repository-browser-i18n-de': 'vendor/repository-browser/js/repository-browser',
+		'repository-browser-i18n-en': 'vendor/repository-browser/js/repository-browser',
 
 		// Shortcuts for all common plugins
 		"ui": "../plugins/common/ui/lib",

build/aloha/build-with-plugin-separated.js

@@ -267,16 +267,16 @@
     "jqueryui": 'vendor/jquery-ui-1.9.0.custom-aloha',
 
     // For the repository browser
-    'PubSub': 'vendor/pubsub/js/pubsub-unminified',
+    'PubSub': 'vendor/pubsub',
     'Class': 'vendor/class',
-    'RepositoryBrowser': 'vendor/repository-browser/js/repository-browser-unminified',
+    'RepositoryBrowser': 'vendor/repository-browser/js/repository-browser',
     'jstree': 'vendor/jquery.jstree', // Mutates jquery
     'jqgrid': 'vendor/jquery.jqgrid', // Mutates jquery
     'jquery-layout': 'vendor/jquery.layout-1.3.0-rc29.14', // Mutates jquery
     'jqgrid-locale-en': 'vendor/grid.locale.en', // Mutates jqgrid
     'jqgrid-locale-de': 'vendor/grid.locale.de', // Mutates jqgrid
-    'repository-browser-i18n-de': 'vendor/repository-browser/js/repository-browser-unminified',
-    'repository-browser-i18n-en': 'vendor/repository-browser/js/repository-browser-unminified',
+    'repository-browser-i18n-de': 'vendor/repository-browser/js/repository-browser',
+    'repository-browser-i18n-en': 'vendor/repository-browser/js/repository-browser',
 
     // Shortcuts for all common plugins
     "ui": "../plugins/common/ui/lib",
@@ -428,12 +428,9 @@
         'jquery',
         'i18n',
 
-        'util/json2',
         'util/class',
         'util/lang',
         'util/range',
-        'util/maps',
-        'util/maps',
         'util/dom',
         'util/position',
         'util/trees',
@@ -456,7 +453,7 @@
         'aloha/nls/i18n',
 
         'vendor/class',
-        'vendor/pubsub/js/pubsub',
+        'vendor/pubsub',
         'vendor/amplify.store',
         'vendor/sanitize'
       ]

build/changelog/entries/2024/12/12550.GPU-1559.enhancement

@@ -0,0 +1,11 @@
+Utility functions and features which have native browser implementations have been removed:
+* @aloha/ecma5shims@
+* @util/arrays@
+* @util/json2@
+* @util/maps@
+
+Dependencies like that have also been removed:
+* @ierange-m2@
+* @json2@
+* @amplify-store@
+* @sanitize@

build/changelog/entries/2024/12/12552.SUP-17927.bugfix

@@ -0,0 +1 @@
+Fixed access to invalid variables due to merge conflicts

build/changelog/mappings/2.1.0.json

@@ -0,0 +1,8 @@
+{
+  "version": "2.1.0",
+  "date": "05.12.2024",
+  "changeLogEntryFileNames": [
+    "12550.GPU-1559.enhancement"
+  ],
+  "genericProperties": {}
+}

build/changelog/mappings/2.1.1.json

@@ -0,0 +1,8 @@
+{
+  "version": "2.1.1",
+  "date": "17.12.2024",
+  "changeLogEntryFileNames": [
+    "12551.SUP-17877.bugfix"
+  ],
+  "genericProperties": {}
+}

build/changelog/mappings/2.1.2.json

@@ -0,0 +1,8 @@
+{
+  "version": "2.1.2",
+  "date": "18.12.2024",
+  "changeLogEntryFileNames": [
+    "12552.SUP-17927.bugfix"
+  ],
+  "genericProperties": {}
+}