fix(reactively): circular dependency (#12)

jwcjs · Dec 19, 2022 · 40075cc · 40075cc
1 parent 39ff2fd
commit 40075cc
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 16 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -30,7 +30,6 @@
   "license": "MIT",
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.0.1",
-    "csstype": "^3.1.1",
     "esbuild": "^0.16.9",
     "rollup": "^3.7.4",
     "rollup-plugin-esbuild": "^5.0.0",
@@ -39,6 +38,7 @@
   "dependencies": {
     "@jwcjs/reactively": "workspace:^1.0.0",
     "@jwcjs/runtime": "workspace:^1.0.0",
+    "shared": "workspace:^1.0.0",
     "reflect-metadata": "^0.1.13",
     "rollup-plugin-ts": "^3.0.2"
   }

diff --git a/packages/core/src/decorators/component.ts b/packages/core/src/decorators/component.ts
@@ -1,4 +1,4 @@
-import { CustomElementProps } from "../types";
+import { CustomElementProps } from "shared";
 
 export function Component(options: CustomElementProps) {
 	return function (_class: any) {

diff --git a/packages/core/src/decorators/index.ts b/packages/core/src/decorators/index.ts
@@ -1,5 +1,5 @@
 import { defineWatcher } from "packages/reactively";
-import { WatcherOptions } from "../types";
+import { WatcherOptions } from "shared";
 
 export * from "./props";
 export * from "./event";

diff --git a/packages/core/src/decorators/props.ts b/packages/core/src/decorators/props.ts
@@ -1,5 +1,5 @@
 import { defineProps } from "packages/reactively";
-import { PropOptions } from "../types";
+import { PropOptions } from "shared";
 
 export function Prop(options: PropOptions): PropertyDecorator {
 	return (target, key) => {

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,6 +1,5 @@
 import "reflect-metadata";
 
 export * from "./wc-class";
-export * from "./types";
+export * from "shared";
 export * from "./decorators";
-export * from "./constants";
diff --git a/packages/core/src/wc-class.ts b/packages/core/src/wc-class.ts
@@ -1,8 +1,8 @@
 import { createCSSElement, defineProxy } from "packages/reactively";
 import { createElement, diff, removeAttrs } from "packages/runtime";
-import { COMPONENT_PROP_METADATA_KEY } from "./constants/metas.constant";
-import { JwcElement, PropOptions } from "./types/jwc-element.interface";
-import { WatcherOptions } from "./types/watcher.interface";
+import { COMPONENT_PROP_METADATA_KEY } from "../../shared/src/constants/metas.constant";
+import { JwcElement, PropOptions } from "shared";
+import { WatcherOptions } from "../../shared/src/types/watcher.interface";
 
 /**
  * The map of adoptedStyleSheets.

diff --git a/packages/reactively/package.json b/packages/reactively/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "jwcjs": "workspace:*"
+    "shared": "workspace:*"
   }
 }
diff --git a/packages/reactively/src/define-reactive.ts b/packages/reactively/src/define-reactive.ts
@@ -3,7 +3,7 @@ import {
 	WatcherOptions,
 	COMPONENT_EVENT_METADATA_KEY,
 	COMPONENT_PROP_METADATA_KEY,
-} from "jwcjs";
+} from "shared";
 import { ReactiveEvent } from "./call-reactive";
 
 /**

diff --git a/packages/shared/index.ts b/packages/shared/index.ts
@@ -0,0 +1 @@
+export * from "./src";
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "shared",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "csstype": "^3.1.1"
+  }
+}
diff --git a/packages/core/src/constants/index.ts → packages/shared/src/constants/index.ts b/packages/core/src/constants/index.ts → packages/shared/src/constants/index.ts
diff --git a/...ages/core/src/constants/metas.constant.ts → ...es/shared/src/constants/metas.constant.ts b/...ages/core/src/constants/metas.constant.ts → ...es/shared/src/constants/metas.constant.ts
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
@@ -0,0 +1,2 @@
+export * from "./constants";
+export * from "./types";
diff --git a/packages/core/src/types/index.ts → packages/shared/src/types/index.ts b/packages/core/src/types/index.ts → packages/shared/src/types/index.ts
diff --git a/...s/core/src/types/jwc-element.interface.ts → ...shared/src/types/jwc-element.interface.ts b/...s/core/src/types/jwc-element.interface.ts → ...shared/src/types/jwc-element.interface.ts
diff --git a/packages/core/src/types/local-jsx.d.ts → packages/shared/src/types/local-jsx.d.ts b/packages/core/src/types/local-jsx.d.ts → packages/shared/src/types/local-jsx.d.ts
diff --git a/packages/core/src/types/watcher.interface.ts → ...ges/shared/src/types/watcher.interface.ts b/packages/core/src/types/watcher.interface.ts → ...ges/shared/src/types/watcher.interface.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from "./constants";
		export * from "./types";