Merge branch 'master' into issue/7198

.circleci/config.yml

@@ -120,15 +120,13 @@ jobs:
             - generate_and_store_version_and_filesystem_artifacts
   e2e-test:
     parameters:
-      node-version:
-        type: string
       suite: #stable or full
         type: string
     executor: pw-focal-development
-    parallelism: 4
+    parallelism: 6
     steps:
       - build_and_install:
-          node-version: <<parameters.node-version>>
+          node-version: lts/hydrogen
       - when: #Only install chrome-beta when running the 'full' suite to save $$$
           condition:
             equal: ['full', <<parameters.suite>>]
@@ -155,13 +153,10 @@ jobs:
           steps:
             - generate_and_store_version_and_filesystem_artifacts
   e2e-couchdb:
-    parameters:
-      node-version:
-        type: string
     executor: ubuntu
     steps:
       - build_and_install:
-          node-version: <<parameters.node-version>>
+          node-version: lts/hydrogen
       - run: npx [email protected] install #Necessary for bare ubuntu machine
       - run: |
           export $(cat src/plugins/persistence/couch/.env.ci | xargs)
@@ -189,15 +184,28 @@ jobs:
             equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-  perf-test:
-    parameters:
-      node-version:
-        type: string
+  mem-test:
     executor: pw-focal-development
     steps:
       - build_and_install:
-          node-version: <<parameters.node-version>>
+          node-version: lts/hydrogen
       - run: npm run test:perf:memory
+      - store_test_results:
+          path: test-results/results.xml
+      - store_artifacts:
+          path: test-results
+      - store_artifacts:
+          path: html-test-results
+      - when:
+          condition:
+            equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
+          steps:
+            - generate_and_store_version_and_filesystem_artifacts
+  perf-test:
+    executor: pw-focal-development
+    steps:
+      - build_and_install:
+          node-version: lts/hydrogen
       - run: npm run test:perf:localhost
       - run: npm run test:perf:contract
       - store_test_results:
@@ -211,16 +219,14 @@ jobs:
             equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
           steps:
             - generate_and_store_version_and_filesystem_artifacts
-  visual-test:
+  visual-a11y-tests:
     parameters:
-      node-version:
-        type: string
       suite:
         type: string # ci or full
     executor: pw-focal-development
     steps:
       - build_and_install:
-          node-version: <<parameters.node-version>>
+          node-version: lts/hydrogen
       - run: npm run test:e2e:visual:<<parameters.suite>>
       - store_test_results:
           path: test-results/results.xml
@@ -244,14 +250,12 @@ workflows:
           node-version: lts/hydrogen
       - e2e-test:
           name: e2e-stable
-          node-version: lts/hydrogen
           suite: stable
-      - perf-test:
-          node-version: lts/hydrogen
-      - visual-test:
+      - mem-test
+      - perf-test
+      - visual-a11y-tests:
           name: visual-test-ci
           suite: ci
-          node-version: lts/hydrogen
 
   the-nightly: #These jobs do not run on PRs, but against master at night
     jobs:
@@ -265,16 +269,13 @@ workflows:
           node-version: lts/hydrogen
       - e2e-test:
           name: e2e-full-nightly
-          node-version: lts/hydrogen
           suite: full
-      - perf-test:
-          node-version: lts/hydrogen
-      - visual-test:
+      - mem-test
+      - perf-test
+      - visual-a11y-tests:
           name: visual-test-nightly
           suite: full
-          node-version: lts/hydrogen
-      - e2e-couchdb:
-          node-version: lts/hydrogen
+      - e2e-couchdb
     triggers:
       - schedule:
           cron: '0 0 * * *'

.cspell.json

@@ -490,7 +490,10 @@
     "Blockquotes",
     "oger",
     "lcovonly",
