Merge pull request #878 from cakephp/4.next-new-js-css

4.next - New JS & CSS

Author: markstory

.editorconfig

@@ -10,3 +10,6 @@ indent_style = space
 indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.js]
+indent_size = 2

.eslintrc.json

@@ -0,0 +1,26 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true,
+        "jquery": true
+    },
+    "extends": [
+        "airbnb-base"
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "rules": {
+        "strict": 0,
+        "max-len": ["error", { "code": 150 }],
+        "no-underscore-dangle":  ["error", {
+            "allow": ["__cakeDebugBlockInit", "_arguments"]
+        }],
+        "import/extensions": [0, { "<js>": "always" }],
+        "no-param-reassign": 0,
+        "no-plusplus": 0,
+        "class-methods-use-this": 0,
+        "prefer-rest-params": 0
+    }
+}

.gitignore

@@ -17,8 +17,13 @@ nbproject/*
 .svn
 errors.err
 tags
+node_modules
+package-lock.json
 /.phpunit.result.cache
 /nbproject/
 /composer.lock
 /vendor
 /phpunit.xml
+/webroot/css/style.css.map
+/webroot/mix.js.map
+/webroot/mix-manifest.json

.jshintrc

@@ -24,7 +24,7 @@
     },
     "require": {
         "php": ">=7.2",
-        "cakephp/cakephp": "dev-4.next as 4.4.0",
+        "cakephp/cakephp": "^4.4.0",
         "cakephp/chronos": "^2.0",
         "composer/composer": "^1.3 | ^2.0",
         "jdorn/sql-formatter": "^1.2"

.stickler.yml

@@ -0,0 +1,29 @@
+{
+    "name": "debug_kit",
+    "version": "1.0.0",
+    "description": "CakePHP Debug Kit",
+    "author": "CakePHP Team",
+    "license": "MIT",
+    "homepage": "https://github.com/cakephp/debug_kit#readme",
+    "bugs": {
+        "url": "https://github.com/cakephp/debug_kit/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/cakephp/debug_kit.git"
+    },
+    "keywords": [
+        "cakephp",
+        "debug",
+        "kit"
+    ],
+    "devDependencies": {
+        "eslint": "^8.17.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-plugin-import": "^2.26.0"
+    },
+    "scripts": {
+        "cs-check": "npx eslint webroot/js/main.js webroot/js/inject-iframe.js webroot/js/modules/*.js",
+        "cs-fix": "npx eslint webroot/js/main.js webroot/js/inject-iframe.js webroot/js/modules/*.js --fix"
+    }
+}

composer.json

@@ -158,9 +158,8 @@ protected function respondWithPart($email, $partType)
         if ($partType === 'text') {
             $part = '<pre>' . (string)$part . '</pre>';
         }
-        $response = $response->withStringBody($part);
 
-        return $response;
+        return $response->withStringBody($part);
     }
 
     /**
@@ -188,7 +187,7 @@ protected function getMailPreviewClasses()
                 return [[CorePlugin::classPath($plugin) . 'Mailer/Preview/'], "$plugin."];
             });
 
-        $appPaths = [App::path('Mailer/Preview'), ''];
+        $appPaths = [App::classPath('Mailer/Preview'), ''];
 
         return collection([$appPaths])
             ->append($pluginPaths)

package.json

@@ -48,11 +48,15 @@ public function initialize(): void
     public function clearCache()
     {
         $this->request->allowMethod('post');
-        if (!$this->request->getData('name')) {
+        $name = $this->request->getData('name');
+        if (!$name) {
             throw new NotFoundException(__d('debug_kit', 'Invalid cache engine name.'));
         }
-        $result = Cache::clear($this->request->getData('name'));
-        $this->set('success', $result);
-        $this->viewBuilder()->setOption('serialize', ['success']);
+        $success = Cache::clear($name);
+        $message = $success ?
+            __d('debug_kit', '{0} cache cleared.', [$name]) :
+            __d('debug_kit', '{0} cache could not be cleared.', [$name]);
+        $this->set(compact('success', 'message'));
+        $this->viewBuilder()->setOption('serialize', ['success', 'message']);
     }
 }

src/Controller/MailPreviewController.php

@@ -14,8 +14,8 @@
  */
 namespace DebugKit\Mailer;
 
-use Cake\Datasource\ModelAwareTrait;
 use Cake\Mailer\MailerAwareTrait;
+use Cake\ORM\Locator\LocatorAwareTrait;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionMethod;
@@ -26,7 +26,7 @@
 class MailPreview
 {
     use MailerAwareTrait;
-    use ModelAwareTrait;
+    use LocatorAwareTrait;
 
     /**
      * Returns the name of an email if it is valid