Merge remote-tracking branch 'upstream/main' into GPIIGH-3

.fluidlintallrc.json

@@ -0,0 +1,17 @@
+{
+    "sources": {
+        "md":    [ "./*.md","./docs/**/*.md"],
+        "js":    ["./src/**/*.js", "./tests/**/*.js", "./*.js"],
+        "json":  ["./src/**/*.json", "tests/**/*.json", "configs/**/*.json", "./*.json"],
+        "json5": [],
+        "other": ["./.*"]
+    },
+    "lintspaces": {
+        "newlines": {
+            "excludes": ["./src/**/*.ttf", "./src/**/*.handlebars"]
+        }
+    },
+    "stylelint": {
+        "enabled": false
+    }
+}

docs/contributing.md

@@ -18,4 +18,4 @@ A pull request is more likely to be accepted if it:
 2. Does not break any tests.
 3. Includes tests for any new functionality, so that the code coverage remains high.
 4. Passes all linting checks.  This sometimes involves reformatting code to match the existing style.  It can also
-   involve discussing and making changes to the linting checks. 
+   involve discussing and making changes to the linting checks.

docs/deploying-updates.md

@@ -6,7 +6,7 @@ Before deploying changes, you are expected to test them locally by rebuilding th
 
 To rebuild the ul-website container, run a command like the following from the root of this repository:
 
-```
+```shell
 docker build . -t ul-website:latest
 ```
 
@@ -15,7 +15,7 @@ To rebuild the ul-imports container, [see the documentation in the ul-imports re
 Once you have a new container image to test, you can deploy it locally using commands like the following from the root
 of this repository:
 
-```
+```shell
 docker-compose down
 docker-compose up -d.
 ```
@@ -40,15 +40,15 @@ website functions as expected:
 Once you are satisfied that the updated container(s) are working as expected, you will need to copy the container
 image to production.  From your local machine, save the updated container(s) using commands like:
 
-```console
+```shell
 docker save ul-website | gzip > /tmp/ul-website.tar.gz
 docker save ul-imports | gzip > /tmp/ul-imports.tar.gz
 scp /tmp/ul-*.tar.gz ul-vm:
 ```
 
 You'll then need to SSH to the ul-vm, and run commands like the following:
 
-```
+```shell
 gunzip ul-website.tar.gz
 sudo docker import ul-website
 cd /srv/ul-website

docs/syncing-couchdb.md

@@ -1,4 +1,4 @@
-## Syncing CouchDB
+# Syncing CouchDB
 
 When performing local QA, it is expected that you test as much as possible with live data. This document covers
 synchronising your local data with the live instance.  You'll want to remove any existing data to avoid conflicts
@@ -13,7 +13,7 @@ that would result from changes made in local testing.
    1. Navigate to the "Replication" page in Fauxton
    2. Click "New Replication".
    3. Under "Source"
-      1. Set the "Type" to "Remote Database" 
+      1. Set the "Type" to "Remote Database"
       2. On OS X, the database URL is something like `https://docker.for.mac.localhost:15984/ul`.  For other
          platforms [see this issue](https://github.com/docker/for-linux/issues/264#issuecomment-966221821).
       3. Set the "Authentication" to "Username and password" and enter each.

package.json

@@ -4,6 +4,7 @@
     "description": "This package provides the web site as well as the manufacturer and contributor interface to the Unified Listing.",
     "main": "index.js",
     "scripts": {
+        "lint": "fluid-lint-all",
         "pretest": "node node_modules/rimraf/bin.js reports/* instrumented/* coverage/* && node node_modules/istanbul/lib/cli.js instrument --no-compact --output instrumented src",
         "test": "node node_modules/istanbul/lib/cli.js cover tests/all-tests.js --report none --print none",
         "posttest": "node node_modules/istanbul/lib/cli.js report --root coverage --dir reports text-summary html"
@@ -36,12 +37,11 @@
         "ul-imports": "1.0.0-dev.20210928T110407Z.f5a1f92.post-eastin"
     },
     "devDependencies": {
-        "eslint": "6.5.1",
-        "eslint-config-fluid": "1.4.0",
+        "eslint": "8.3.0",
+        "eslint-config-fluid": "2.0.0",
         "gpii-couchdb-test-harness": "1.0.1",
-        "gpii-grunt-lint-all": "1.0.5",
+        "fluid-lint-all": "1.1.5",
         "gpii-webdriver": "1.1.0",
-        "grunt": "1.0.4",
         "istanbul": "0.4.5",
         "node-jqunit": "1.1.8",
         "rimraf": "3.0.0"

src/css/ul-icons.css

@@ -28,4 +28,3 @@
 .ul-icon-settings:before {
     content: "\2699";
 }
-

src/css/ul.css

@@ -180,4 +180,4 @@ img {
     margin-right: .5em;
     width:  100px;
     height: 100px;
-}
+}

tests/static/cors-tests.html

@@ -43,4 +43,4 @@ <h2 id="qunit-userAgent"></h2>
         <script src="js/cors-fixtures.js"></script>
         <script src="js/cors-jqunit-tests.js"></script>
     </body>
-</html>
+</html>

tests/static/css/toggle-functional-tests.css

@@ -4,4 +4,4 @@
 
 .toggleClass2 {
     color: red;
-}
+}

