Skip to content

Commit c0606b8

Browse files
authored
Merge pull request #42 from elycruz/dev
Fix site pages deploy and test runner puppeteer setup.
2 parents 39d92d9 + 7111f90 commit c0606b8

File tree

12 files changed

+3046
-3053
lines changed

12 files changed

+3046
-3053
lines changed

.husky/pre-commit

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
pnpm lintfix

.husky/pre-push

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
pnpm lint

apps/atomic-ui-js-site/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
"atomic-ui-js-next": "workspace:^",
3131
"atomic-ui-js-react": "workspace:^",
3232
"eslint": "^8.51.0",
33-
"eslint-config-next": "^13.5.4",
33+
"eslint-config-next": "^14.1.4",
3434
"fjl": "2.0.0-alpha.5",
3535
"lit": "^3.1.0",
3636
"markdown-it": "^13.0.2",
37-
"next": "^13.5.4",
37+
"next": "^14.1.4",
3838
"react": "^18.2.0",
3939
"react-dom": "^18.2.0",
4040
"rollup": "^3.29.4",

apps/atomic-ui-js-site/src/data/generated/navigation-items.ts

-5
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ export const navigationItems: NavItem[] = [{
6767
'uri': '/custom-elements/x-field/',
6868
'alias': 'x-field'
6969
},
70-
{
71-
'label': 'X-icon',
72-
'uri': '/custom-elements/x-icon/',
73-
'alias': 'x-icon'
74-
},
7570
{
7671
'label': 'X-input',
7772
'uri': '/custom-elements/x-input/',

apps/atomic-ui-js-site/tsconfig.json

-3
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,5 @@
4343
".next/types/**/*.ts",
4444
"../../docs/types/**/*.ts",
4545
"../../dist/atomic-ui-js-site/types/**/*.ts"
46-
],
47-
"exclude": [
48-
"node_modules"
4946
]
5047
}

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
"@storybook/web-components": "^7.6.17",
4949
"@storybook/web-components-vite": "^7.6.17",
5050
"@types/node": "18.16.3",
51-
"eslint": "^8.56.0",
51+
"eslint": "^8.57.0",
5252
"eslint-plugin-storybook": "^0.6.15",
5353
"husky": "^8.0.3",
54-
"postcss": "^8.4.35",
54+
"postcss": "^8.4.38",
5555
"prettier": "^2.8.8",
5656
"react": "^18.2.0",
5757
"react-dom": "^18.2.0",
@@ -60,9 +60,9 @@
6060
"stylelint": "^15.11.0",
6161
"stylelint-config-standard": "^33.0.0",
6262
"stylelint-config-standard-scss": "^9.0.0",
63-
"turbo": "^1.12.4",
63+
"turbo": "^1.13.0",
6464
"typedoc": "^0.24.8",
65-
"typescript": "^5.3.3",
66-
"webpack": "^5.90.3"
65+
"typescript": "^5.4.3",
66+
"webpack": "^5.91.0"
6767
}
6868
}
File renamed without changes.

packages/atomic-ui-js/css/modules/margin-and-padding.css

+1
Original file line numberDiff line numberDiff line change
@@ -1441,3 +1441,4 @@
14411441
padding-left: var(--x-144px, 144px);
14421442
}
14431443

1444+

packages/atomic-ui-js/node_scripts/gen-css/margin-and-padding.mjs

+3-4
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ const __dirname = url.fileURLToPath(new URL('.', import.meta.url)),
3333
[val0, val1] = agg2;
3434

3535
return [
36-
val0 + margin + '\n',
37-
val1 + padding + '\n'
36+
val0 + margin + '\n\n',
37+
val1 + padding + '\n\n'
3838
];
3939
}, ['', '']);
4040

@@ -48,8 +48,7 @@ const __dirname = url.fileURLToPath(new URL('.', import.meta.url)),
4848
`/**
4949
* Margin and Padding shorthand classes.
5050
*/
51-
${marginContent}
52-
${paddingContent}
51+
${marginContent}${paddingContent}
5352
`;
5453

5554
return fs.promises.writeFile(outputFilePath, content)

packages/atomic-ui-js/package.json

+14-15
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"eslint": "eslint .",
2525
"stylelint": "stylelint **/*.{css,scss}",
2626
"typedoc": "typedoc .",
27-
"test": "web-test-runner ./**/*.test.js --node-resolve",
27+
"test": "web-test-runner ./**/*.test.js --node-resolve --puppeteer",
2828
"storybook": "storybook dev -p 6006",
2929
"build-storybook": "storybook build"
3030
},
@@ -44,16 +44,18 @@
4444
},
4545
"homepage": "https://github.com/elycruz/atomic-ui-js#readme",
4646
"devDependencies": {
47-
"@open-wc/testing": "^3.2.0",
48-
"@rollup/plugin-typescript": "^11.1.5",
47+
"@cucumber/cucumber": "^10.3.1",
48+
"@open-wc/testing": "^3.2.2",
49+
"@rollup/plugin-typescript": "^11.1.6",
4950
"@types/node": "18.16.3",
50-
"@web/test-runner": "^0.17.2",
51-
"@web/test-runner-mocha": "^0.8.1",
52-
"chokidar": "^3.5.3",
53-
"cssnano": "^6.0.1",
54-
"eslint": "^8.52.0",
55-
"lit": "^3.1.0",
56-
"postcss": "^8.4.31",
51+
"@web/test-runner": "^0.17.3",
52+
"@web/test-runner-mocha": "^0.8.2",
53+
"@web/test-runner-puppeteer": "^0.16.0",
54+
"chokidar": "^3.6.0",
55+
"cssnano": "^6.1.2",
56+
"eslint": "^8.57.0",
57+
"lit": "^3.1.2",
58+
"postcss": "^8.4.38",
5759
"postcss-import": "^15.1.0",
5860
"postcss-preset-env": "^8.5.1",
5961
"prettier": "^2.8.8",
@@ -62,17 +64,14 @@
6264
"rollup": "^3.29.4",
6365
"rollup-plugin-postcss": "^4.0.2",
6466
"rollup-plugin-sass": "^1.12.21",
65-
"sass": "^1.69.4",
67+
"sass": "^1.72.0",
6668
"stylelint": "^15.11.0",
6769
"stylelint-config-standard": "^33.0.0",
6870
"typedoc": "^0.24.8",
69-
"typescript": "^5.2.2",
71+
"typescript": "^5.4.3",
7072
"web-component-analyzer": "^1.1.7"
7173
},
7274
"peerDependencies": {
7375
"lit": "^3.1.0"
74-
},
75-
"dependencies": {
76-
"@cucumber/cucumber": "^10.0.1"
7776
}
7877
}
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {expect, fixture} from '@open-wc/testing';
2-
import {Given} from '@cucumber/cucumber';
32

43
import {XToggleOnScrollElement} from './index.js';
54

@@ -11,7 +10,3 @@ describe(`${XToggleOnScrollElement.localName}`, () => {
1110
expect(el).to.be.instanceof(XToggleOnScrollElement);
1211
});
1312
});
14-
15-
Given('the user has scrolled the page', () => {
16-
console.log('hello');
17-
});

0 commit comments

Comments
 (0)