Merge branch 'main' into select-no-value-update-refactor

ni · Apr 30, 2024 · 68f22d1 · 68f22d1
2 parents 6f22ec7 + 237a6d3
commit 68f22d1
Show file tree

Hide file tree

Showing 7 changed files with 182 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -100,11 +100,8 @@ jobs:
           exitOnceUploaded: true # Do not wait for test results
           exitZeroOnChanges: true # Option to prevent the workflow from failing
 
-      # Lint
-      - run: npm run lint
-
-      # Test
-      - run: npm run test
+      # Lint and Test
+      - run: npm run concurrently-lint-test
 
       # Run Lighthouse audit (from any push)
       - name: Performance Audit with Lighthouse CI

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,8 @@
     "invoke-publish": "cross-env-shell beachball publish --yes --access public --message \\\"applying package updates [skip ci]\\\" -n $NPM_SECRET_TOKEN",
     "validate": "npm run build && npm run lint && npm run test",
     "performance": "npm run performance --workspaces --if-present",
-    "beachball-sync": "beachball sync"
+    "beachball-sync": "beachball sync",
+    "concurrently-lint-test": "concurrently --group \"npm run lint\" \"npm run test\""
   },
   "repository": {
     "type": "git",
@@ -50,6 +51,7 @@
   ],
   "devDependencies": {
     "beachball": "^2.31.0",
+    "concurrently": "^8.2.2",
     "cross-env": "^7.0.3",
     "patch-package": "^8.0.0",
     "playwright": "1.42.0"

diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Tue, 30 Apr 2024 15:26:51 GMT",
+      "version": "27.0.5",
+      "tag": "@ni/nimble-components_v27.0.5",
+      "comments": {
+        "none": [
+          {
+            "author": "rajsite@users.noreply.github.com",
+            "package": "@ni/nimble-components",
+            "commit": "cd00c0c1bf9bdfe7f066549d2baf123843c1badd",
+            "comment": "Try some less verbose test flags"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 26 Apr 2024 21:13:31 GMT",
       "version": "27.0.5",

diff --git a/packages/nimble-components/karma.conf.verbose.js b/packages/nimble-components/karma.conf.verbose.js
@@ -8,7 +8,12 @@ module.exports = config => {
     originalConfigFunction(config);
     const options = {
         plugins: [...config.plugins, 'karma-spec-reporter'],
-        reporters: [...config.reporters, 'spec']
+        reporters: [...config.reporters, 'spec'],
+        specReporter: {
+            suppressPassed: true,
+            suppressSkipped: false,
+            showSpecTiming: true
+        }
     };
 
     config.set(options);

diff --git a/packages/spright-components/CHANGELOG.json b/packages/spright-components/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/spright-components",
   "entries": [
+    {
+      "date": "Tue, 30 Apr 2024 15:26:51 GMT",
+      "version": "0.0.7",
+      "tag": "@ni/spright-components_v0.0.7",
+      "comments": {
+        "none": [
+          {
+            "author": "rajsite@users.noreply.github.com",
+            "package": "@ni/spright-components",
+            "commit": "cd00c0c1bf9bdfe7f066549d2baf123843c1badd",
+            "comment": "Try some less verbose test flags"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 26 Apr 2024 21:13:31 GMT",
       "version": "0.0.7",

diff --git a/packages/spright-components/karma.conf.verbose.js b/packages/spright-components/karma.conf.verbose.js
@@ -8,7 +8,12 @@ module.exports = config => {
     originalConfigFunction(config);
     const options = {
         plugins: [...config.plugins, 'karma-spec-reporter'],
-        reporters: [...config.reporters, 'spec']
+        reporters: [...config.reporters, 'spec'],
+        specReporter: {
+            suppressPassed: true,
+            suppressSkipped: false,
+            showSpecTiming: true
+        }
     };
 
     config.set(options);