Fixed cli tests.

openzipkin · Feb 21, 2024 · 39de04b · 39de04b
1 parent 1ae72c4
commit 39de04b
Show file tree

Hide file tree

Showing 26 changed files with 845 additions and 5,291 deletions.
diff --git a/docs/public/zipkin-api.yaml b/docs/public/zipkin-api.yaml
diff --git a/docs/public/zipkin.proto b/docs/public/zipkin.proto
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2018-2020 The OpenZipkin Authors
+    Copyright 2018-2024 The OpenZipkin Authors
 
     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
@@ -36,10 +36,11 @@
 
     <!-- Update occasionally based on LTS, but don't overrun what's in Alpine:
          https://pkgs.alpinelinux.org/packages?name=nodejs-current -->
-    <node.version>14.14.0</node.version>
+    <node.version>21.6.2</node.version>
+    <pnpm.version>8.15.3</pnpm.version>
     <exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
 
-    <frontend-maven-plugin.version>1.7.6</frontend-maven-plugin.version>
+    <frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
     <go-offline-maven-plugin.version>1.2.7</go-offline-maven-plugin.version>
     <!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
     <license-maven-plugin.version>4.0.rc2</license-maven-plugin.version>
@@ -183,33 +184,32 @@
         <configuration>
           <installDirectory>target</installDirectory>
           <nodeVersion>v${node.version}</nodeVersion>
+          <pnpmVersion>${pnpm.version}</pnpmVersion>
+          <workingDirectory>./site</workingDirectory>
           <environmentVariables>
-            <!--
-            create-react-app runs tests in watch mode unless this is defined. We define it here for running Maven locally.
-            -->
             <CI>true</CI>
           </environmentVariables>
         </configuration>
         <executions>
           <execution>
             <id>install node and npm</id>
             <goals>
-              <goal>install-node-and-npm</goal>
+              <goal>install-node-and-pnpm</goal>
             </goals>
           </execution>
           <execution>
-            <id>npm install</id>
+            <id>pnpm install</id>
             <goals>
-              <goal>npm</goal>
+              <goal>pnpm</goal>
             </goals>
             <configuration>
               <arguments>install</arguments>
             </configuration>
           </execution>
           <execution>
-            <id>npm run test</id>
+            <id>pnpm run test</id>
             <goals>
-              <goal>npm</goal>
+              <goal>pnpm</goal>
             </goals>
             <phase>test</phase>
             <configuration>
@@ -242,6 +242,8 @@
             <maven_release>SCRIPT_STYLE</maven_release>
           </mapping>
           <excludes>
+            <exclude>site/dist/**</exclude>
+            <exclude>**/pnpm-lock.yaml/**</exclude>
             <exclude>.gitignore</exclude>
             <exclude>.gitattributes</exclude>
             <exclude>.mvn/**</exclude>

diff --git a/docs/.gitignore → site/.gitignore b/docs/.gitignore → site/.gitignore
diff --git a/docs/LICENSE → site/LICENSE b/docs/LICENSE → site/LICENSE
diff --git a/docs/README.md → site/README.md b/docs/README.md → site/README.md
diff --git a/docs/index.html → site/index.html b/docs/index.html → site/index.html
diff --git a/docs/package.json → site/package.json b/docs/package.json → site/package.json
@@ -6,14 +6,20 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "test": "vitest"
   },
   "devDependencies": {
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.11.19",
     "@types/swagger-ui": "^3.52.4",
+    "js-yaml": "^4.1.0",
+    "protobufjs": "^7.2.6",
     "swagger-ui": "^5.11.7",
     "typescript": "^5.3.3",
     "vite": "^5.1.3",
-    "vite-plugin-static-copy": "^1.0.1"
+    "vite-plugin-static-copy": "^1.0.1",
+    "vitest": "^1.3.1",
+    "sway": "^2.0.6"
   }
 }