fix: logo and jest

Author: beeman

package.json

@@ -23,7 +23,7 @@
     "@mantine/spotlight": "^7.2.2",
     "@nx/devkit": "17.1.3",
     "@nx/linter": "^17.1.3",
-    "@solana-developers/preset-anchor": "2.0.0-beta.2",
+    "@solana-developers/preset-anchor": "2.0.0-beta.4",
     "@solana/spl-token": "^0.3.9",
     "@solana/wallet-adapter-base": "^0.9.23",
     "@solana/wallet-adapter-react": "^0.15.35",

packages/core/src/lib/ui-logo/ui-logo.tsx

@@ -4,7 +4,7 @@ export function UiLogo({ height, width, ...props }: UiLogoTypeProps = {}) {
   return (
     <svg height={height} width={width} viewBox="0 0 512 512" version="1.1" {...props}>
       <rect fill="#1C7ED6" x="0" y="0" width="512" height="512" rx="64"></rect>
-      <g transform="translate(142.000000, 96.000000)" fill="#FFFFFF" fill-rule="nonzero">
+      <g transform="translate(142.000000, 96.000000)" fill="#FFFFFF" fillRule="nonzero">
         <path d="M55.296,210.432 L55.296,316.416 C52.5653333,317.44 48.9813333,318.378667 44.544,319.232 C40.1066667,320.085333 35.1573333,320.512 29.696,320.512 C19.1146667,320.512 11.52,318.549333 6.912,314.624 C2.304,310.698667 0,304.128 0,294.912 L0,30.72 C0,24.9173333 1.62133333,20.3946667 4.864,17.152 C8.10666667,13.9093333 12.6293333,11.4346667 18.432,9.728 C29.0133333,5.97333333 41.6426667,3.41333333 56.32,2.048 C70.9973333,0.682666667 84.8213333,-5.68434189e-14 97.792,-5.68434189e-14 C142.165333,-5.68434189e-14 175.018667,9.38666667 196.352,28.16 C217.685333,46.9333333 228.352,72.3626667 228.352,104.448 C228.352,136.533333 217.685333,162.218667 196.352,181.504 C175.018667,200.789333 143.189333,210.432 100.864,210.432 L55.296,210.432 Z M97.28,165.888 C120.832,165.888 139.349333,160.768 152.832,150.528 C166.314667,140.288 173.056,124.928 173.056,104.448 C173.056,83.968 166.656,68.9493333 153.856,59.392 C141.056,49.8346667 122.709333,45.056 98.816,45.056 C90.9653333,45.056 83.2,45.3973333 75.52,46.08 C67.84,46.7626667 60.928,47.616 54.784,48.64 L54.784,165.888 L97.28,165.888 Z"></path>
       </g>
     </svg>

packages/create-pubkey-ui-app/package.json

@@ -2,7 +2,8 @@
   "name": "create-pubkey-ui-app",
   "version": "0.0.1",
   "dependencies": {
-    "create-nx-workspace": "17.1.3"
+    "create-nx-workspace": "17.1.3",
+    "tslib": "^2.3.0"
   },
   "type": "commonjs",
   "main": "./src/index.js",

packages/generators/jest.config.ts

@@ -5,6 +5,7 @@ export default {
   transform: {
     '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
   },
+  transformIgnorePatterns: ['node_modules/(?!.*\\.d.ts$)'],
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/packages/generators',
 }

packages/generators/package.json

@@ -7,7 +7,7 @@
     "@nx/js": "17.1.3",
     "@nx/linter": "^17.1.3",
     "@nx/react": "17.1.3",
-    "@solana-developers/preset-anchor": "2.0.0-beta.2"
+    "@solana-developers/preset-anchor": "2.0.0-beta.4"
   },
   "type": "commonjs",
   "main": "./src/index.js",

packages/generators/src/generators/component/__snapshots__/component-generator.spec.ts.snap

@@ -822,7 +822,7 @@ exports[`component generator should create files for logo 1`] = `
           "<g",
           "transform="translate(142.000000, 96.000000)"",
           "fill="#FFFFFF"",
-          "fill-rule="nonzero"",
+          "fillRule="nonzero"",
           ">",
           "<path d="M55.296,210.432 L55.296,316.416 C52.5653333,317.44 48.9813333,318.378667 44.544,319.232 C40.1066667,320.085333 35.1573333,320.512 29.696,320.512 C19.1146667,320.512 11.52,318.549333 6.912,314.624 C2.304,310.698667 0,304.128 0,294.912 L0,30.72 C0,24.9173333 1.62133333,20.3946667 4.864,17.152 C8.10666667,13.9093333 12.6293333,11.4346667 18.432,9.728 C29.0133333,5.97333333 41.6426667,3.41333333 56.32,2.048 C70.9973333,0.682666667 84.8213333,-5.68434189e-14 97.792,-5.68434189e-14 C142.165333,-5.68434189e-14 175.018667,9.38666667 196.352,28.16 C217.685333,46.9333333 228.352,72.3626667 228.352,104.448 C228.352,136.533333 217.685333,162.218667 196.352,181.504 C175.018667,200.789333 143.189333,210.432 100.864,210.432 L55.296,210.432 Z M97.28,165.888 C120.832,165.888 139.349333,160.768 152.832,150.528 C166.314667,140.288 173.056,124.928 173.056,104.448 C173.056,83.968 166.656,68.9493333 153.856,59.392 C141.056,49.8346667 122.709333,45.056 98.816,45.056 C90.9653333,45.056 83.2,45.3973333 75.52,46.08 C67.84,46.7626667 60.928,47.616 54.784,48.64 L54.784,165.888 L97.28,165.888 Z"></path>",
           "</g>",

packages/generators/src/generators/component/files/logo/__prefixFileName__-logo.tsx.template

@@ -4,7 +4,7 @@ export function <%= prefix.className %>Logo({height, width, ...props}: <%= prefi
   return (
     <svg height={height} width={width} viewBox="0 0 512 512" version="1.1" {...props}>
       <rect fill="#1C7ED6" x="0" y="0" width="512" height="512" rx="64"></rect>
-      <g transform="translate(142.000000, 96.000000)" fill="#FFFFFF" fill-rule="nonzero">
+      <g transform="translate(142.000000, 96.000000)" fill="#FFFFFF" fillRule="nonzero">
         <path
           d="M55.296,210.432 L55.296,316.416 C52.5653333,317.44 48.9813333,318.378667 44.544,319.232 C40.1066667,320.085333 35.1573333,320.512 29.696,320.512 C19.1146667,320.512 11.52,318.549333 6.912,314.624 C2.304,310.698667 0,304.128 0,294.912 L0,30.72 C0,24.9173333 1.62133333,20.3946667 4.864,17.152 C8.10666667,13.9093333 12.6293333,11.4346667 18.432,9.728 C29.0133333,5.97333333 41.6426667,3.41333333 56.32,2.048 C70.9973333,0.682666667 84.8213333,-5.68434189e-14 97.792,-5.68434189e-14 C142.165333,-5.68434189e-14 175.018667,9.38666667 196.352,28.16 C217.685333,46.9333333 228.352,72.3626667 228.352,104.448 C228.352,136.533333 217.685333,162.218667 196.352,181.504 C175.018667,200.789333 143.189333,210.432 100.864,210.432 L55.296,210.432 Z M97.28,165.888 C120.832,165.888 139.349333,160.768 152.832,150.528 C166.314667,140.288 173.056,124.928 173.056,104.448 C173.056,83.968 166.656,68.9493333 153.856,59.392 C141.056,49.8346667 122.709333,45.056 98.816,45.056 C90.9653333,45.056 83.2,45.3973333 75.52,46.08 C67.84,46.7626667 60.928,47.616 54.784,48.64 L54.784,165.888 L97.28,165.888 Z"></path>
       </g>

packages/generators/src/generators/components/__snapshots__/components-generator.spec.ts.snap

@@ -555,7 +555,7 @@ exports[`components generator should run successfully 1`] = `
               "<g",
               "transform="translate(142.000000, 96.000000)"",
               "fill="#FFFFFF"",
-              "fill-rule="nonzero"",
+              "fillRule="nonzero"",
               ">",
               "<path d="M55.296,210.432 L55.296,316.416 C52.5653333,317.44 48.9813333,318.378667 44.544,319.232 C40.1066667,320.085333 35.1573333,320.512 29.696,320.512 C19.1146667,320.512 11.52,318.549333 6.912,314.624 C2.304,310.698667 0,304.128 0,294.912 L0,30.72 C0,24.9173333 1.62133333,20.3946667 4.864,17.152 C8.10666667,13.9093333 12.6293333,11.4346667 18.432,9.728 C29.0133333,5.97333333 41.6426667,3.41333333 56.32,2.048 C70.9973333,0.682666667 84.8213333,-5.68434189e-14 97.792,-5.68434189e-14 C142.165333,-5.68434189e-14 175.018667,9.38666667 196.352,28.16 C217.685333,46.9333333 228.352,72.3626667 228.352,104.448 C228.352,136.533333 217.685333,162.218667 196.352,181.504 C175.018667,200.789333 143.189333,210.432 100.864,210.432 L55.296,210.432 Z M97.28,165.888 C120.832,165.888 139.349333,160.768 152.832,150.528 C166.314667,140.288 173.056,124.928 173.056,104.448 C173.056,83.968 166.656,68.9493333 153.856,59.392 C141.056,49.8346667 122.709333,45.056 98.816,45.056 C90.9653333,45.056 83.2,45.3973333 75.52,46.08 C67.84,46.7626667 60.928,47.616 54.784,48.64 L54.784,165.888 L97.28,165.888 Z"></path>",
               "</g>",

packages/generators/src/generators/theme/__snapshots__/theme-generator.spec.ts.snap

@@ -131,7 +131,7 @@ exports[`theme generator should run successfully 1`] = `
               },
               "app-routes.tsx": {
                 "content": [
-                  "import { UiThemeLink } from '@pubkey-ui/core';",
+                  "import { UiThemeLink } from './ui/';",
                   "import { Link, Navigate, RouteObject, useRoutes } from 'react-router-dom';",
                   "import { DemoFeature } from './features';",
                   "import { DashboardFeature } from './features/dashboard/dashboard-feature';",
@@ -715,7 +715,7 @@ exports[`theme generator should run successfully 1`] = `
                           "<g",
                           "transform="translate(142.000000, 96.000000)"",
                           "fill="#FFFFFF"",
-                          "fill-rule="nonzero"",
+                          "fillRule="nonzero"",
                           ">",
                           "<path d="M55.296,210.432 L55.296,316.416 C52.5653333,317.44 48.9813333,318.378667 44.544,319.232 C40.1066667,320.085333 35.1573333,320.512 29.696,320.512 C19.1146667,320.512 11.52,318.549333 6.912,314.624 C2.304,310.698667 0,304.128 0,294.912 L0,30.72 C0,24.9173333 1.62133333,20.3946667 4.864,17.152 C8.10666667,13.9093333 12.6293333,11.4346667 18.432,9.728 C29.0133333,5.97333333 41.6426667,3.41333333 56.32,2.048 C70.9973333,0.682666667 84.8213333,-5.68434189e-14 97.792,-5.68434189e-14 C142.165333,-5.68434189e-14 175.018667,9.38666667 196.352,28.16 C217.685333,46.9333333 228.352,72.3626667 228.352,104.448 C228.352,136.533333 217.685333,162.218667 196.352,181.504 C175.018667,200.789333 143.189333,210.432 100.864,210.432 L55.296,210.432 Z M97.28,165.888 C120.832,165.888 139.349333,160.768 152.832,150.528 C166.314667,140.288 173.056,124.928 173.056,104.448 C173.056,83.968 166.656,68.9493333 153.856,59.392 C141.056,49.8346667 122.709333,45.056 98.816,45.056 C90.9653333,45.056 83.2,45.3973333 75.52,46.08 C67.84,46.7626667 60.928,47.616 54.784,48.64 L54.784,165.888 L97.28,165.888 Z"></path>",
                           "</g>",