Add auditFix as a blockly-script and put in all existing plugin packa…

…ge.json files

plugins/block-plus-minus/package.json

@@ -3,7 +3,7 @@
     "version": "2.0.12",
     "description": "A group of blocks that replace the built-in mutator UI with a +/- based UI.",
     "scripts": {
-        "audit:fix": "npm install && npm audit fix",
+        "audit:fix": "blockly-scripts auditFix",
         "build": "blockly-scripts build",
         "clean": "blockly-scripts clean",
         "lint": "blockly-scripts lint",

plugins/block-test/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.1",
   "description": "A group of Blockly test blocks.",
   "scripts": {
-    "audit:fix": "npm install && npm audit fix",
+    "audit:fix": "blockly-scripts auditFix",
     "build": "blockly-scripts build",
     "clean": "blockly-scripts clean",
     "lint": "blockly-scripts lint",

plugins/dev-create/templates/block/template.json

@@ -13,4 +13,4 @@
   "peerDependencies": {
     "blockly": ">=2"
   }
-}
+}

plugins/dev-scripts/bin/blockly-scripts.js

@@ -13,9 +13,19 @@
 const args = process.argv.slice(2);
 const {spawnSync} = require('child_process');
 
+const available_scripts = [
+  'build',
+  'start',
+  'clean',
+  'predeploy',
+  'lint',
+  'test',
+  'postinstall',
+  'auditFix'
+];
+
 const script = args[0];
-if (['build', 'start', 'clean', 'predeploy', 'lint', 'test', 'postinstall']
-    .includes(script)) {
+if (available_scripts.includes(script)) {
   const result = spawnSync('node',
       [].concat(require.resolve('../scripts/' + script))
           .concat(args.slice(1)), {stdio: 'inherit'}

plugins/dev-scripts/scripts/auditFix.js

@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview An audit and fix script for Blockly extension packages.
+ * This script:
+ *   - Runs `npm install` to get a clean (not locally linked) installation.
+ *   - Runs `npm audit fix` to do the fixes.
+ * @author [email protected] (Rachel Fenichel)
+ */
+'use strict';
+
+const execSync = require('child_process').execSync;
+
+console.log(`Running npm audit fix steps for ${packageJson.name}`);
+
+// Run npm install.
+execSync(`npm install`, {stdio: [0, 1, 2] });
+
+// Audit fix.
+execSync(`npm audit fix`, {stdio: [0, 1, 2] });

plugins/dev-tools/package.json

@@ -3,7 +3,7 @@
   "version": "2.0.3",
   "description": "A library of common utilities for Blockly extension development.",
   "scripts": {
-    "audit:fix": "npm install && npm audit fix",
+    "audit:fix": "blockly-scripts auditFix",
     "build": "blockly-scripts build",
     "clean": "blockly-scripts clean",
     "lint": "blockly-scripts lint",

plugins/field-date/package.json

@@ -3,7 +3,7 @@
     "version": "4.1.4",
     "description": "A Blockly date picker field that uses the Google Closure date picker.",
     "scripts": {
-        "audit:fix": "npm install && npm audit fix",
+        "audit:fix": "blockly-scripts auditFix",
         "build": "gulp build",
         "clean": "blockly-scripts clean",
         "predeploy": "npm run build && blockly-scripts predeploy",

plugins/field-slider/package.json

@@ -3,7 +3,7 @@
   "version": "2.1.4",
   "description": "A Blockly slider field.",
   "scripts": {
-    "audit:fix": "npm install && npm audit fix",
+    "audit:fix": "blockly-scripts auditFix",
     "build": "blockly-scripts build",
     "clean": "blockly-scripts clean",
     "lint": "blockly-scripts lint",

plugins/modal/package.json

@@ -3,7 +3,7 @@
   "version": "2.1.3",
   "description": "A Blockly plugin that creates a modal.",
   "scripts": {
-    "audit:fix": "npm install && npm audit fix",
+    "audit:fix": "blockly-scripts auditFix",
     "build": "blockly-scripts build",
     "clean": "blockly-scripts clean",
     "lint": "blockly-scripts lint",

plugins/nominal-connection-checker/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "A Blockly plugin for creating more advanced connection checks, targeted at nominally typed languages.",
   "scripts": {
-    "audit:fix": "npm install && npm audit fix",
+    "audit:fix": "blockly-scripts auditFix",
     "build": "blockly-scripts build",
     "clean": "blockly-scripts clean",
     "lint": "blockly-scripts lint",

plugins/strict-connection-checker/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.1",
   "description": "A Blockly plugin that makes connection checks strict.",
   "scripts": {
-    "audit:fix": "npm install && npm audit fix",
+    "audit:fix": "blockly-scripts auditFix",
     "build": "blockly-scripts build",
     "clean": "blockly-scripts clean",
     "lint": "blockly-scripts lint",

plugins/theme-modern/package.json

@@ -3,7 +3,7 @@
   "version": "2.1.3",
   "description": "A Blockly modern theme with darker block borders.",
   "scripts": {
-    "audit:fix": "npm install && npm audit fix",
+    "audit:fix": "blockly-scripts auditFix",
     "build": "blockly-scripts build",
     "clean": "blockly-scripts clean",
     "lint": "blockly-scripts lint",

plugins/typed-variable-modal/package.json

@@ -3,7 +3,7 @@
   "version": "3.1.3",
   "description": "A Blockly plugin to create a modal for creating typed variables.",
   "scripts": {
-    "audit:fix": "npm install && npm audit fix",
+    "audit:fix": "blockly-scripts auditFix",
     "build": "blockly-scripts build",
     "clean": "blockly-scripts clean",
     "lint": "blockly-scripts lint",

plugins/workspace-search/package.json

@@ -3,7 +3,7 @@
   "version": "2.1.3",
   "description": "A Blockly plugin that adds workspace search support.",
   "scripts": {
-    "audit:fix": "npm install && npm audit fix",
+    "audit:fix": "blockly-scripts auditFix",
     "build": "blockly-scripts build",
     "clean": "blockly-scripts clean",
     "lint": "blockly-scripts lint",