Merge pull request #3447 from neos/task/resolveMergeConflicts

TASK: Reresolve merge conflicts of #3382
neos · Mar 27, 2023 · e4080d6 · e4080d6
2 parents a0683ed + 3a91974
commit e4080d6
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 23 deletions.
diff --git a/packages/neos-ui-backend-connector/package.json b/packages/neos-ui-backend-connector/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/neos-ui-constants/package.json b/packages/neos-ui-constants/package.json
@@ -4,9 +4,6 @@
   "description": "Container package to store Neos CMS UI constants",
   "private": true,
   "main": "./src/index.js",
-  "scripts": {
-    "clean": "rimraf ./lib ./dist"
-  },
   "devDependencies": {
     "@neos-project/jest-preset-neos-ui": "workspace:*",
     "@neos-project/neos-ui-build": "workspace:*",

diff --git a/packages/neos-ui-contentrepository/package.json b/packages/neos-ui-contentrepository/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/neos-ui-decorators/package.json b/packages/neos-ui-decorators/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/neos-ui-editors/package.json b/packages/neos-ui-editors/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/neos-ui-extensibility/package.json b/packages/neos-ui-extensibility/package.json
@@ -14,7 +14,6 @@
     "test:watch": "yarn jest --watch",
     "build": "yarn tsc --declaration",
     "build:watch": "yarn tsc --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/neos-ui-guest-frame/package.json b/packages/neos-ui-guest-frame/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn run jest -- --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/neos-ui-i18n/package.json b/packages/neos-ui-i18n/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/neos-ui-inspector/package.json b/packages/neos-ui-inspector/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "dependencies": {

diff --git a/packages/neos-ui-redux-store/package.json b/packages/neos-ui-redux-store/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/neos-ui-sagas/package.json b/packages/neos-ui-sagas/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/neos-ui-validators/package.json b/packages/neos-ui-validators/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "dependencies": {

diff --git a/packages/neos-ui-views/package.json b/packages/neos-ui-views/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "dependencies": {

diff --git a/packages/neos-ui/package.json b/packages/neos-ui/package.json
@@ -6,7 +6,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/positional-array-sorter/package.json b/packages/positional-array-sorter/package.json
@@ -15,7 +15,6 @@
     "test:watch": "yarn jest --watch",
     "build": "yarn tsc --declaration",
     "build:watch": "yarn tsc --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/react-proptypes/package.json b/packages/react-proptypes/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {

diff --git a/packages/react-ui-components/esbuild.js b/packages/react-ui-components/esbuild.js
@@ -29,7 +29,7 @@ function *walkSync(dir) {
  * it ensures our dist build still works eventhough we export `.js` instead of `.ts` (currently there is no import rewrite)
  * this check acts as a safe guard to test against malformed imports
  * in case you want to import a library with specified extension, just exclude the path from the check below, as this is ok ;)
- * 
+ *
  * @param {string} importPath
  */
 function assertImportPathsSpecifiedWithoutExtension(importPath) {
@@ -91,7 +91,7 @@ async function main() {
                             external: true
                         }
                     })
-                }    
+                }
             },
             cssModules(
                 {

diff --git a/packages/utils-helpers/package.json b/packages/utils-helpers/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "dependencies": {

diff --git a/packages/utils-logger/package.json b/packages/utils-logger/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "dependencies": {

diff --git a/packages/utils-redux/package.json b/packages/utils-redux/package.json
@@ -7,7 +7,6 @@
   "scripts": {
     "test": "yarn jest -w 2 --coverage",
     "test:watch": "yarn jest --watch",
-    "clean": "rimraf ./lib ./dist",
     "jest": "NODE_ENV=test jest"
   },
   "devDependencies": {