- Refactoring: Move `build-html` to `build` directory

- Optimization: Remove old build/tools closure/yuicompressor code
- Testing: Produce mochawesome report
- Testing: Cypress with multiple reporters (was expecting we'd need, but doesn't hurt to add for now)
- Docs: Add testing badge
- Docs: Reprioritize `docs` in commit lists (prioritize user-facing)
- npm: Update `package-lock.json` (seems to have fixed so Cypress shows incremental results)

.eslintignore

@@ -28,3 +28,5 @@ editor/external/*
 editor/external/dom-polyfill/*
 !editor/external/dom-polyfill/dom-polyfill.js
 !editor/external/dynamic-import-polyfill
+
+mochawesome-report

.eslintrc.js

@@ -137,7 +137,7 @@ module.exports = {
       // Node files
       files: [
         "docs/jsdoc-config.js",
-        "build-html.js",
+        "build/build-html.js",
         "rollup.config.js", "rollup-config.config.js"
       ],
       env: {
@@ -170,7 +170,10 @@ module.exports = {
     },
     {
       extends: ['plugin:node/recommended-script'],
-      files: ['cypress/support/build-coverage-badge.js']
+      files: [
+        'cypress/support/build-coverage-badge.js',
+        'build/testing-badge.js'
+      ]
     },
     {
       files: ["cypress/**"],

.gitignore

@@ -1,16 +1,17 @@
 ignore
 node_modules
 
-build/
-
 svgedit-custom.css
 
 docs/jsdoc
 
+cypress/results
 cypress/screenshots
 cypress/videos
 cypress.env.json
 
-coverage/**
+coverage
-instrumented/**
+instrumented
 .nyc_output
+mochawesome-report
+mochawesome.json

.npmignore

@@ -11,3 +11,5 @@ cypress.env.json
 coverage/**
 .nyc_output
 instrumented/**
+mochawesome-report/**
+mochawesome.json

CHANGES.md

@@ -23,9 +23,14 @@
 - Fix: Ensure `setupCurPrefs` is run (including when `source` or
     `url` is set within the URL)
 - Optimization: Remove unused `jquery-ui-1.8.custom.min.js` file
+- Optimization: Remove old build/tools closure/yuicompressor code
 - Localization: Add 'SVG-Edit Home Page' to locale files
+- Docs: Remove outdated info on jsdoc linting (now just part of eslint config)
+- Docs: Add testing badge
+- Docs: Reprioritize `docs` in commit lists (prioritize user-facing)
 - Refactoring: Switch from `$.param.querystring` to `URL`
 - Refactoring: Ensure file-global jsdoc tags are at beginning of file
+- Refactoring: Move `build-html` to `build` directory
 - Linting (ESLint): Simplify regexes
 - Linting (ESLint): Replace `innerHTML` with `textContent` from old demo
 - Linting (ESLint): Update as per latest ash-nazg
@@ -37,7 +42,8 @@
   setup browser-bug folder and ui issues folder
 - Testing: Create test utilities for selecting English and visiting and
   approving storage
-- Docs: Remove outdated info on jsdoc linting (now just part of eslint config)
+- Testing: Produce mochawesome report
+- Testing: Cypress with multiple reporters in case we need
 - npm: Add `underscore` to copy script
 - npm: Make `copy`, `compress-images`, `start-embedded`, `build-docs-remove`
   scripts cross-platform; add `start-allow-origin` script

README.md

@@ -7,6 +7,7 @@
 <!-- [![Actions Status](https://github.com/SVG-Edit/svgedit/workflows/Node%20CI/badge.svg)](https://github.com/SVG-Edit/svgedit/actions)
 [![Actions Status](https://github.com/SVG-Edit/svgedit/workflows/Coverage/badge.svg)](https://github.com/SVG-Edit/svgedit/actions)
 -->
+[![tests badge](https://raw.githubusercontent.com/SVG-Edit/svgedit/master/badges/tests-badge.svg?sanitize=true)](badges/tests-badge.svg)
 [![coverage badge](https://raw.githubusercontent.com/SVG-Edit/svgedit/master/badges/coverage-badge.svg?sanitize=true)](badges/coverage-badge.svg)
 
 [![Known Vulnerabilities](https://snyk.io/test/github/SVG-Edit/svgedit/badge.svg)](https://snyk.io/test/github/SVG-Edit/svgedit)

badges/tests-badge.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="97" height="20"><defs><linearGradient id="smooth" x2="0" y2="100%"><stop offset="0" stop-color="#aaa" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><style>text{font-size:11px;font-family:Verdana,DejaVu Sans,Geneva,sans-serif}text.shadow{fill:#010101;fill-opacity:.3}text.high{fill:#fff}</style><mask id="round"><rect width="100%" height="100%" rx="3" fill="#fff"/></mask></defs><g id="bg" mask="url(#round)"><path fill="#696969" d="M0 0h41v20H0z"/><path fill="#e05d44" d="M41 0h56v20H41z"/><path fill="url(#smooth)" d="M0 0h97v20H0z"/></g><g id="fg"><text class="shadow" x="5.5" y="15">Tests</text><text class="high" x="5" y="14">Tests</text><text class="shadow" x="46.5" y="15">124/125</text><text class="high" x="46" y="14">124/125</text></g></svg>

build/build-html.js

@@ -19,7 +19,7 @@ const filesAndReplacements = [
       [
         '<!DOCTYPE html>',
         `<!DOCTYPE html>
-<!-- AUTO-GENERATED FROM xdomain-svg-editor-es.html; DO NOT EDIT; use build-html.js to build -->`
+<!-- AUTO-GENERATED FROM xdomain-svg-editor-es.html; DO NOT EDIT; use build/build-html.js to build -->`
       ],
       [
         '<script type="module" src="redirect-on-lacking-support.js"></script>',
@@ -47,7 +47,7 @@ const filesAndReplacements = [
       [
         '<!DOCTYPE html>',
         `<!DOCTYPE html>
-<!-- AUTO-GENERATED FROM svg-editor-es.html; DO NOT EDIT; use build-html.js to build -->`
+<!-- AUTO-GENERATED FROM svg-editor-es.html; DO NOT EDIT; use build/build-html.js to build -->`
       ]
     ]
   },
@@ -58,7 +58,7 @@ const filesAndReplacements = [
       [
         '<!DOCTYPE html>',
         `<!DOCTYPE html>
-<!-- AUTO-GENERATED FROM svg-editor-es.html; DO NOT EDIT; use build-html.js to build -->`
+<!-- AUTO-GENERATED FROM svg-editor-es.html; DO NOT EDIT; use build/build-html.js to build -->`
       ],
       [
         '<script type="module" src="redirect-on-lacking-support.js"></script>',
@@ -85,7 +85,7 @@ const filesAndReplacements = [
       [
         '<!DOCTYPE html>',
         `<!DOCTYPE html>
-<!-- AUTO-GENERATED FROM imagelib/openclipart-es.html; DO NOT EDIT; use build-html.js to build -->`
+<!-- AUTO-GENERATED FROM imagelib/openclipart-es.html; DO NOT EDIT; use build/build-html.js to build -->`
       ],
       [
         '<script src="../../external/dom-polyfill/dom-polyfill.js"></script>',
@@ -108,7 +108,7 @@ const filesAndReplacements = [
       [
         '<!DOCTYPE html>',
         `<!DOCTYPE html>
-<!-- AUTO-GENERATED FROM imagelib/index-es.html; DO NOT EDIT; use build-html.js to build -->`
+<!-- AUTO-GENERATED FROM imagelib/index-es.html; DO NOT EDIT; use build/build-html.js to build -->`
       ],
       [
         '<script type="module" src="index.js"></script>',

build/testing-badge.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const EventEmitter = require('events');
+const BadgeGenerator = require('mocha-badge-generator');
+
+class MockRunner extends EventEmitter {}
+
+const {stats: {passes, failures}} = require('../mochawesome.json');
+
+const mockRunner = new MockRunner();
+
+const options = {
+  reporterOptions: {
+    badge_output: 'badges/tests-badge.svg'
+  }
+};
+
+(async () => {
+const p = BadgeGenerator(mockRunner, options);
+mockRunner.emit('start');
+for (let i = 0; i < passes; i++) {
+  mockRunner.emit('pass');
+}
+for (let i = 0; i < failures; i++) {
+  mockRunner.emit('fail');
+}
+mockRunner.emit('end');
+await p;
+})();

build/tools/COPYING

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

build/tools/README

@@ -1,289 +0,0 @@
-/*
- * Copyright 2009 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//
-// Contents
-//
-
-The Closure Compiler performs checking, instrumentation, and
-optimizations on JavaScript code. The purpose of this README is to
-explain how to build and run the Closure Compiler.
-
-The Closure Compiler requires Java 6 or higher.
-http://www.java.com/
-
-
-//
-// Building The Closure Compiler
-//
-
-There are three ways to get a Closure Compiler executable.
-
-1) Use one we built for you.
-
-Pre-built Closure binaries can be found at
-http://code.google.com/p/closure-compiler/downloads/list
-
-
-2) Check out the source and build it with Apache Ant.
-
-First, check out the full source tree of the Closure Compiler. There
-are instructions on how to do this at the project site.
-http://code.google.com/p/closure-compiler/source/checkout
-
-Apache Ant is a cross-platform build tool.
-http://ant.apache.org/
-
-At the root of the source tree, there is an Ant file named
-build.xml. To use it, navigate to the same directory and type the
-command
-
-ant jar
-
-This will produce a jar file called "build/compiler.jar".
-
-
-3) Check out the source and build it with Eclipse.
-
-Eclipse is a cross-platform IDE.
-http://www.eclipse.org/
-
-Under Eclipse's File menu, click "New > Project ..." and create a
-"Java Project."  You will see an options screen. Give the project a
-name, select "Create project from existing source," and choose the
-root of the checked-out source tree as the existing directory. Verify
-that you are using JRE version 6 or higher.
-
-Eclipse can use the build.xml file to discover rules. When you
-navigate to the build.xml file, you will see all the build rules in
-the "Outline" pane. Run the "jar" rule to build the compiler in
-build/compiler.jar.
-
-
-//
-// Running The Closure Compiler
-//
-
-Once you have the jar binary, running the Closure Compiler is straightforward.
-
-On the command line, type
-
-java -jar compiler.jar
-
-This starts the compiler in interactive mode. Type
-
-var x = 17 + 25;
-
-then hit "Enter", then hit "Ctrl-Z" (on Windows) or "Ctrl-D" (on Mac or Linux)
-and "Enter" again. The Compiler will respond:
-
-var x=42;
-
-The Closure Compiler has many options for reading input from a file,
-writing output to a file, checking your code, and running
-optimizations. To learn more, type
-
-java -jar compiler.jar --help
-
-You can read more detailed documentation about the many flags at
-http://code.google.com/closure/compiler/docs/gettingstarted_app.html
-
-
-//
-// Compiling Multiple Scripts
-//
-
-If you have multiple scripts, you should compile them all together with
-one compile command.
-
-java -jar compiler.jar --js=in1.js --js=in2.js ... --js_output_file=out.js
-
-The Closure Compiler will concatenate the files in the order they're
-passed at the command line.
-
-If you need to compile many, many scripts together, you may start to
-run into problems with managing dependencies between scripts. You
-should check out the Closure Library. It contains functions for
-enforcing dependencies between scripts, and a tool called calcdeps.py
-that knows how to give scripts to the Closure Compiler in the right
-order.
-
-http://code.google.com/p/closure-library/
-
-//
-// Licensing
-//
-
-Unless otherwise stated, all source files are licensed under
-the Apache License, Version 2.0.
-
-
------
-Code under:
-src/com/google/javascript/rhino
-test/com/google/javascript/rhino
-
-URL: http://www.mozilla.org/rhino
-Version:  1.5R3, with heavy modifications
-License:  Netscape Public License and MPL / GPL dual license
-
-Description: A partial copy of Mozilla Rhino. Mozilla Rhino is an
-implementation of JavaScript for the JVM.  The JavaScript parser and
-the parse tree data structures were extracted and modified
-significantly for use by Google's JavaScript compiler.
-
-Local Modifications: The packages have been renamespaced. All code not
-relavant to parsing has been removed. A JSDoc parser and static typing
-system have been added.
-
-
------
-Code in:
-lib/libtrunk_rhino_parser_jarjared.jar
-
-Rhino
-URL: http://www.mozilla.org/rhino
-Version:  Trunk
-License:  Netscape Public License and MPL / GPL dual license
-
-Description: Mozilla Rhino is an implementation of JavaScript for the JVM.
-
-Local Modifications: None. We've used JarJar to renamespace the code
-post-compilation. See:
-http://code.google.com/p/jarjar/
-
-
------
-Code in:
-lib/args4j_deploy.jar
-
-Args4j
-URL: https://args4j.dev.java.net/
-Version: 2.0.9
-License: MIT
-
-Description:
-args4j is a small Java class library that makes it easy to parse command line
-options/arguments in your CUI application.
-
-Local Modifications: None.
-
-
------
-Code in:
-lib/guava-r06.jar
-
-Guava Libraries
-URL: http://code.google.com/p/guava-libraries/
-Version:  R6
-License: Apache License 2.0
-
-Description: Google's core Java libraries.
-
-Local Modifications: None.
-
-
------
-Code in:
-lib/hamcrest-core-1.1.jar
-
-Hamcrest
-URL: http://code.google.com/p/hamcrest
-License: BSD
-License File: LICENSE
-
-Description:
-Provides a library of matcher objects (also known as constraints or
-predicates) allowing 'match' rules to be defined declaratively, to be used in
-other frameworks. Typical scenarios include testing frameworks, mocking
-libraries and UI validation rules.
-
-Local modifications:
-The original jars contained both source code and compiled classes.
-
-hamcrest-core-1.1.jar just contains the compiled classes.
-
-
-
------
-Code in:
-lib/jsr305.jar
-
-Annotations for software defect detection
-URL: http://code.google.com/p/jsr-305/
-Version: svn revision 47
-License: BSD License
-
-Description: Annotations for software defect detection.
-
-Local Modifications: None.
-
-
-----
-Code in:
-lib/junit.jar
-
-JUnit
-URL:  http://sourceforge.net/projects/junit/
-Version:  4.5
-License:  Common Public License 1.0
-
-Description: A framework for writing and running automated tests in Java.
-
-Local Modifications: None.
-
-
----
-Code in:
-lib/protobuf-java-2.3.0.jar
-
-Protocol Buffers
-URL: http://code.google.com/p/protobuf/
-Version: 2.3.0
-License: New BSD License
-
-Description: Supporting libraries for protocol buffers,
-an encoding of structured data.
-
-Local Modifications: None
-
-
----
-Code in:
-lib/ant_deploy.jar
-
-URL: http://ant.apache.org/bindownload.cgi
-Version: 1.6.5
-License: Apache License 2.0
-Description:
-  Ant is a Java based build tool. In theory it is kind of like "make"
-  without make's wrinkles and with the full portability of pure java code.
-
-Local Modifications:
-  Modified apache-ant-1.6.5/bin/ant to look in the ant.runfiles directory
-
-
----
-Code in:
-lib/json.jar
-URL: http://json.org/java/index.html
-Version: JSON version 2
-License: MIT license
-Description:
-JSON is a set of java files for use in transmitting data in JSON format.
-
-Local Modifications: None
-

build/tools/ship.py

@@ -1,154 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# ship.py
-#
-# Licensed under the Apache 2 License as is the rest of the project
-# Copyright (c) 2011 Jeff Schiller
-#
-# This script has very little real-world application.  It is only used in our pure-client web app
-# served on GoogleCode so we can have one HTML file, run a build script and generate a 'release'
-# version without having to maintain two separate HTML files.  It does this by evaluating
-# 'processing comments' that are suspicously similar to IE conditional comments and then outputting
-# a new HTML file after evaluating particular variables.
-#
-# This script takes the following inputs:
-#
-# * a HTML file (--i=in.html)
-# * a series of flag names (--on=Foo --on=Bar)
-#
-# Example:
-#
-# in.html:
-#   <!--{if foo}>
-#     FOO!
-#   <!{else}-->
-#     BAR!
-#   <!--{endif}-->
-#
-# $ ship.py --i in.html --on foo
-#
-# out.html:
-#   <!--{if foo}-->
-#     FOO!
-#   <!--{else}>
-#     BAR!
-#   <!{endif}-->
-#
-# It has the following limitations:
-#
-# 1) Only if-else-endif are currently supported.
-# 2) All processing comments must be on one line with no other non-whitespace characters.
-# 3) Comments cannot be nested.
-
-import optparse
-import os
-
-inside_if = False
-last_if_true = False
-
-_options_parser = optparse.OptionParser(
-	usage='%prog --i input.html [--on flag1]',
-	description=('Rewrites an HTML file based on conditional comments and flags'))
-_options_parser.add_option('--i',
-	action='store', dest='input_html_file', help='Input HTML filename')
-_options_parser.add_option('--on',
-	action='append', type='string', dest='enabled_flags',
-	help='name of flag to enable')
-
-def parse_args(args=None):
-  options, rargs = _options_parser.parse_args(args)
-  return options, (None, None)
-
-def parseComment(line, line_num, enabled_flags):
-  global inside_if
-  global last_if_true
-
-  start = line.find('{')
-  end = line.find('}')
-  statement = line[start+1:end].strip()
-  if statement.startswith('if '):
-    if inside_if == True:
-      print 'Fatal Error: Nested {if} found on line ' + str(line_num)
-      print line
-      quit()
-
-    # Evaluate whether the expression is true/false.
-    # only one variable name allowed for now
-    variable_name = statement[3:].strip()
-    if variable_name in enabled_flags:
-      last_if_true = True
-      line = '<!--{if ' + variable_name + '}-->'
-    else:
-      last_if_true = False
-      line = '<!--{if ' + variable_name + '}>'
-
-    inside_if = True
-
-  elif statement == 'else':
-    if inside_if == False:
-      print 'Fatal Error: {else} found without {if} on line ' + str(line_num)
-      print line
-      quit()
-    if inside_if == 'else':
-      print 'Fatal Error: Multiple {else} clauses found in the same if on line ' + str(line_num)
-      print line
-      quit()
-
-    if last_if_true:
-      line = '<!--{else}>'
-    else:
-      line = '<!{else}-->'
-
-    # invert the logic so the endif clause is closed properly
-    last_if_true = not last_if_true
-
-    # ensure we don't have two else statements in the same if
-    inside_if = 'else'
-
-  elif statement == 'endif':
-    if inside_if == False:
-      print 'Fatal Error: {endif} found without {if} on line ' + str(line_num)
-      print line
-      quit()
-
-    if last_if_true:
-      line = '<!--{endif}-->'
-    else:
-      line = '<!{endif}-->'
-
-    inside_if = False
-
-  return line
-
-def ship(inFileName, enabled_flags):
-  # read in HTML file
-  lines = file(inFileName, 'r').readlines()
-  out_lines = []
-  i = 0
-
-  # loop for each line of markup
-  for line in lines:
-    strline = line.strip()
-    # if we find a comment, process it and print out
-    if strline.startswith('<!--{') or strline.startswith('<!{'):
-      # using the same indentation as the previous line
-      start = line.find('<')
-      out_lines.append(line[:start] \
-        + parseComment(strline, i, enabled_flags) \
-        + os.linesep)
-    else: # else append line to the output list
-      out_lines.append(line)
-    i += 1
-
-  return ''.join(out_lines)
-
-if __name__ == '__main__':
-  options, (input, output) = parse_args()
-
-  if options.input_html_file != None:
-    enabled_flags = []
-    if options.enabled_flags != None:
-      enabled_flags.extend(options.enabled_flags)
-    out_file = ship(options.input_html_file, enabled_flags)
-    print out_file

cypress.json

@@ -1,3 +1,7 @@
 {
-  "baseUrl": "http://localhost:8000"
+  "baseUrl": "http://localhost:8000",
+  "reporter": "cypress-multi-reporters",
+  "reporterOptions": {
+    "configFile": "mocha-multi-reporters.json"
+  }
 }

docs/Contributing.md

@@ -13,11 +13,11 @@
   - `Enhancement: `
   - `Optimization: ` - Performance enhancements
   - `Localization:`
+  - `Docs: `
   - `Update: ` - e.g., if updating a bundled library or updating code per a
     dependency's updated new API
   - `Refactoring: `
   - `Linting (<type>):` - Linting by type, e.g., "ESLint"
   - `Testing:`
-  - `Docs: `
   - `Build: `
   - `npm` - Updates to dependencies, npm version, etc.

editor/extensions/imagelib/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- AUTO-GENERATED FROM imagelib/index-es.html; DO NOT EDIT; use build-html.js to build -->
+<!-- AUTO-GENERATED FROM imagelib/index-es.html; DO NOT EDIT; use build/build-html.js to build -->
 <html>
 <head>
     <meta charset="utf-8" />

editor/extensions/imagelib/openclipart.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- AUTO-GENERATED FROM imagelib/openclipart-es.html; DO NOT EDIT; use build-html.js to build -->
+<!-- AUTO-GENERATED FROM imagelib/openclipart-es.html; DO NOT EDIT; use build/build-html.js to build -->
 <html lang="en" dir="ltr">
   <head>
     <meta charset="utf-8" />

editor/svg-editor.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- AUTO-GENERATED FROM svg-editor-es.html; DO NOT EDIT; use build-html.js to build -->
+<!-- AUTO-GENERATED FROM svg-editor-es.html; DO NOT EDIT; use build/build-html.js to build -->
 <html>
 <head>
     <meta charset="utf-8" />

editor/xdomain-svg-editor-es.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- AUTO-GENERATED FROM svg-editor-es.html; DO NOT EDIT; use build-html.js to build -->
+<!-- AUTO-GENERATED FROM svg-editor-es.html; DO NOT EDIT; use build/build-html.js to build -->
 <html>
 <head>
     <meta charset="utf-8" />

editor/xdomain-svg-editor.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<!-- AUTO-GENERATED FROM xdomain-svg-editor-es.html; DO NOT EDIT; use build-html.js to build -->
+<!-- AUTO-GENERATED FROM xdomain-svg-editor-es.html; DO NOT EDIT; use build/build-html.js to build -->
 <html>
 <head>
     <meta charset="utf-8" />

mocha-multi-reporters.json

@@ -0,0 +1,9 @@
+{
+  "mochawesomeReporterOptions": {
+    "reportDir": "cypress/results",
+    "overwrite": false,
+    "html": false,
+    "json": true
+  },
+  "reporterEnabled": "spec, mochawesome"
+}

package.json

@@ -23,7 +23,7 @@
     "build-docs": "run-s -c build-docs-remove build-docs-create",
     "open-docs-no-start": "open-cli http://localhost:8000/docs/jsdoc/",
     "open-docs": "run-p start open-docs-no-start",
-    "build-html": "npx babel-node --plugins @babel/plugin-transform-modules-commonjs build-html.js",
+    "build-html": "npx babel-node --plugins @babel/plugin-transform-modules-commonjs build/build-html.js",
     "compress-images": "imageoptim \"chrome-app/*.png\" \"editor/extensions/*.png\" \"editor/spinbtn/*.png\" \"editor/jgraduate/images/*.{png,gif}\" \"editor/images/*.png\"",
     "copy": "copyfiles -f node_modules/load-stylesheets/dist/index-es.js editor/external/load-stylesheets && copyfiles -f node_modules/jamilih/dist/jml-es.js editor/external/jamilih && copyfiles -f node_modules/query-result/esm/index.js editor/external/query-result/esm && copyfiles -f node_modules/qr-manipulation/dist/index-es.js editor/external/qr-manipulation/dist && copyfiles -f node_modules/stackblur-canvas/dist/stackblur-es.js editor/external/stackblur-canvas/dist && copyfiles -f node_modules/regenerator-runtime/runtime.js editor/external/regenerator-runtime && copyfiles -f \"node_modules/core-js-bundle//minified*\" editor/external/core-js-bundle && copyfiles -f \"node_modules/underscore/underscore-*\" editor/jspdf && copyfiles -f \"node_modules/deparam/dist/deparam.esm.js\" editor/external/deparam",
     "remark": "remark -q -f .",
@@ -34,7 +34,9 @@
     "start-embedded": "echo \"Open file to http://localhost:8000/editor/embedapi.html\" && run-p start start-allow-origin",
     "start": "echo \"Open file, e.g., to http://localhost:8000/editor/svg-editor-es.html\" && static -p 8000",
     "cypress:open": "cypress open",
-    "cypress:run-no-badge": "cypress run",
+    "cypress:merge": "mochawesome-merge \"cypress/results/*.json\">mochawesome.json && marge mochawesome.json && node build/testing-badge.js",
+    "cypress:run-only": "rimraf \"cypress/results/*\" && cypress run",
+    "cypress:run-no-badge": "run-s -c cypress:run-only cypress:merge",
     "cypress:run": "run-s cypress:run-no-badge coverage-badge",
     "open-report-no-start": "open-cli http://localhost:8000/coverage/",
     "open-report": "run-p start open-report-no-start",
@@ -134,6 +136,7 @@
     "coveradge": "^0.2.0",
     "cypress": "^3.8.1",
     "cypress-axe": "^0.5.3",
+    "cypress-multi-reporters": "^1.2.3",
     "deparam": "git+https://github.com/brettz9/deparam.git#updates",
     "eslint": "^6.8.0",
     "eslint-config-ash-nazg": "^16.4.0",
@@ -159,6 +162,11 @@
     "jamilih": "^0.46.0",
     "jsdoc": "^3.6.3",
     "load-stylesheets": "^0.9.0",
+    "mocha": "^7.0.0",
+    "mocha-badge-generator": "https://github.com/brettz9/mocha-badge-generator#updated-badge-up",
+    "mochawesome": "^4.1.0",
+    "mochawesome-merge": "^4.0.0",
+    "mochawesome-report-generator": "^4.1.0",
     "node-static": "^0.7.11",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",