Skip to content

Commit c794e18

Browse files
committed
wip
1 parent 2f7bd27 commit c794e18

File tree

9 files changed

+37
-30
lines changed

9 files changed

+37
-30
lines changed

.storybook/preview.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ console.log(tmp);
88
import * as EmberNexus from '@ember-nexus/web-sdk';
99
import './style.css?style';
1010
import './preview.css?style';
11+
import {init} from '@ember-nexus/app-core';
1112

1213
const WebSdkConfiguration = EmberNexus.Service.WebSdkConfiguration;
1314
const container = EmberNexus.Container;
@@ -16,6 +17,9 @@ container.get(WebSdkConfiguration).setToken('secret-token:PIPeJGUt7c00ENn8a5uDlc
1617
container.get(EmberNexus.BrowserEvent.BrowserEventHandler).addBrowserEventListeners(document.body as HTMLElement);
1718
console.log(document.body);
1819

20+
const serviceResolver = init(document.body);
21+
(window as any).serviceResolver = serviceResolver;
22+
1923
const preview: Preview = {
2024
parameters: {
2125
controls: {

eslint.config.mjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,6 @@ export default [{
8888
caseInsensitive: true,
8989
},
9090
}],
91+
"no-duplicate-imports": "error",
9192
},
92-
}];
93+
}];

