Skip to content

Bump D2C Engine & use Webpack 5 #217

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.

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

Merged
merged 11 commits into from
Mar 11, 2023
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: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
[submodule "packages/lint"]
path = packages/lint
url = https://github.com/reflect-ui/design-lint
[submodule "packages/design-sdk"]
path = packages/design-sdk
url = https://github.com/gridaco/design-sdk
[submodule "packages/base-sdk"]
path = packages/base-sdk
url = https://github.com/gridaco/base-sdk
[submodule "packages/reflect-core"]
path = packages/reflect-core
url = https://github.com/reflect-ui/reflect-core-ts
[submodule "packages/reflect-ui-generator"]
path = packages/reflect-ui-generator
url = https://github.com/reflect-ui/reflect-ui-generator
Expand Down
7 changes: 5 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@
"@base-sdk/functions-code-format": "^0.0.0",
"@bridged.xyz/base-sdk": "^0.0.2-1",
"@code-ui/docstring": "^0.0.12",
"@design-sdk/universal": "^0.0.0",
"@design-sdk/figma-checksum": "^0.0.43",
"@design-sdk/flags": "^0.0.43",
"@designto/code": "0.0.1",
"@emotion/react": "^11.4.0",
"@emotion/styled": "^11.3.0",
"@plugin-sdk/app": "0.0.0",
"@plugin-sdk/core": "0.0.0",
"@reflect-ui/core": "0.0.2-rc.7-local",
"@reflect-ui/core": "0.0.10",
"@reflect-ui/lint": "0.0.5-rc",
"@reflect.bridged.xyz/ui-generator": "0.0.1",
"assert": "2.0.0",
"classnames": "^2.3.1",
"coli": "0.0.3",
"copy-to-clipboard": "^3.3.1",
Expand All @@ -44,6 +46,7 @@
"react": "^18.2.0"
},
"devDependencies": {
"@types/assert": "^1.5.6",
"@types/lodash": "^4.14.172",
"@types/react": "^18.0.28",
"@types/react-router-dom": "^5.3.3",
Expand Down
4 changes: 2 additions & 2 deletions figma-core/code-thread/selection.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { analyzeSelection, SelectionAnalysis } from "plugin-app/utils";
import { convert } from "@design-sdk/figma";
import type { ReflectSceneNode } from "@design-sdk/figma";
import { convert } from "@design-sdk/figma-node-conversion";
import type { ReflectSceneNode } from "@design-sdk/figma-node";
import { Logger } from "logger";
import { makeReference } from "@design-sdk/figma-node";
import { runon } from "./runon";
Expand Down
6 changes: 4 additions & 2 deletions figma-core/event-handlers/init.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
import { __register__ as __register_create_button__ } from "./create-button";
import { __register__ as __register_create_icon__ } from "./create-icon";
import { __register__ as __register_create_image__ } from "./apply-image";
import { __register__ as __register_replace_text_characters__ } from "./apply-text-characters";
import { __register__ as __register_replace_font__ } from "./replace-font";
import { __register__ as __register_hide_all__ } from "./hide-all";
import { __register__ as __register_randomize_selection__ } from "./randomize-selection";
//
__register_create_button__();
__register_create_icon__();
__register_create_image__();
__register_replace_text_characters__();
__register_replace_font__();
__register_hide_all__();
__register_randomize_selection__();

// disabled for build size optimization. re-enable after migrating seed data on web side.
// import { __register__ as __register_create_button__ } from "./create-button";
// __register_create_button__();
4 changes: 2 additions & 2 deletions figma-core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

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

figma.on("selectionchange", () => {
onfigmaselectionchange();
Expand Down
4 changes: 2 additions & 2 deletions figma-core/reflect-render/buttons.render/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Color } from "@reflect-ui/core/lib/color";
import { Color } from "@reflect-ui/core";
import { reflectColorToFigmaRGB } from "@design-sdk/figma-node-conversion";
import { ButtonColorScheme } from "@reflect-ui/core/lib/theme/color-schemes";
import { ButtonColorScheme } from "@reflect-ui/core/dist/theme/color-schemes";
import { BUTTON_COLOR_SCHEMES_SET } from "@reflect.bridged.xyz/ui-generator/lib/seeds/color-schemes/button.color-scheme.seed";
import { BUTTON_TEXTS_SET_EN } from "@reflect.bridged.xyz/ui-generator/lib/seeds";
import { BUTTON_BASE_GRADIENTS_SET } from "@reflect.bridged.xyz/ui-generator/lib/seeds/gradients/button-base.gradients.seed";
Expand Down
2 changes: 1 addition & 1 deletion figma-core/reflect-render/cgrect.render/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
reflectColorToFigmaRGBA,
reflectColorToFigmaRGB,
} from "@design-sdk/figma-node-conversion";
import { Color } from "@reflect-ui/core/lib/color";
import { Color } from "@reflect-ui/core";

// his should be repplaced by reflect's `CGRectManifest` when fully constructed
interface FigmaRenderRectManifest {
Expand Down
8 changes: 2 additions & 6 deletions figma-core/reflect-render/icons.render/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { reflectColorToFigmaColor } from "@design-sdk/figma-node-conversion";
import { Color } from "@reflect-ui/core/lib/color";
import { NamedIconConfig } from "@reflect-ui/core";
import {
ICON_DEFAULT_SIZE,
ICON_MAX_SIZE,
} from "@reflect-ui/core/lib/icon/icon.constants";
import { Color } from "@reflect-ui/core";
import { ICON_DEFAULT_SIZE, ICON_MAX_SIZE } from "@reflect-ui/core/k";

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

Expand Down
2 changes: 1 addition & 1 deletion figma-core/reflect-render/text.render/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { reflectColorToFigmaColor } from "@design-sdk/figma-node-conversion";
import { Color } from "@reflect-ui/core/lib/color";
import { Color } from "@reflect-ui/core";

// FIXME - this should be repplaced by reflect's `TextManifest` when fully constructed
interface FigmaRenderTextManifest {
Expand Down
25 changes: 0 additions & 25 deletions figma-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,6 @@
"figma-js": "^1.13.0",
"figma-core": "0.0.0"
},
"devDependencies": {
"@babel/core": "^7.14.3",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-runtime": "^7.14.3",
"@babel/preset-env": "^7.14.2",
"@babel/preset-react": "^7.13.13",
"@babel/preset-typescript": "^7.13.0",
"@babel/runtime": "^7.14.0",
"@types/fs-extra": "^9.0.1",
"@types/node": "^14.11.8",
"@types/pug": "^2.0.4",
"babel-loader": "^8.2.2",
"css-loader": "^3.1.0",
"dotenv": "^8.2.0",
"dotenv-webpack": "^2.0.0",
"html-webpack-inline-source-plugin": "0.0.10",
"html-webpack-plugin": "^3.2.0",
"style-loader": "^0.23.1",
"terser-webpack-plugin": "^4.2.3",
"ts-loader": "^6.0.4",
"typescript": "^4.0.5",
"url-loader": "^2.1.0",
"webpack": "^4.38.0",
"webpack-cli": "^3.3.6"
},
"scripts": {
"webpack:watch": "webpack --watch",
"build": "webpack -p --mode=production",
Expand Down
Loading