-    "gcov"
+    "gcov",
+    "WCAG",
+    "stackedplot",
+    "Andale"
   ],
   "dictionaries": ["npm", "softwareTerms", "node", "html", "css", "bash", "en_US"],
   "ignorePaths": [

.git-blame-ignore-revs

@@ -4,6 +4,10 @@
 # Requires Git > 2.23
 # See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
 
+# vue-eslint update 2019
+14a0f84c1bcd56886d7c9e4e6afa8f7d292734e5
+# eslint changes 2022
+d80b6923541704ab925abf0047cbbc58735c27e2
 # Copyright year update 2022
 4a9744e916d24122a81092f6b7950054048ba860
 # Copyright year update 2023

.webpack/webpack.common.js

@@ -1,5 +1,3 @@
-/* global __dirname module */
-
 /*
 This is the OpenMCT common webpack file. It is imported by the other three webpack configurations:
  - webpack.prod.js - the production configuration for OpenMCT (default)
@@ -8,27 +6,30 @@ This is the OpenMCT common webpack file. It is imported by the other three webpa
 There are separate npm scripts to use these configurations, though simply running `npm install`
 will use the default production configuration.
 */
-const path = require('path');
-const packageDefinition = require('../package.json');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-const webpack = require('webpack');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+import path from 'node:path';
+import CopyWebpackPlugin from 'copy-webpack-plugin';
+import webpack from 'webpack';
+import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+import fs from 'node:fs';
+import { execSync } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
 
-const { VueLoaderPlugin } = require('vue-loader');
+import { VueLoaderPlugin } from 'vue-loader';
 let gitRevision = 'error-retrieving-revision';
 let gitBranch = 'error-retrieving-branch';
 
+const packageDefinition = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url)));
+
 try {
-  gitRevision = require('child_process').execSync('git rev-parse HEAD').toString().trim();
-  gitBranch = require('child_process')
-    .execSync('git rev-parse --abbrev-ref HEAD')
+  gitRevision = execSync('git rev-parse HEAD').toString().trim();
+  gitBranch = execSync('git rev-parse --abbrev-ref HEAD')
     .toString()
     .trim();
 } catch (err) {
   console.warn(err);
 }
 
-const projectRootDir = path.resolve(__dirname, '..');
+const projectRootDir = fileURLToPath(new URL('../', import.meta.url));
 
 /** @type {import('webpack').Configuration} */
 const config = {
@@ -56,6 +57,7 @@ const config = {
     filename: '[name].js',
     path: path.resolve(projectRootDir, 'dist'),
     library: 'openmct',
+    libraryExport: 'default',
     libraryTarget: 'umd',
     publicPath: '',
     hashFunction: 'xxhash64',
@@ -69,14 +71,15 @@ const config = {
       csv: 'comma-separated-values',
       EventEmitter: 'eventemitter3',
       bourbon: 'bourbon.scss',
-      'plotly-basic': 'plotly.js-basic-dist',
-      'plotly-gl2d': 'plotly.js-gl2d-dist',
-      printj: path.join(projectRootDir, 'node_modules/printj/dist/printj.min.js'),
+      'plotly-basic': 'plotly.js-basic-dist-min',
+      'plotly-gl2d': 'plotly.js-gl2d-dist-min',
+      printj: 'printj/printj.mjs',
       styles: path.join(projectRootDir, 'src/styles'),
       MCT: path.join(projectRootDir, 'src/MCT'),
       testUtils: path.join(projectRootDir, 'src/utils/testUtils.js'),
       objectUtils: path.join(projectRootDir, 'src/api/objects/object-utils.js'),
-      utils: path.join(projectRootDir, 'src/utils')
+      utils: path.join(projectRootDir, 'src/utils'),
+      vue: 'vue/dist/vue.esm-bundler'
     }
   },
   plugins: [
@@ -182,4 +185,4 @@ const config = {
   }
 };
 
-module.exports = config;
+export default config;

.webpack/webpack.coverage.js

@@ -1,12 +1,10 @@
-/* global module */
-
 /*
 This file extends the webpack.dev.js config to add babel istanbul coverage.
 OpenMCT Continuous Integration servers use this configuration to add code coverage
 information to pull requests.
 */
 
-const config = require('./webpack.dev');
+import config from './webpack.dev.js';
 // eslint-disable-next-line no-undef
 const CI = process.env.CI === 'true';
 
@@ -34,4 +32,4 @@ config.module.rules.push({
   }
 });
 