package.json

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
"build:esm": "yarn tsc -b tsconfig.esm.json",
1515
"cs": "eslint ./src",
1616
"cs:fix": "eslint ./src --fix",
17-
"test:unit": "jest ./test/Unit",
18-
"test:feature": "jest ./test/Feature",
19-
"test:example": "yarn build && jest ./test/Example",
17+
"test:unit": "vitest run ./test/Unit",
18+
"test:unit:coverage": "vitest run ./test/Unit --coverage",
2019
"prepare": "ts-patch install",
2120
"typedoc": "typedoc --tsconfig tsconfig.release.json",
2221
"storybook": "storybook dev -p 6006 -h 0.0.0.0",
@@ -25,6 +24,7 @@
2524
"author": "Syndesi <info@ember-nexus.dev>",
2625
"license": "MIT",
2726
"dependencies": {
27+
"@ember-nexus/app-core": "^0.0.1",
2828
"@ember-nexus/uix": "^0.0.4",
2929
"@ember-nexus/web-sdk": "^0.0.59",
3030
"apca-w3": "^0.1.9",
@@ -48,16 +48,14 @@
4848
"@storybook/test": "^8.4.7",
4949
"@storybook/web-components": "^8.4.7",
5050
"@storybook/web-components-webpack5": "^8.4.7",
51-
"@types/chai": "^4.3.4",
52-
"@types/chai-as-promised": "^7.1.5",
5351
"@types/color-hash": "^2.0.0",
54-
"@types/jest": "^29.5.12",
5552
"@types/node": "^20.8.10",
5653
"@types/sinon": "^17.0.0",
5754
"@typescript-eslint/eslint-plugin": "^7.14",
5855
"@typescript-eslint/parser": "^7.14",
59-
"chai": "^5.1",
60-
"chai-as-promised": "^8.0",
56+
"@vitest/coverage-v8": "^3.1.4",
57+
"@vitest/eslint-plugin": "^1.2.1",
58+
"@vitest/ui": "^3.1.4",
6159
"copyfiles": "^2.4.1",
6260
"css-loader": "^7.1.2",
6361
"css-minimizer-webpack-plugin": "^7.0.0",
@@ -70,7 +68,6 @@
7068
"globals": "^15.6.0",
7169
"http-server": "^14.1.1",
7270
"ignore-loader": "^0.1.2",
73-
"jest": "^29.7.0",
7471
"lost-pixel": "^3.22.0",
7572
"mini-css-extract-plugin": "^2.9.2",
7673
"msw": "^2.0.2",
@@ -80,7 +77,6 @@
8077
"storybook": "^8.4.7",
8178
"style-loader": "^4.0.0",
8279
"terser-webpack-plugin": "^5.3.10",
83-
"ts-jest": "^29.1.2",
8480
"ts-loader": "^9.5.1",
8581
"ts-mockito": "^2.6.1",
8682
"ts-node": "^10.9.2",
@@ -91,13 +87,10 @@
9187
"typedoc-plugin-mdn-links": "^3.1.9",
9288
"typedoc-theme-hierarchy": "^5.0",
9389
"typescript": "^5.5",
94-
"uri-js-replace": "^1.0.0",
90+
"vitest": "^3.1.4",
9591
"webpack": "^5.89.0",
9692
"webpack-cli": "^5.1.4"
9793
},
98-
"resolutions": {
99-
"uri-js": "npm:uri-js-replace"
100-
},
10194
"eslintConfig": {
10295
"extends": [
10396
"plugin:storybook/recommended"

src/Component/Default/EmberNexusDefaultCard.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ import { customElement, property, state } from 'lit/decorators.js';
66
import { styleMap } from 'lit/directives/style-map.js';
77
import { Actor, createActor } from 'xstate';
88

9-
import { findBestFontWeightColor, getNameFromElementOrId, getTitleFromElementOrId } from '../../Helper';
10-
import { getColorFromElementOrId } from '../../Helper/ColorHelper';
11-
import { getIconForElement } from '../../Helper/IconHelper';
9+
import {
10+
findBestFontWeightColor,
11+
getColorFromElementOrId,
12+
getIconForElement,
13+
getNameFromElementOrId,
14+
getTitleFromElementOrId,
15+
} from '../../Helper';
1216
import { singleElementMachine } from '../../Machine';
1317
import { tmpStyle } from '../../Style';
1418
import { colorWarning } from '../../Type';
@@ -138,6 +142,7 @@ class EmberNexusDefaultCard extends LitElement {
138142
</div>
139143
<div class="description font-sans">
140144
<p>${description}</p>
145+
<p>blub blab :D</p>
141146
</div>
142147
</div>`;
143148
}

src/Component/Default/EmberNexusDefaultIcon.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ import { customElement, property, state } from 'lit/decorators.js';
44
import { styleMap } from 'lit/directives/style-map.js';
55
import { Actor, createActor } from 'xstate';
66

7-
import { findBestFontWeightColor, getInitialsFromElementOrId, getTitleFromElementOrId } from '../../Helper';
8-
import { getColorFromElementOrId } from '../../Helper/ColorHelper';
7+
import {
8+
findBestFontWeightColor,
9+
getColorFromElementOrId,
10+
getInitialsFromElementOrId,
11+
getTitleFromElementOrId,
12+
} from '../../Helper';
913
import { singleElementMachine } from '../../Machine';
10-
import { fontStyle, shadowStyle } from '../../Style';
11-
import { iconComponentStyle } from '../../Style';
14+
import { fontStyle, iconComponentStyle, shadowStyle } from '../../Style';
1215
import { colorWarning } from '../../Type';
1316

1417
@customElement('ember-nexus-default-icon')

src/Component/Default/EmberNexusDefaultPill.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import { Actor, createActor } from 'xstate';
66

77
import {
88
findBestFontWeightColor,
9+
getColorFromElement,
10+
getColorFromElementOrId,
911
getNameFromElementOrId,
1012
getNameOrFirstLettersFromIdFromElementOrId,
1113
} from '../../Helper';
12-
import { getColorFromElement, getColorFromElementOrId } from '../../Helper/ColorHelper';
1314
import { singleElementMachine } from '../../Machine';
14-
import { fontStyle, shadowStyle } from '../../Style';
15-
import { pillComponentStyle } from '../../Style';
15+
import { fontStyle, pillComponentStyle, shadowStyle } from '../../Style';
1616
import { colorWarning } from '../../Type';
1717

1818
@customElement('ember-nexus-default-pill')

src/Component/Default/EmberNexusDefaultThumbnail.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ import { Actor, createActor } from 'xstate';
66

77
import {
88
findBestFontWeightColor,
9+
getColorFromElementOrId,
910
getNameFromElementOrId,
1011
getNameOrFirstLettersFromIdFromElementOrId,
1112
} from '../../Helper';
12-
import { getColorFromElementOrId } from '../../Helper/ColorHelper';
1313
import { singleElementMachine } from '../../Machine';
14-
import { fontStyle, shadowStyle } from '../../Style';
15-
import { thumbnailComponentStyle } from '../../Style';
14+
import { fontStyle, shadowStyle, thumbnailComponentStyle } from '../../Style';
1615
import { colorWarning } from '../../Type';
1716

1817
@customElement('ember-nexus-default-thumbnail')

src/Helper/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
export * from './ColorHelper';
2+
export * from './IconHelper';
3+
export * from './NameHelper';
14
export * from './TextContrastOptimizer';
25
export * from './TitleHelper';
3-
export * from './NameHelper';

test/Unit/Index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {expect, test} from '@jest/globals';
1+
import { expect, test } from 'vitest';
22

33
test('a placeholder', () => {
44
expect(true).toBeTruthy();

0 commit comments

Comments
 (0)