Update Composer, update everything

web/core/scripts/js/babel-es6-build.js

@@ -1,7 +1,14 @@
 /**
  * @file
  *
- * Compile *.es6.js files to ES5.
+ * Provides the build:js command to compile *.es6.js files to ES5.
+ *
+ * Run build:js with --file to only parse a specific file. Using the --check
+ * flag build:js can be run to check if files are compiled correctly.
+ * @example <caption>Only process misc/drupal.es6.js and misc/drupal.init.es6.js</caption
+ * yarn run build:js -- --file misc/drupal.es6.js --file misc/drupal.init.es6.js
+ * @example <caption>Check if all files have been compiled correctly</caption
+ * yarn run build:js -- --check
  *
  * @internal This file is part of the core javascript build process and is only
  * meant to be used in that context.
@@ -9,46 +16,34 @@
 
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
-const babel = require('babel-core');
 const glob = require('glob');
+const argv = require('minimist')(process.argv.slice(2));
+const changeOrAdded = require('./changeOrAdded');
+const check = require('./check');
+const log = require('./log');
 
-// Logging human-readable timestamp.
-const log = function (message) {
-  // eslint-disable-next-line no-console
-  console.log(`[${new Date().toTimeString().slice(0, 8)}] ${message}`);
-};
-
-function addSourceMappingUrl(code, loc) {
-  return code + '\n\n//# sourceMappingURL=' + path.basename(loc);
-}
-
-const changedOrAdded = (filePath) => {
-  babel.transformFile(filePath, {
-    sourceMaps: true,
-    comments: false
-  }, function (err, result) {
-    const fileName = filePath.slice(0, -7);
-    // we've requested for a sourcemap to be written to disk
-    let mapLoc = `${fileName}.js.map`;
-
-    fs.writeFile(mapLoc, JSON.stringify(result.map));
-    fs.writeFile(`${fileName}.js`, addSourceMappingUrl(result.code, mapLoc));
-
-    log(`'${filePath}' is being processed.`);
-  });
-};
-
+// Match only on .es6.js files.
 const fileMatch = './**/*.es6.js';
+// Ignore everything in node_modules
 const globOptions = {
-  ignore: 'node_modules/**'
+  ignore: './node_modules/**'
 };
 const processFiles = (error, filePaths) => {
   if (error) {
     process.exitCode = 1;
   }
-  filePaths.forEach(changedOrAdded);
+  // Process all the found files.
+  let callback = changeOrAdded;
+  if (argv.check) {
+    callback = check;
+  }
+  filePaths.forEach(callback);
 };
-glob(fileMatch, globOptions, processFiles);
+
+if (argv.file) {
+  processFiles(null, [].concat(argv.file));
+}
+else {
+  glob(fileMatch, globOptions, processFiles);
+}
 process.exitCode = 0;

web/core/scripts/js/babel-es6-watch.js

@@ -11,57 +11,33 @@
 
 const fs = require('fs');
 const path = require('path');
-const babel = require('babel-core');
 const chokidar = require('chokidar');
 
-// Logging human-readable timestamp.
-const log = function log(message) {
-  // eslint-disable-next-line no-console
-  console.log(`[${new Date().toTimeString().slice(0, 8)}] ${message}`);
-};
-
-function addSourceMappingUrl(code, loc) {
-  return `${code}\n\n//# sourceMappingURL=${path.basename(loc)}`;
-}
+const changeOrAdded = require('./changeOrAdded');
+const log = require('./log');
 
+// Match only on .es6.js files.
 const fileMatch = './**/*.es6.js';
+// Ignore everything in node_modules
 const watcher = chokidar.watch(fileMatch, {
   ignoreInitial: true,
-  ignored: 'node_modules/**'
+  ignored: './node_modules/**'
 });
 
-const changedOrAdded = (filePath) => {
-  babel.transformFile(filePath, {
-    sourceMaps: true,
-    comments: false
-  }, (err, result) => {
-    const fileName = filePath.slice(0, -7);
-    // we've requested for a sourcemap to be written to disk
-    const mapLoc = `${fileName}.js.map`;
-
-    fs.writeFileSync(mapLoc, JSON.stringify(result.map));
-    fs.writeFileSync(`${fileName}.js`, addSourceMappingUrl(result.code, mapLoc));
-
-    log(`'${filePath}' has been changed.`);
-  });
-};
-
 const unlinkHandler = (err) => {
   if (err) {
     log(err);
   }
 };
 
+// Watch for filesystem changes.
 watcher
