Skip to content

chore: simplify generator #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

chore: simplify generator #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a5ad3a1
refactor: simplify generator
Lodin Feb 16, 2025
5e2a0f2
fix: use correct path for glob
Lodin Feb 16, 2025
5a4e42e
chore: replace utils with libs
Lodin Feb 28, 2025
22d9c33
chore: fix polyfill import
Lodin Feb 28, 2025
68af621
Merge branch 'main' into refactor/generator-simplify
Lodin Feb 28, 2025
0c18011
Merge branch 'main' into refactor/generator-simplify
Lodin Mar 14, 2025
719ff8e
Merge branch 'main' into refactor/generator-simplify
Lodin Mar 17, 2025
b8d25c3
Update package-lock.json
web-padawan Mar 21, 2025
bc86834
Merge branch 'main' into refactor/generator-simplify
web-padawan Mar 21, 2025
16829ee
Merge branch 'main' into refactor/generator-simplify
Lodin Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"type": "module",
"version": "24.8.0-alpha4",
"private": true,
"engines": {
"node": ">=20.0.0"
},
"scripts": {
"build": "npm run build:load-schema && npm run build -w packages/react-components && npm run build -w packages/react-components-pro",
"build:load-schema": "tsx scripts/schema-loader.ts",
Expand Down Expand Up @@ -43,6 +46,7 @@
"@types/react-dom": "^18.3.3",
"@types/sinon": "^17.0.3",
"@vitejs/plugin-react": "^4.3.4",
"array-from-async": "^3.0.0",
"chai-as-promised": "^8.0.1",
"chai-dom": "^1.12.0",
"concurrently": "^9.1.0",
Expand Down
5 changes: 2 additions & 3 deletions packages/react-components-pro/tsconfig.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"extends": "../../tsconfig.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": ".",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"noEmit": false,
"emitDeclarationOnly": true
},
"include": ["./src"],
"exclude": ["node_modules", "dist"]
"include": ["src"]
}
8 changes: 8 additions & 0 deletions packages/react-components-pro/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"target": "es2021",
"lib": ["es2021", "dom"]
},
"include": ["src"]
}
20 changes: 20 additions & 0 deletions packages/react-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,28 @@
"./css/lumo/Font.css": "./css/lumo/Font.css",
"./css/lumo/FontIcons.css": "./css/lumo/FontIcons.css",
"./css/lumo/Globals.css": "./css/lumo/Globals.css",
"./css/lumo/mixins/FieldButton.css": "./css/lumo/mixins/FieldButton.css",
"./css/lumo/mixins/MenuOverlay.css": "./css/lumo/mixins/MenuOverlay.css",
"./css/lumo/mixins/MenuOverlayCore.css": "./css/lumo/mixins/MenuOverlayCore.css",
"./css/lumo/mixins/Overlay.css": "./css/lumo/mixins/Overlay.css",
"./css/lumo/mixins/RequiredField.css": "./css/lumo/mixins/RequiredField.css",
"./css/lumo/Sizing.css": "./css/lumo/Sizing.css",
"./css/lumo/Spacing.css": "./css/lumo/Spacing.css",
"./css/lumo/Style.css": "./css/lumo/Style.css",
"./css/lumo/Typography.css": "./css/lumo/Typography.css",
"./css/lumo/UserColors.css": "./css/lumo/UserColors.css",
"./css/lumo/utilities/Accessibility.module.css": "./css/lumo/utilities/Accessibility.module.css",
"./css/lumo/utilities/Background.module.css": "./css/lumo/utilities/Background.module.css",
"./css/lumo/utilities/Border.module.css": "./css/lumo/utilities/Border.module.css",
"./css/lumo/utilities/Filter.module.css": "./css/lumo/utilities/Filter.module.css",
"./css/lumo/utilities/FlexboxAndGrid.module.css": "./css/lumo/utilities/FlexboxAndGrid.module.css",
"./css/lumo/utilities/FlexboxGrid.module.css": "./css/lumo/utilities/FlexboxGrid.module.css",
"./css/lumo/utilities/Layout.module.css": "./css/lumo/utilities/Layout.module.css",
"./css/lumo/utilities/Shadows.module.css": "./css/lumo/utilities/Shadows.module.css",
"./css/lumo/utilities/Sizing.module.css": "./css/lumo/utilities/Sizing.module.css",
"./css/lumo/utilities/Spacing.module.css": "./css/lumo/utilities/Spacing.module.css",
"./css/lumo/utilities/Transition.module.css": "./css/lumo/utilities/Transition.module.css",
"./css/lumo/utilities/Typography.module.css": "./css/lumo/utilities/Typography.module.css",
"./css/lumo/Utility.module.css": "./css/lumo/Utility.module.css",
"./css/Material.css": "./css/Material.css",
"./css/material/Color.css": "./css/material/Color.css",
Expand All @@ -495,6 +512,9 @@
"./css/material/ColorLight.css": "./css/material/ColorLight.css",
"./css/material/Font.css": "./css/material/Font.css",
"./css/material/FontIcons.css": "./css/material/FontIcons.css",
"./css/material/mixins/FieldButton.css": "./css/material/mixins/FieldButton.css",
"./css/material/mixins/Overlay.css": "./css/material/mixins/Overlay.css",
"./css/material/mixins/RequiredField.css": "./css/material/mixins/RequiredField.css",
"./css/material/Shadow.css": "./css/material/Shadow.css",
"./css/material/Typography.css": "./css/material/Typography.css",
"./css/material/UserColors.css": "./css/material/UserColors.css",
Expand Down
5 changes: 2 additions & 3 deletions packages/react-components/tsconfig.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"extends": "../../tsconfig.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": ".",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"noEmit": false,
"emitDeclarationOnly": true
},
"include": ["./src"],
"exclude": ["node_modules", "dist"]
"include": ["src"]
}
8 changes: 8 additions & 0 deletions packages/react-components/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"target": "es2021",
"lib": ["es2021", "dom"],
},
"include": ["src"]
}
15 changes: 6 additions & 9 deletions scripts/copy-dts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { glob } from 'glob';
import { globIterate as glob } from 'glob';
import { constants, copyFile, mkdir } from 'node:fs/promises';
import { packageURL, srcURL } from './utils/config.js';

const files = await glob(['**/*.d.ts'], { cwd: srcURL });
await Promise.all(
files.map(async (file) => {
const dest = new URL(file, packageURL);
await mkdir(new URL('./', dest), { recursive: true });
return copyFile(new URL(file, srcURL), dest, constants.COPYFILE_FICLONE);
}),
);
for await (const file of glob(['**/*.d.ts'], { cwd: srcURL })) {
const dest = new URL(file, packageURL);
await mkdir(new URL('./', dest), { recursive: true });
await copyFile(new URL(file, srcURL), dest, constants.COPYFILE_FICLONE);
}
3 changes: 1 addition & 2 deletions scripts/descriptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { readdir, readFile } from 'node:fs/promises';
import { resolve } from 'node:path';
import type { HtmlElement as SchemaHTMLElement, JSONSchemaForWebTypes } from '../types/schema.js';
import { nodeModulesDir } from './utils/config.js';
import filterEmptyItems from './utils/filterEmptyItems.js';

export type SchemaElementWithPackage = readonly [packageName: string, element: SchemaHTMLElement];

Expand All @@ -22,7 +21,7 @@ export async function loadDescriptions(): Promise<ReadonlyArray<JSONSchemaForWeb
}),
);

return filterEmptyItems(schemas);
return schemas.filter((schema) => schema != null);
}

export function* extractElementsFromDescriptions(
Expand Down
Loading
Loading