From a928902b36b8d410767a1d7974ac8df491457bf1 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 8 Jun 2021 20:35:52 +0200
Subject: [PATCH] Bugfixes for the asset picker

---
 ccm-cms/package-lock.json | 15 ---------------
 ccm-cms/package.json      |  6 +++---
 ccm-cms/package.json.bak  | 32 --------------------------------
 ccm-cms/tsconfig.json     |  2 +-
 4 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 ccm-cms/package.json.bak

diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json
index 19610ba95..e0a624857 100644
--- a/ccm-cms/package-lock.json
+++ b/ccm-cms/package-lock.json
@@ -3115,15 +3115,6 @@
                 "@types/node": "*"
             }
         },
-        "@types/jquery": {
-            "version": "3.5.5",
-            "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.5.tgz",
-            "integrity": "sha512-6RXU9Xzpc6vxNrS6FPPapN1SxSHgQ336WC6Jj/N8q30OiaBZ00l1GBgeP7usjVZPivSkGUfL1z/WW6TX989M+w==",
-            "dev": true,
-            "requires": {
-                "@types/sizzle": "*"
-            }
-        },
         "@types/node": {
             "version": "15.0.2",
             "resolved": "https://registry.npmjs.org/@types/node/-/node-15.0.2.tgz",
@@ -3243,12 +3234,6 @@
             "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
             "dev": true
         },
-        "@types/sizzle": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-            "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
-            "dev": true
-        },
         "abab": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
diff --git a/ccm-cms/package.json b/ccm-cms/package.json
index 29096e6f3..7dc8578c2 100644
--- a/ccm-cms/package.json
+++ b/ccm-cms/package.json
@@ -5,14 +5,14 @@
     "main": "index.js",
     "scripts": {
         "build": "npm-run-all build:*:*",
-        "build:cms-admin:ts": "tsc",
-        "build:cms-admin:css": "sass src/main/scss/content-sections/cms-admin.scss target/generated-resources/assets/@content-sections/cms-admin.css"
+        "build:ccm-admin:js": "parcel build --target --dist-dir target/generated-resources/assets/@content-sections src/main/typescript/content-sections/cms-admin.ts",
+        "build:ccm-admin:css": "sass src/main/scss/content-sections/cms-admin.scss target/generated-resources/assets/@content-sections/cms-admin.css",
+        "build:cms-editor:js": "parcel build --target --dist-dir target/generated-resources/assets/@content-sections src/main/typescript/content-sections/cms-editor.ts"
     },
     "author": "Jens Pelzetter",
     "license": "LGPL-3.0-or-later",
     "devDependencies": {
         "@parcel/transformer-typescript-tsc": "^2.0.0-beta.1",
-        "@types/jquery": "^3.5.5",
         "npm-run-all": "^4.1.5",
         "parcel": "^2.0.0-beta.2",
         "sass": "^1.32.12",
diff --git a/ccm-cms/package.json.bak b/ccm-cms/package.json.bak
deleted file mode 100644
index 7dc8578c2..000000000
--- a/ccm-cms/package.json.bak
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "name": "ccm-cms",
-    "version": "7.0.0",
-    "description": "JavaScript stuff for ccm-cms",
-    "main": "index.js",
-    "scripts": {
-        "build": "npm-run-all build:*:*",
-        "build:ccm-admin:js": "parcel build --target --dist-dir target/generated-resources/assets/@content-sections src/main/typescript/content-sections/cms-admin.ts",
-        "build:ccm-admin:css": "sass src/main/scss/content-sections/cms-admin.scss target/generated-resources/assets/@content-sections/cms-admin.css",
-        "build:cms-editor:js": "parcel build --target --dist-dir target/generated-resources/assets/@content-sections src/main/typescript/content-sections/cms-editor.ts"
-    },
-    "author": "Jens Pelzetter",
-    "license": "LGPL-3.0-or-later",
-    "devDependencies": {
-        "@parcel/transformer-typescript-tsc": "^2.0.0-beta.1",
-        "npm-run-all": "^4.1.5",
-        "parcel": "^2.0.0-beta.2",
-        "sass": "^1.32.12",
-        "typescript": "^4.2.4"
-    },
-    "dependencies": {
-        "@tiptap/core": "^2.0.0-beta.46",
-        "@tiptap/starter-kit": "^2.0.0-beta.43",
-        "bootstrap": "^4.6.0",
-        "bootstrap-icons": "^1.4.1",
-        "jquery": "^3.6.0",
-        "popper.js": "^1.16.1"
-    },
-    "targets": {
-        "main": false
-    }
-}
diff --git a/ccm-cms/tsconfig.json b/ccm-cms/tsconfig.json
index 805927126..d526d7d80 100644
--- a/ccm-cms/tsconfig.json
+++ b/ccm-cms/tsconfig.json
@@ -5,7 +5,7 @@
             "DOM",
             "ES2016"
         ],
-        "module": "commonjs",
+        "module": "umd",
         "moduleResolution": "node",
         "outDir": "target/generated-resources/assets/@content-sections",
         "sourceMap": true,