-  .on('add', filePath => changedOrAdded(filePath))
-  .on('change', filePath => changedOrAdded(filePath))
+  .on('add', changeOrAdded)
+  .on('change', changeOrAdded)
   .on('unlink', (filePath) => {
     const fileName = filePath.slice(0, -7);
     fs.stat(`${fileName}.js`, () => {
       fs.unlink(`${fileName}.js`, unlinkHandler);
     });
-    fs.stat(`${fileName}.js.map`, () => {
-      fs.unlink(`${fileName}.js.map`, unlinkHandler);
-    });
   })
   .on('ready', () => log(`Watching '${fileMatch}' for changes.`));

web/core/scripts/js/changeOrAdded.js

@@ -0,0 +1,15 @@
+const fs = require('fs');
+const log = require('./log');
+const compile = require('./compile');
+
+module.exports = (filePath) => {
+  log(`'${filePath}' is being processed.`);
+  // Transform the file.
+  compile(filePath, function write(code) {
+    const fileName = filePath.slice(0, -7);
+    // Write the result to the filesystem.
+    fs.writeFile(`${fileName}.js`, code, () => {
+      log(`'${filePath}' is finished.`);
+    });
+  });
+}

web/core/scripts/js/check.js

@@ -0,0 +1,23 @@
+const chalk = require('chalk');
+const fs = require('fs');
+const log = require('./log');
+const compile = require('./compile');
+
+module.exports = (filePath) => {
+  log(`'${filePath}' is being checked.`);
+  // Transform the file.
+  compile(filePath, function check(code) {
+    const fileName = filePath.slice(0, -7);
+    fs.readFile(`${fileName}.js`, function read(err, data) {
+      if (err) {
+        log(chalk.red(err));
+        process.exitCode = 1;
+        return;
+      }
+      if (code !== data.toString()) {
+        log(chalk.red(`'${filePath}' is not updated.`));
+        process.exitCode = 1;
+      }
+    });
+  });
+}

web/core/scripts/js/compile.js

@@ -0,0 +1,31 @@
+const chalk = require('chalk');
+const log = require('./log');
+const babel = require('babel-core');
+
+module.exports = (filePath, callback) => {
+  // Transform the file.
+  // Check process.env.NODE_ENV to see if we should create sourcemaps.
+  babel.transformFile(
+    filePath,
+    {
+      sourceMaps: process.env.NODE_ENV === 'development' ? 'inline' : false,
+      comments: false,
+      plugins: [
+        ['add-header-comment', {
+          'header': [
+            `DO NOT EDIT THIS FILE.\nSee the following change record for more information,\nhttps://www.drupal.org/node/2815083\n@preserve`
+          ]
+        }]
+      ]
+    },
+    (err, result) => {
+      if (err) {
+        log(chalk.red(err));
+        process.exitCode = 1;
+      }
+      else {
+        callback(result.code);
+      }
+    }
+  );
+};

web/core/scripts/js/eslint-stats-by-type.js

@@ -0,0 +1,35 @@
+module.exports = function (results) {
+  results = results || [];
+
+  const errorType = {
+    warnings: {},
+    errors: {},
+  };
+
+  results.reduce((result, current) => {
+    current.messages.forEach((msg) => {
+      if (msg.severity === 1) {
+        errorType.warnings[msg.ruleId] = errorType.warnings[msg.ruleId] + 1 || 1
+      }
+      if (msg.severity === 2) {
+        errorType.errors[msg.ruleId] = errorType.errors[msg.ruleId] + 1 || 1
+      }
+    });
+    return result;
+  });
+
+  const reduceErrorCounts = (errorType) => Object.entries(errorType).sort((a, b) => b[1] - a[1])
+    .reduce((result, current) => result.concat([`${current[0]}: ${current[1]}`]), []).join('\n');
+
+  const warnings = reduceErrorCounts(errorType.warnings);
+  const errors = reduceErrorCounts(errorType.errors);
+
+  return `
+Errors:
+${'='.repeat(30)}
+${errors}
+${'\n'.repeat(4)}
+Warnings:
+${'='.repeat(30)}
+${warnings}`;
+};

web/core/scripts/js/log.js

@@ -0,0 +1,4 @@
+module.exports = (message) => {
+  // Logging human-readable timestamp.
+  console.log(`[${new Date().toTimeString().slice(0, 8)}] ${message}`);
+}

web/core/scripts/js/rename-js-files-to-es6.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Rename *.js files in *.es6.js. Only need to be run once.
-# Should be removed after *.es6.js files are committed to core.
-#
-# @internal This file is part of the core javascript build process and is only
-# meant to be used in that context.
-
-for js in `find ./{misc,modules,themes} -name '*.js'`;
-do
-   mv ${js} ${js%???}.es6.js;
-done