fix: module perDependency error

Dunqing · May 11, 2022 · 66de8e2 · 66de8e2
1 parent 4b42ff4
commit 66de8e2
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 53 deletions.
diff --git a/examples/resume-example/package.json b/examples/resume-example/package.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@resumejs/resume": "workspace:*",
-    "@resumejs/core": "workspace:*",
+    "@resumejs/components": "workspace:*",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/packages/core/package.json b/packages/core/package.json
diff --git a/packages/core/src/Show.tsx b/packages/core/src/Show.tsx
diff --git a/packages/core/src/main.tsx b/packages/core/src/main.tsx
diff --git a/packages/create-resumejs/template-markdown/package.json b/packages/create-resumejs/template-markdown/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@resumejs/resume": "latest",
-    "@resumejs/core": "latest",
+    "@resumejs/components": "latest",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   }

diff --git a/packages/resume/package.json b/packages/resume/package.json
@@ -11,11 +11,13 @@
   },
   "peerDependencies": {
     "@resumejs/core": "workspace:*",
+    "@resumejs/components": "workspace:*",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
   "dependencies": {
     "@resumejs/core": "workspace:*",
+    "@resumejs/components": "workspace:*",
     "@types/minimist": "^1.2.2",
     "@types/react": "^17.0.33",
     "@types/react-dom": "^17.0.10",

diff --git a/packages/resume/src/index.ts b/packages/resume/src/index.ts
@@ -29,9 +29,6 @@ const getViteConfig = () => {
   const _config: InlineConfig = {
     logLevel: 'info',
     configFile,
-    optimizeDeps: {
-      entries: ["@resumejs/core"]
-    },
     plugins: [
       react(),
       entry(),

diff --git a/packages/resume/src/plugins/entry.ts b/packages/resume/src/plugins/entry.ts
@@ -26,7 +26,27 @@ export const entry = (): Plugin => {
     load(id) {
       if (id === RESUME_ENTRY) {
         const ms = new MagicString(`
-          import "@resumejs/core"
+          import React from 'react'
+          import ReactDOM from 'react-dom'
+          import 'uno.css'
+          import { Resume } from '@resumejs/components'
+          import '@resumejs/components/style'
+          import md from 'virtual:resume'
+
+          const Show = () => {
+            return (
+              <div className="flex justify-center">
+                <Resume className="md:w-screen-md">{md}</Resume>
+              </div>
+            )
+          }
+
+          ReactDOM.render(
+            <React.StrictMode>
+              <Show />
+            </React.StrictMode>,
+            document.getElementById('root')
+          )
         `)
         return {
           code: ms.toString(),

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml