Skip to content

Commit 275e452

Browse files
softmarshmallowsoftmarshmallow
authored
Merge pull request #217 from gridaco/bump/design-to-code
Bump D2C Engine & use Webpack 5
2 parents d9aadd9 + a35e0b7 commit 275e452

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5303
-10417
lines changed

‎.gitmodules

-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
[submodule "packages/lint"]
22
path = packages/lint
33
url = https://github.com/reflect-ui/design-lint
4-
[submodule "packages/design-sdk"]
5-
path = packages/design-sdk
6-
url = https://github.com/gridaco/design-sdk
74
[submodule "packages/base-sdk"]
85
path = packages/base-sdk
96
url = https://github.com/gridaco/base-sdk
10-
[submodule "packages/reflect-core"]
11-
path = packages/reflect-core
12-
url = https://github.com/reflect-ui/reflect-core-ts
137
[submodule "packages/reflect-ui-generator"]
148
path = packages/reflect-ui-generator
159
url = https://github.com/reflect-ui/reflect-ui-generator

‎app/package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@
1515
"@base-sdk/functions-code-format": "^0.0.0",
1616
"@bridged.xyz/base-sdk": "^0.0.2-1",
1717
"@code-ui/docstring": "^0.0.12",
18-
"@design-sdk/universal": "^0.0.0",
18+
"@design-sdk/figma-checksum": "^0.0.43",
19+
"@design-sdk/flags": "^0.0.43",
1920
"@designto/code": "0.0.1",
2021
"@emotion/react": "^11.4.0",
2122
"@emotion/styled": "^11.3.0",
2223
"@plugin-sdk/app": "0.0.0",
2324
"@plugin-sdk/core": "0.0.0",
24-
"@reflect-ui/core": "0.0.2-rc.7-local",
25+
"@reflect-ui/core": "0.0.10",
2526
"@reflect-ui/lint": "0.0.5-rc",
2627
"@reflect.bridged.xyz/ui-generator": "0.0.1",
28+
"assert": "2.0.0",
2729
"classnames": "^2.3.1",
2830
"coli": "0.0.3",
2931
"copy-to-clipboard": "^3.3.1",
@@ -44,6 +46,7 @@
4446
"react": "^18.2.0"
4547
},
4648
"devDependencies": {
49+
"@types/assert": "^1.5.6",
4750
"@types/lodash": "^4.14.172",
4851
"@types/react": "^18.0.28",
4952
"@types/react-router-dom": "^5.3.3",

‎figma-core/code-thread/selection.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { analyzeSelection, SelectionAnalysis } from "plugin-app/utils";
2-
import { convert } from "@design-sdk/figma";
3-
import type { ReflectSceneNode } from "@design-sdk/figma";
2+
import { convert } from "@design-sdk/figma-node-conversion";
3+
import type { ReflectSceneNode } from "@design-sdk/figma-node";
44
import { Logger } from "logger";
55
import { makeReference } from "@design-sdk/figma-node";
66
import { runon } from "./runon";

‎figma-core/event-handlers/init.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
import { __register__ as __register_create_button__ } from "./create-button";
21
import { __register__ as __register_create_icon__ } from "./create-icon";
32
import { __register__ as __register_create_image__ } from "./apply-image";
43
import { __register__ as __register_replace_text_characters__ } from "./apply-text-characters";
54
import { __register__ as __register_replace_font__ } from "./replace-font";
65
import { __register__ as __register_hide_all__ } from "./hide-all";
76
import { __register__ as __register_randomize_selection__ } from "./randomize-selection";
87
//
9-
__register_create_button__();
108
__register_create_icon__();
119
__register_create_image__();
1210
__register_replace_text_characters__();
1311
__register_replace_font__();
1412
__register_hide_all__();
1513
__register_randomize_selection__();
14+
15+
// disabled for build size optimization. re-enable after migrating seed data on web side.
16+
// import { __register__ as __register_create_button__ } from "./create-button";
17+
// __register_create_button__();

‎figma-core/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import { onfigmaselectionchange } from "./code-thread/selection";
2222
import { onfigmamessage } from "./code-thread/message-handler";
23-
import { MainImageRepository } from "@design-sdk/core/assets-repository";
24-
import { ImageRepositories } from "@design-sdk/figma/asset-repository";
23+
import { MainImageRepository } from "@design-sdk/asset-repository";
24+
import { ImageRepositories } from "@design-sdk/figma/dist/asset-repository";
2525

2626
figma.on("selectionchange", () => {
2727
onfigmaselectionchange();

‎figma-core/reflect-render/buttons.render/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Color } from "@reflect-ui/core/lib/color";
1+
import { Color } from "@reflect-ui/core";
22
import { reflectColorToFigmaRGB } from "@design-sdk/figma-node-conversion";
3-
import { ButtonColorScheme } from "@reflect-ui/core/lib/theme/color-schemes";
3+
import { ButtonColorScheme } from "@reflect-ui/core/dist/theme/color-schemes";
44
import { BUTTON_COLOR_SCHEMES_SET } from "@reflect.bridged.xyz/ui-generator/lib/seeds/color-schemes/button.color-scheme.seed";
55
import { BUTTON_TEXTS_SET_EN } from "@reflect.bridged.xyz/ui-generator/lib/seeds";
66
import { BUTTON_BASE_GRADIENTS_SET } from "@reflect.bridged.xyz/ui-generator/lib/seeds/gradients/button-base.gradients.seed";

‎figma-core/reflect-render/cgrect.render/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
reflectColorToFigmaRGBA,
33
reflectColorToFigmaRGB,
44
} from "@design-sdk/figma-node-conversion";
5-
import { Color } from "@reflect-ui/core/lib/color";
5+
import { Color } from "@reflect-ui/core";
66

77
// his should be repplaced by reflect's `CGRectManifest` when fully constructed
88
interface FigmaRenderRectManifest {

‎figma-core/reflect-render/icons.render/index.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import { reflectColorToFigmaColor } from "@design-sdk/figma-node-conversion";
2-
import { Color } from "@reflect-ui/core/lib/color";
3-
import { NamedIconConfig } from "@reflect-ui/core";
4-
import {
5-
ICON_DEFAULT_SIZE,
6-
ICON_MAX_SIZE,
7-
} from "@reflect-ui/core/lib/icon/icon.constants";
2+
import { Color } from "@reflect-ui/core";
3+
import { ICON_DEFAULT_SIZE, ICON_MAX_SIZE } from "@reflect-ui/core/k";
84

95
export type IconPlacement = { x: number; y: number } | "center";
106

‎figma-core/reflect-render/text.render/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { reflectColorToFigmaColor } from "@design-sdk/figma-node-conversion";
2-
import { Color } from "@reflect-ui/core/lib/color";
2+
import { Color } from "@reflect-ui/core";
33

44
// FIXME - this should be repplaced by reflect's `TextManifest` when fully constructed
55
interface FigmaRenderTextManifest {

‎figma-native/package.json

-25
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,6 @@
1515
"figma-js": "^1.13.0",
1616
"figma-core": "0.0.0"
1717
},
18-
"devDependencies": {
19-
"@babel/core": "^7.14.3",
20-
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
21-
"@babel/plugin-transform-runtime": "^7.14.3",
22-
"@babel/preset-env": "^7.14.2",
23-
"@babel/preset-react": "^7.13.13",
24-
"@babel/preset-typescript": "^7.13.0",
25-
"@babel/runtime": "^7.14.0",
26-
"@types/fs-extra": "^9.0.1",
27-
"@types/node": "^14.11.8",
28-
"@types/pug": "^2.0.4",
29-
"babel-loader": "^8.2.2",
30-
"css-loader": "^3.1.0",
31-
"dotenv": "^8.2.0",
32-
"dotenv-webpack": "^2.0.0",
33-
"html-webpack-inline-source-plugin": "0.0.10",
34-
"html-webpack-plugin": "^3.2.0",
35-
"style-loader": "^0.23.1",
36-
"terser-webpack-plugin": "^4.2.3",
37-
"ts-loader": "^6.0.4",
38-
"typescript": "^4.0.5",
39-
"url-loader": "^2.1.0",
40-
"webpack": "^4.38.0",
41-
"webpack-cli": "^3.3.6"
42-
},
4318
"scripts": {
4419
"webpack:watch": "webpack --watch",
4520
"build": "webpack -p --mode=production",

0 commit comments

Comments
 (0)