Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions README.md

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

10 changes: 4 additions & 6 deletions scripts/readme/readme.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,10 @@ Three shapes: app-builder layout (frontend and/or backend selected), plain TS en
|-- tsconfig.json
|-- entries/
| `-- my-app-app.tsx # entry (>=1 allowed); name from project; ext/case by react+language
|-- components/ # only if react enabled
| |-- index.ts # re-exports App; ext by language
| `-- App/
| `-- App.tsx # demo component; ext by language
`-- types/
`-- assets.d.ts # only ts+react
`-- components/ # only if react enabled
|-- index.ts # re-exports App; ext by language
`-- App/
`-- App.tsx # demo component; ext by language
```

**Neither frontend nor backend, TypeScript** — plain `src/index.ts`, no app-builder, straight `tsc` compile.
Expand Down
2 changes: 1 addition & 1 deletion src/generators/appBuilder.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ document.querySelector('#root')?.append(header);
'NODE_ENV=production app-builder build --target server',
);
t.assert.equal(model.scripts.start, 'node dist/server/index.js');
t.assert.equal(model.packages.devDependencies['@gravity-ui/app-builder'], '^0.48.0');
t.assert.equal(model.packages.devDependencies['@gravity-ui/app-builder'], '^0.49.0');

t.assert.ok(file('app-builder.config.ts'));
t.assert.equal(file('src/ui/entries/my-app-app.ts'), null);
Expand Down
7 changes: 1 addition & 6 deletions src/generators/appBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import renderEntryJs from './templates/src/ui/entries/entry.js.hbs.js';
import renderEntryJsx from './templates/src/ui/entries/entry.jsx.hbs.js';
import renderEntryTs from './templates/src/ui/entries/entry.ts.hbs.js';
import renderEntryTsx from './templates/src/ui/entries/entry.tsx.hbs.js';
import renderAssetsTypes from './templates/src/ui/types/assets.d-ts.hbs.js';

export async function generateAppBuilder(model: ProjectModel, fs: FileSystem): Promise<void> {
const {hasFrontend, hasReact, hasAppBuilder} = calculateFlags(model);
Expand All @@ -33,7 +32,7 @@ export async function generateAppBuilder(model: ProjectModel, fs: FileSystem): P
target = ' --target client';
}

addDevDep(model, '@gravity-ui/app-builder', '^0.48.0');
addDevDep(model, '@gravity-ui/app-builder', '^0.49.0');

if (model.hasBackend) {
addScript(model, 'start', 'node dist/server/index.js');
Expand Down Expand Up @@ -93,10 +92,6 @@ async function writeReactFiles(
barrelFile,
isTs ? renderComponentsIndexTs({}) : renderComponentsIndexJs({}),
);

if (isTs) {
await fs.writeFile(path.join(uiDir, 'types', 'assets.d.ts'), renderAssetsTypes({}));
}
}

async function writeEntryFile(
Expand Down
2 changes: 0 additions & 2 deletions src/generators/templates/src/ui/types/assets.d-ts.hbs

This file was deleted.

1 change: 1 addition & 0 deletions src/generators/typescript.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ test.describe('typescript generator', () => {
t.assert.ok(ui);
t.assert.equal(ui.content.compilerOptions.composite, true);
t.assert.equal(ui.content.compilerOptions.jsx, 'react-jsx');
t.assert.deepEqual(ui.content.compilerOptions.types, ['@gravity-ui/app-builder/ui']);

const server = file('src/server/tsconfig.json');
t.assert.ok(server);
Expand Down
1 change: 1 addition & 0 deletions src/generators/typescript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export async function generateTypeScript(model: ProjectModel, fs: FileSystem): P
composite: true,
outDir: '../../dist/ui',
rootDir: '.',
types: ['@gravity-ui/app-builder/ui'],
},
include: ['**/*'],
};
Expand Down
Loading