tests/static/js/checkboxPanel-fixtures.js

@@ -1,5 +1,4 @@
 // Test fixtures to confirm that our checkbox panel works in browsers.
-/* globals fluid */
 (function () {
     "use strict";
     fluid.registerNamespace("gpii.tests.ul.checkboxPanel");

tests/static/js/checkboxPanel-jqunit-tests.js

@@ -1,5 +1,4 @@
 // Test fixtures to confirm that our checkbox panel works in browsers.
-/* globals fluid */
 (function () {
     "use strict";
 

tests/static/js/cors-fixtures.js

@@ -1,5 +1,4 @@
 // Test fixtures to confirm that our CORS headers work in actual browsers.
-/* globals fluid, $, XMLHttpRequest */
 (function () {
     "use strict";
     var gpii = fluid.registerNamespace("gpii");

tests/static/js/cors-jqunit-tests.js

@@ -1,5 +1,5 @@
 // Test fixtures to confirm that our CORS headers work in actual browsers.
-/* globals fluid, jqUnit, QUnit, $ */
+/* globals QUnit, jqUnit */
 (function () {
     "use strict";
     var gpii = fluid.registerNamespace("gpii");

tests/static/js/toggle-fixtures.js

@@ -1,5 +1,4 @@
 // Test fixtures for the "toggle" functional tests.
-/* globals fluid */
 (function () {
     "use strict";
 

tests/templates/pages/checkboxPanel-functional-tests.handlebars

@@ -26,4 +26,4 @@
 <script type="text/javascript">
     var stringComponent       = gpii.tests.ul.checkboxPanel.component.string(".checkboxPanel-string-viewport");
     var secondStringComponent = gpii.tests.ul.checkboxPanel.component.string(".checkboxPanel-string-second-viewport");
-</script>
+</script>

tests/templates/pages/checkboxPanel-qunit-tests.handlebars

@@ -36,4 +36,4 @@
 <script src="/src/js/client/checkboxPanel.js"></script>
 
 <script src="/tests/static/js/checkboxPanel-fixtures.js"></script>
-<script src="/tests/static/js/checkboxPanel-jqunit-tests.js"></script>
+<script src="/tests/static/js/checkboxPanel-jqunit-tests.js"></script>

tests/templates/pages/toggle-functional-tests.handlebars

@@ -39,4 +39,4 @@
     var secondShortToggle = gpii.tests.ul.toggle.short(".second-short-toggle-viewport");
     var firstLongToggle   = gpii.tests.ul.toggle.long(".first-long-toggle-viewport");
     var secondLongToggle  = gpii.tests.ul.toggle.long(".second-long-toggle-viewport");
-</script>
+</script>