Skip to content

Commit

Permalink
Merge pull request #42 from elycruz/dev
Browse files Browse the repository at this point in the history
Fix site pages deploy and test runner puppeteer setup.
  • Loading branch information
elycruz committed Mar 26, 2024
2 parents 39d92d9 + 7111f90 commit c0606b8
Show file tree
Hide file tree
Showing 12 changed files with 3,046 additions and 3,053 deletions.
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

pnpm lintfix
4 changes: 4 additions & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

pnpm lint
4 changes: 2 additions & 2 deletions apps/atomic-ui-js-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"atomic-ui-js-next": "workspace:^",
"atomic-ui-js-react": "workspace:^",
"eslint": "^8.51.0",
"eslint-config-next": "^13.5.4",
"eslint-config-next": "^14.1.4",
"fjl": "2.0.0-alpha.5",
"lit": "^3.1.0",
"markdown-it": "^13.0.2",
"next": "^13.5.4",
"next": "^14.1.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rollup": "^3.29.4",
Expand Down
5 changes: 0 additions & 5 deletions apps/atomic-ui-js-site/src/data/generated/navigation-items.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ export const navigationItems: NavItem[] = [{
'uri': '/custom-elements/x-field/',
'alias': 'x-field'
},
{
'label': 'X-icon',
'uri': '/custom-elements/x-icon/',
'alias': 'x-icon'
},
{
'label': 'X-input',
'uri': '/custom-elements/x-input/',
Expand Down
3 changes: 0 additions & 3 deletions apps/atomic-ui-js-site/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,5 @@
".next/types/**/*.ts",
"../../docs/types/**/*.ts",
"../../dist/atomic-ui-js-site/types/**/*.ts"
],
"exclude": [
"node_modules"
]
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
"@storybook/web-components": "^7.6.17",
"@storybook/web-components-vite": "^7.6.17",
"@types/node": "18.16.3",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-plugin-storybook": "^0.6.15",
"husky": "^8.0.3",
"postcss": "^8.4.35",
"postcss": "^8.4.38",
"prettier": "^2.8.8",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -60,9 +60,9 @@
"stylelint": "^15.11.0",
"stylelint-config-standard": "^33.0.0",
"stylelint-config-standard-scss": "^9.0.0",
"turbo": "^1.12.4",
"turbo": "^1.13.0",
"typedoc": "^0.24.8",
"typescript": "^5.3.3",
"webpack": "^5.90.3"
"typescript": "^5.4.3",
"webpack": "^5.91.0"
}
}
File renamed without changes.
1 change: 1 addition & 0 deletions packages/atomic-ui-js/css/modules/margin-and-padding.css
Original file line number Diff line number Diff line change
Expand Up @@ -1441,3 +1441,4 @@
padding-left: var(--x-144px, 144px);
}


Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ const __dirname = url.fileURLToPath(new URL('.', import.meta.url)),
[val0, val1] = agg2;

return [
val0 + margin + '\n',
val1 + padding + '\n'
val0 + margin + '\n\n',
val1 + padding + '\n\n'
];
}, ['', '']);

Expand All @@ -48,8 +48,7 @@ const __dirname = url.fileURLToPath(new URL('.', import.meta.url)),
`/**
* Margin and Padding shorthand classes.
*/
${marginContent}
${paddingContent}
${marginContent}${paddingContent}
`;

return fs.promises.writeFile(outputFilePath, content)
Expand Down
29 changes: 14 additions & 15 deletions packages/atomic-ui-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"eslint": "eslint .",
"stylelint": "stylelint **/*.{css,scss}",
"typedoc": "typedoc .",
"test": "web-test-runner ./**/*.test.js --node-resolve",
"test": "web-test-runner ./**/*.test.js --node-resolve --puppeteer",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
},
Expand All @@ -44,16 +44,18 @@
},
"homepage": "https://github.com/elycruz/atomic-ui-js#readme",
"devDependencies": {
"@open-wc/testing": "^3.2.0",
"@rollup/plugin-typescript": "^11.1.5",
"@cucumber/cucumber": "^10.3.1",
"@open-wc/testing": "^3.2.2",
"@rollup/plugin-typescript": "^11.1.6",
"@types/node": "18.16.3",
"@web/test-runner": "^0.17.2",
"@web/test-runner-mocha": "^0.8.1",
"chokidar": "^3.5.3",
"cssnano": "^6.0.1",
"eslint": "^8.52.0",
"lit": "^3.1.0",
"postcss": "^8.4.31",
"@web/test-runner": "^0.17.3",
"@web/test-runner-mocha": "^0.8.2",
"@web/test-runner-puppeteer": "^0.16.0",
"chokidar": "^3.6.0",
"cssnano": "^6.1.2",
"eslint": "^8.57.0",
"lit": "^3.1.2",
"postcss": "^8.4.38",
"postcss-import": "^15.1.0",
"postcss-preset-env": "^8.5.1",
"prettier": "^2.8.8",
Expand All @@ -62,17 +64,14 @@
"rollup": "^3.29.4",
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-sass": "^1.12.21",
"sass": "^1.69.4",
"sass": "^1.72.0",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^33.0.0",
"typedoc": "^0.24.8",
"typescript": "^5.2.2",
"typescript": "^5.4.3",
"web-component-analyzer": "^1.1.7"
},
"peerDependencies": {
"lit": "^3.1.0"
},
"dependencies": {
"@cucumber/cucumber": "^10.0.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {expect, fixture} from '@open-wc/testing';
import {Given} from '@cucumber/cucumber';

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

Expand All @@ -11,7 +10,3 @@ describe(`${XToggleOnScrollElement.localName}`, () => {
expect(el).to.be.instanceof(XToggleOnScrollElement);
});
});

Given('the user has scrolled the page', () => {
console.log('hello');
});
Loading

0 comments on commit c0606b8

Please sign in to comment.