refactor: import from workspace (#14)

jwcjs · Dec 20, 2022 · 9754ecc · 9754ecc
1 parent 85d0466
commit 9754ecc
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 55 deletions.
diff --git a/packages/core/index.ts b/packages/core/index.ts
@@ -1,2 +1,2 @@
-export * from "packages/runtime";
+export * from "@jwcjs/runtime";
 export * from "./src";
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -33,12 +33,10 @@
     "esbuild": "^0.16.9",
     "rollup": "^3.7.4",
     "rollup-plugin-esbuild": "^5.0.0",
-    "vite": "^4.0.1"
-  },
-  "dependencies": {
+    "vite": "^4.0.1",
     "@jwcjs/reactively": "workspace:^1.0.0",
     "@jwcjs/runtime": "workspace:^1.0.0",
-    "shared": "workspace:^1.0.0",
+    "@jwcjs/shared": "workspace:^1.0.0",
     "reflect-metadata": "^0.1.13",
     "rollup-plugin-ts": "^3.0.2"
   }

diff --git a/packages/core/rollup.config.mjs b/packages/core/rollup.config.mjs
@@ -11,7 +11,6 @@ export default defineConfig({
 	plugins: [
 		nodeResolve(),
 		typescript({
-			exclude: "../starter-vite-ts/**",
 			tsconfig: "../../tsconfig.json",
 		}),
 		minify(),

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

diff --git a/packages/core/src/decorators/event.ts b/packages/core/src/decorators/event.ts
@@ -1,4 +1,4 @@
-import { defineEvent } from "packages/reactively";
+import { defineEvent } from "@jwcjs/reactively";
 
 export function Event(event: string): MethodDecorator {
 	return (target, key, descriptor) => {

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 "shared";
+import { defineWatcher } from "@jwcjs/reactively";
+import { WatcherOptions } from "@jwcjs/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 "shared";
+import { defineProps } from "@jwcjs/reactively";
+import { PropOptions } from "@jwcjs/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,5 +1,5 @@
 import "reflect-metadata";
 
 export * from "./wc-class";
-export * from "shared";
+export * from "@jwcjs/shared";
 export * from "./decorators";
diff --git a/packages/core/src/wc-class.ts b/packages/core/src/wc-class.ts
@@ -1,11 +1,11 @@
-import { createCSSElement, defineProxy } from "packages/reactively";
-import { createElement, diff, removeAttrs } from "packages/runtime";
+import { createCSSElement, defineProxy } from "@jwcjs/reactively";
+import { createElement, diff, removeAttrs } from "@jwcjs/runtime";
 import {
 	COMPONENT_PROP_METADATA_KEY,
 	JwcElement,
 	PropOptions,
 	WatcherOptions,
-} from "shared";
+} from "@jwcjs/shared";
 
 /**
  * The map of adoptedStyleSheets.

diff --git a/packages/reactively/package.json b/packages/reactively/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "shared": "workspace:*"
+    "@jwcjs/shared": "workspace:*"
   }
 }
diff --git a/packages/reactively/src/call-reactive.ts b/packages/reactively/src/call-reactive.ts
@@ -1,4 +1,4 @@
-import { CustomElementProps } from "jwcjs";
+import { CustomElementProps } from "@jwcjs/shared";
 import { reactive } from "./reactive";
 
 /**

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 "shared";
+} from "@jwcjs/shared";
 import { ReactiveEvent } from "./call-reactive";
 
 /**

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "shared",
+  "name": "@jwcjs/shared",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -10,6 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@jwcjs/runtime": "workspace:*",
     "csstype": "^3.1.1"
   }
 }
diff --git a/packages/shared/src/types/jwc-element.interface.ts b/packages/shared/src/types/jwc-element.interface.ts
@@ -1,4 +1,4 @@
-import { VNode } from "packages/runtime";
+import { VNode } from "@jwcjs/runtime";
 
 export interface CustomElementProps {
 	/**

diff --git a/packages/shared/src/types/local-jsx.d.ts b/packages/shared/src/types/local-jsx.d.ts
@@ -3,7 +3,7 @@
 // Thanks to: DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
 //            ReactJS <http://facebook.github.io/react/>
 
-import { h } from "packages/runtime";
+import { h } from "@jwcjs/runtime";
 import * as CSS from "csstype";
 
 type Booleanish = boolean | "true" | "false";