Housekeeping

joomla · Oct 18, 2020 · 4f7dfb6 · 4f7dfb6
1 parent 00429c8
commit 4f7dfb6
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 39 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -120,13 +120,13 @@ steps:
     depends_on: [ npm ]
     image: node:current-alpine
     commands:
-      - npx stylelint -s scss "administrator/components/com_media/resources/**/*.scss" "administrator/templates/**/*.scss" "build/media_source/**/*.scss" "templates/**/*.scss" "installation/template/**/*.scss"
+      - npm run lint:css
 
   - name: javascript-cs
     depends_on: [ npm ]
     image: node:current-alpine
     commands:
-      - npx eslint "**/*.js"
+      - npm run lint:js
 
   - name: javascript-tests
     depends_on: [ npm ]

diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue b/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
@@ -149,7 +149,8 @@ export default {
     /* Hide actions dropdown */
     hideActions() {
       this.showActions = false;
-      this.$nextTick(() => { this.$refs.actionToggle ? this.$refs.actionToggle.focus() : false });
+      // eslint-disable-next-line no-unused-expressions
+      this.$nextTick(() => { this.$refs.actionToggle ? this.$refs.actionToggle.focus() : false; });
     },
   },
 };

diff --git a/administrator/components/com_media/resources/scripts/components/modals/modal.vue b/administrator/components/com_media/resources/scripts/components/modals/modal.vue
@@ -18,7 +18,7 @@
           <div class="modal-content">
             <div class="modal-header">
               <slot name="header" />
-              <slot name="backdrop-close"></slot>
+              <slot name="backdrop-close" />
               <button
                 v-if="showClose"
                 type="button"

diff --git a/.eslintrc → build/.eslintrc b/.eslintrc → build/.eslintrc
diff --git a/.stylelintrc.json → build/.stylelintrc.json b/.stylelintrc.json → build/.stylelintrc.json
diff --git a/build.js → build/build.js b/build.js → build/build.js
@@ -18,16 +18,16 @@ const Program = require('commander');
 // eslint-disable-next-line import/no-extraneous-dependencies
 
 // Joomla Build modules
-const errorPages = require('./build/build-modules-js/error-pages.es6.js');
-const init = require('./build/build-modules-js/init.es6.js');
-const compileCSS = require('./build/build-modules-js/compilecss.es6.js');
-const compileJS = require('./build/build-modules-js/compilejs.es6.js');
-const minifyVendor = require('./build/build-modules-js/javascript/minify-vendor.es6.js');
-const watch = require('./build/build-modules-js/watch.es6.js');
+const errorPages = require('./build-modules-js/error-pages.es6.js');
+const init = require('./build-modules-js/init.es6.js');
+const compileCSS = require('./build-modules-js/compilecss.es6.js');
+const compileJS = require('./build-modules-js/compilejs.es6.js');
+const minifyVendor = require('./build-modules-js/javascript/minify-vendor.es6.js');
+const watch = require('./build-modules-js/watch.es6.js');
 
 // The settings
-const options = require('./package.json');
-const settings = require('./build/build-modules-js/settings.json');
+const options = require('../package.json');
+const settings = require('./build-modules-js/settings.json');
 
 // Merge Joomla's specific settings to the main package.json object
 if ('settings' in settings) {

diff --git a/build/media_source/com_media/js/edit-images.es6.js b/build/media_source/com_media/js/edit-images.es6.js
@@ -157,6 +157,7 @@ Joomla.MediaManager = Joomla.MediaManager || {};
         Joomla.MediaManager.Edit.Reset(true);
         break;
       case 'save':
+        // eslint-disable-next-line func-names
         Joomla.UploadFile.exec(name, JSON.stringify(forUpload), uploadPath, url, type, function () {
           if (this.readyState === XMLHttpRequest.DONE) {
             if (window.self !== window.top) {

diff --git a/drone-package.json b/drone-package.json
diff --git a/package.json b/package.json
@@ -12,14 +12,15 @@
     "npm": ">=6.13.4"
   },
   "scripts": {
-    "build:js": "node build.js --compile-js",
-    "build:css": "node build.js --compile-css",
-    "watch": "node build.js --watch",
-    "lint:js": "node ./node_modules/eslint/bin/eslint.js --ext .js,.vue .",
+    "build:js": "node build/build.js --compile-js",
+    "build:css": "node build/build.js --compile-css",
+    "watch": "node build/build.js --watch",
+    "lint:js": "node ./node_modules/eslint/bin/eslint.js --config build/.eslintrc --ext .js,.vue .",
+    "lint:css": "node ./node_modules/stylelint/bin/stylelint.js --config build/.stylelintrc.json -s scss \"administrator/components/com_media/resources/**/*.scss\" \"administrator/templates/**/*.scss\" \"build/media_source/**/*.scss\" \"templates/**/*.scss\" \"installation/template/**/*.scss\"",
     "test": "npx karma start tests/javascript/karma.conf.js --single-run",
-    "install": "node build.js --copy-assets && node build.js --build-pages",
-    "postinstall": "node build.js --compile-js && node build.js --compile-css && npm run build:com_media",
-    "update": "node build.js --copy-assets && node build.js --build-pages && node build.js --compile-js && node build.js --compile-css",
+    "install": "node build/build.js --copy-assets && node build/build.js --build-pages",
+    "postinstall": "node build/build.js --compile-js && node build/build.js --compile-css && npm run build:com_media",
+    "update": "node build/build.js --copy-assets && node build/build.js --build-pages && node build/build.js --compile-js && node build/build.js --compile-css",
     "gzip": "node -e 'require(\"./build/build-modules-js/gzip-assets.es6.js\").gzipFiles()'",
     "watch:com_media": "cross-env NODE_ENV=development webpack --progress --hide-modules --watch --config administrator/components/com_media/webpack.config.js",
     "dev:com_media": "cross-env NODE_ENV=development webpack --progress --hide-modules --config administrator/components/com_media/webpack.config.js",