-module.exports = config;
+export default config;

.webpack/webpack.dev.js

@@ -1,18 +1,16 @@
-/* global __dirname module */
-
 /*
 This configuration should be used for development purposes. It contains full source map, a
 devServer (which be invoked using by `npm start`), and a non-minified Vue.js distribution.
 If OpenMCT is to be used for a production server, use webpack.prod.js instead.
 */
-const path = require('path');
-const webpack = require('webpack');
-const { merge } = require('webpack-merge');
+import path from 'path';
+import webpack from 'webpack';
+import { merge } from 'webpack-merge';
+import { fileURLToPath } from 'node:url';
 
-const common = require('./webpack.common');
-const projectRootDir = path.resolve(__dirname, '..');
+import common from './webpack.common.js';
 
-module.exports = merge(common, {
+export default merge(common, {
   mode: 'development',
   watchOptions: {
     // Since we use require.context, webpack is watching the entire directory.
@@ -42,7 +40,7 @@ module.exports = merge(common, {
     },
     watchFiles: ['**/*.css'],
     static: {
-      directory: path.join(__dirname, '..', '/dist'),
+      directory: fileURLToPath(new URL('../dist', import.meta.url)),
       publicPath: '/dist',
       watch: false
     }

.webpack/webpack.prod.js

@@ -1,17 +1,14 @@
-/* global __dirname module */
-
 /*
 This configuration should be used for production installs.
 It is the default webpack configuration.
 */
-const path = require('path');
-const webpack = require('webpack');
-const { merge } = require('webpack-merge');
 
-const common = require('./webpack.common');
-const projectRootDir = path.resolve(__dirname, '..');
+import webpack from 'webpack';
+import { merge } from 'webpack-merge';
+
+import common from './webpack.common.js';
 
-module.exports = merge(common, {
+export default merge(common, {
   mode: 'production',
   plugins: [
     new webpack.DefinePlugin({

LICENSE.md

@@ -1,6 +1,6 @@
 # Open MCT License
 
-Open MCT, Copyright (c) 2014-2023, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
+Open MCT, Copyright (c) 2014-2024, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
 
 Open MCT is 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.
 

build-docs.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #*****************************************************************************
-#* Open MCT, Copyright (c) 2014-2023, United States Government
+#* Open MCT, Copyright (c) 2014-2024, United States Government
 #* as represented by the Administrator of the National Aeronautics and Space
 #* Administration. All rights reserved.
 #*

copyright-notice.html

@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2023, United States Government
+ Open MCT, Copyright (c) 2014-2024, United States Government
  as represented by the Administrator of the National Aeronautics and Space
  Administration. All rights reserved.
 

copyright-notice.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2023, United States Government
+ * Open MCT, Copyright (c) 2014-2024, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *

e2e/.percy.ci.yml

@@ -21,4 +21,13 @@ snapshot:
     /* Embedded timestamp in notebooks */
     .c-ne__embed__time{
       opacity: 0 !important;
-    }
+    }
+    /* Time Conductor Start Time */
+    .c-compact-tc__setting-value{
+      opacity: 0 !important;
+    }
+    /* Chart Area for Plots */
+    .gl-plot-chart-area{
+      opacity: 0 !important;
+    }
+   

e2e/.percy.nightly.yml

@@ -21,4 +21,12 @@ snapshot:
     /* Embedded timestamp in notebooks */
     .c-ne__embed__time{
       opacity: 0 !important;
+    }
+    /* Time Conductor Start Time */
+    .c-compact-tc__setting-value{
+      opacity: 0 !important;
+    }
+    /* Chart Area for Plots */
+    .gl-plot-chart-area{
+      opacity: 0 !important;
     }