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
6 changes: 6 additions & 0 deletions editor/next.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const withTM = require("next-transpile-modules")([
"@designto/config",
"@grida/builder-config-preset",
"@grida/builder-platform-types",
"@designto/code",
"@designto/token",
"@designto/flutter",
Expand All @@ -11,7 +13,11 @@ const withTM = require("next-transpile-modules")([
"@design-sdk/core-types",
"@design-sdk/universal",
"@design-sdk/figma",
"@design-sdk/figma-types",
"@design-sdk/figma-url",
"@design-sdk/figma-remote",
"@design-sdk/figma-remote-api",
// "@design-sdk/figma-remote-types",
"@design-sdk/url-analysis",
"@design-sdk/sketch",
// reflect-ui
Expand Down
4 changes: 2 additions & 2 deletions editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": {
"@babel/runtime": "^7.14.0",
"@base-sdk/base": "^0.1.0-5",
"@design-sdk/figma-auth-store": "^0.0.1",
"@design-sdk/figma-auth-store": "^0.0.2",
"@designto/code": "0.0.1",
"@emotion/core": "^11.0.0",
"@emotion/react": "^11.1.5",
Expand Down Expand Up @@ -52,4 +52,4 @@
"next-transpile-modules": "^7.0.0",
"typescript": "^4.2.3"
}
}
}
6 changes: 3 additions & 3 deletions editor/pages/to-code/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import {
} from "../../layout/panel";
import { WorkspaceBottomPanelDockLayout } from "../../layout/panel/workspace-bottom-panel-dock-layout";
import { MonacoEditor } from "../../components/code-editor";

import { react_presets } from "@grida/builder-config-preset";
export default function DesignToCodeUniversalPage() {
const design = useDesign();
console.log("design", design);

if (!design) {
return <>Loading..</>;
}
Expand All @@ -27,7 +27,7 @@ export default function DesignToCodeUniversalPage() {
name: name,
design: reflect,
},
{ framework: "react" }
react_presets.react_default
); // fixme

//@ts-ignore // FIXME: no ignore
Expand Down
8 changes: 4 additions & 4 deletions editor/query/from-figma/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import {
FigmaTargetNodeConfig,
parseFileAndNodeId,
} from "@design-sdk/figma-url";
import { Figma, nodes, remote } from "@design-sdk/figma";
import { Figma, nodes, api } from "@design-sdk/figma";
import { NextRouter, useRouter } from "next/router";
import { useEffect, useState } from "react";
import { fetch } from "@design-sdk/figma-remote";
import { personal } from "@design-sdk/figma-auth-store"
import { personal } from "@design-sdk/figma-auth-store";
import { TargetNodeConfig as _TargetNodeConfig } from "../target-node";

const P_FIGMA_TARGET_URL = "figma_target_url";
Expand Down Expand Up @@ -56,8 +56,8 @@ export function useFigmaTargetNode() {
}

export interface TargetNodeConfig
extends _TargetNodeConfig<remote.api.Node, Figma.SceneNode> {
remote: remote.api.Node;
extends _TargetNodeConfig<api.Node, Figma.SceneNode> {
remote: api.Node;
figma: Figma.SceneNode;
reflect: nodes.ReflectSceneNode;
url: string;
Expand Down
60 changes: 60 additions & 0 deletions packages/builder-config-preset/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import { config, react } from "@designto/config";
import { Framework, Language } from "@grida/builder-platform-types";

export const react_presets = {
react_default: <config.ReactFrameworkConfig>{
framework: Framework.react,
language: Language.tsx,
styling: "styled-components",
},
react_with_styled_components: <config.ReactFrameworkConfig>{
framework: Framework.react,
language: Language.tsx,
styling: "styled-components",
},
react_with_css_in_jsx: <config.ReactFrameworkConfig>{
framework: Framework.react,
language: Language.tsx,
styling: "css-in-jsx",
},
react_with_css: <config.ReactFrameworkConfig>{
framework: Framework.react,
language: Language.tsx,
styling: "css",
},
};

export const flutter_presets = {
flutter_default: <config.FlutterFrameworkConfig>{
framework: Framework.flutter,
language: Language.dart,
},
};

export const presets = {
react: react_presets,
flutter: flutter_presets,
};

export const all_preset_options__prod = [
flutter_presets.flutter_default,
react_presets.react_default,
react_presets.react_with_styled_components,
// react_with_css_in_jsx // NOT ON PRODUCTION
// react_with_css // NOT ON PRODUCTION
];

export const all_preset_options_map__prod = {
none: null,
flutter_default: flutter_presets.flutter_default,
react_default: react_presets.react_default,
react_with_styled_components: react_presets.react_with_styled_components,
// react_with_css_in_jsx // NOT ON PRODUCTION
// react_with_css // NOT ON PRODUCTION
};

export const react_styles: react.ReactStylingStrategy[] = [
"styled-components",
"css-in-jsx",
"css",
];
6 changes: 6 additions & 0 deletions packages/builder-config-preset/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@grida/builder-config-preset",
"authors": "Grida.co",
"version": "1.0.0",
"dependencies": {}
}
6 changes: 6 additions & 0 deletions packages/builder-config/configure/framework-config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
import { Language } from "@grida/builder-platform-types";
import { ReactStylingStrategy } from "../framework-react";

export type FrameworkConfig = ReactFrameworkConfig | FlutterFrameworkConfig;

export interface ReactFrameworkConfig {
framework: "react";
language: Language.jsx | Language.tsx;
styling: ReactStylingStrategy;
}

export interface FlutterFrameworkConfig {
framework: "flutter";
language: Language.dart;
}
5 changes: 5 additions & 0 deletions packages/builder-config/framework-react/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { ComponentOutput } from "../output";

export interface ReactComponentOutput extends ComponentOutput {}

export type ReactStylingStrategy = "css" | "styled-components" | "css-in-jsx";
8 changes: 8 additions & 0 deletions packages/builder-config/framework/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export * as android from "../framework-android";
export * as flutter from "../framework-flutter";
export * as ios from "../framework-ios";
export * as react from "../framework-react";
export * as vue from "../framework-vue";

// universal
// export * as universal from "./universal";
5 changes: 3 additions & 2 deletions packages/builder-config/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export * as input from "./input";
export * as output from "./output";
export * as config from "./configure";
export * from "./platforms";
export * as config from "./configure"; // configure
export * from "./configure"; // configure
export * from "./framework";
8 changes: 0 additions & 8 deletions packages/builder-config/platforms/index.ts

This file was deleted.

3 changes: 0 additions & 3 deletions packages/builder-config/platforms/react/index.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/builder-config/platforms/universal/index.ts

This file was deleted.

2 changes: 2 additions & 0 deletions packages/builder-platform-types/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./languages";
export * from "./ui-frameworks";
5 changes: 5 additions & 0 deletions packages/builder-platform-types/languages/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export enum Language {
jsx = "jsx",
tsx = "tsx",
dart = "dart",
}
6 changes: 6 additions & 0 deletions packages/builder-platform-types/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "@grida/builder-platform-types",
"authors": "Grida.co",
"version": "1.0.0",
"dependencies": {}
}
4 changes: 4 additions & 0 deletions packages/builder-platform-types/ui-frameworks/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export enum Framework {
react = "react",
flutter = "flutter",
}
2 changes: 1 addition & 1 deletion packages/coli
Submodule coli updated from 0d3113 to c36866
2 changes: 1 addition & 1 deletion packages/coli-web-builder
2 changes: 1 addition & 1 deletion packages/design-sdk
2 changes: 1 addition & 1 deletion packages/reflect-core
Loading