fix(#77): current build not working for nuxt2

CodeDredd · Jul 11, 2022 · 0b77360 · 0b77360
1 parent 375b6e5
commit 0b77360
Show file tree

Hide file tree

Showing 13 changed files with 14,466 additions and 43 deletions.
diff --git a/docs/content/5.nuxt/1.setup.md b/docs/content/5.nuxt/1.setup.md
@@ -21,8 +21,10 @@ description: ''
   import { defineNuxtConfig } from 'nuxt3'
   
   export default defineNuxtConfig({
-    buildModules: ['@pinia/nuxt'],
-    modules: ['@pinia-orm/nuxt'],
+    modules: [
+      '@pinia/nuxt', 
+      '@pinia-orm/nuxt'
+    ],
     // See https://github.com/nuxt/framework/issues/2371
     nitro: {
       externals: {

diff --git a/package.json b/package.json
@@ -4,8 +4,7 @@
   "packageManager": "pnpm@7.5.0",
   "workspaces": {
     "packages": [
-      "packages/*",
-      "playgrounds/*"
+      "packages/*"
     ]
   },
   "scripts": {

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -41,11 +41,11 @@
   },
   "peerDependencies": {
     "@pinia/nuxt": "^0.1.9",
-    "pinia": "^2.0.14"
+    "pinia": "^2.0.14",
+    "pinia-orm": "~0.10.0"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.0.0-rc.4",
-    "pinia-orm": "~0.10.0"
+    "@nuxt/kit": "^3.0.0-rc.4"
   },
   "devDependencies": {
     "@nuxt/module-builder": "latest",

diff --git a/packages/pinia-orm/package.json b/packages/pinia-orm/package.json
@@ -15,7 +15,7 @@
     "email": "gregor@codedredd.de"
   },
   "funding": "https://github.com/sponsors/codedredd",
-  "main": "dist/index.cjs",
+  "main": "dist/index.js",
   "jsdelivr": "dist/index.global.js",
   "unpkg": "dist/index.global.js",
   "module": "dist/index.mjs",
@@ -34,7 +34,7 @@
     "README.md"
   ],
   "scripts": {
-    "build": "rimraf dist && tsup src/index.ts --dts --format cjs,esm,iife",
+    "build": "tsup src/index.ts --dts --clean --format cjs,esm,iife",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . -l pinia-orm -r 1",
     "coverage": "vue-demi-switch 3 && vitest --run --coverage",
     "size": "size-limit",

diff --git a/packages/pinia-orm/src/interpreter/Interpreter.ts b/packages/pinia-orm/src/interpreter/Interpreter.ts
@@ -3,7 +3,7 @@ import { normalize } from 'normalizr'
 import { isArray } from '../support/Utils'
 import type { Element, NormalizedData } from '../data/Data'
 import type { Model } from '../model/Model'
-import { Schema } from '@/schema/Schema'
+import { Schema } from '../schema/Schema'
 
 export class Interpreter {
   /**

diff --git a/playgrounds/nuxt2comp/package.json b/playgrounds/nuxt2comp/package.json
@@ -19,7 +19,7 @@
     "core-js": "^3.19.3",
     "nuxt": "^2.15.8",
     "pinia": "^2.0.14",
-    "pinia-orm": "^0.9.2",
+    "pinia-orm": "^0.10.0",
     "vue": "^2.7.3",
     "vue-server-renderer": "^2.7.3",
     "vue-template-compiler": "^2.7.3",
@@ -39,8 +39,5 @@
     "nuxt-windicss": "^2.4.2",
     "postcss": "^8.4.14",
     "prettier": "^2.7.1"
-  },
-  "installConfig": {
-    "hoistingLimits": "dependencies"
   }
 }
diff --git a/playgrounds/nuxt2comp/pages/index.vue b/playgrounds/nuxt2comp/pages/index.vue
@@ -4,14 +4,13 @@
 
 <script lang="ts">
 import { defineComponent } from '@nuxtjs/composition-api'
-import { useRepo, useDataStore } from 'pinia-orm'
+import { useRepo } from 'pinia-orm'
 import User from '~/models/User'
-import { useORMStore } from '~/stores/useORMStore'
 
 export default defineComponent({
   name: 'IndexPage',
   setup() {
-    const userRepo = useRepo(User, useORMStore)
+    const userRepo = useRepo(User)
     userRepo.save([
       {
         id: 1,

diff --git a/playgrounds/nuxt2comp/yarn.lock b/playgrounds/nuxt2comp/yarn.lock
diff --git a/playgrounds/nuxt3/app.vue b/playgrounds/nuxt3/app.vue
@@ -2,27 +2,29 @@
   <div>Nuxt module playground!</div>
 </template>
 
-<script setup>
+<script setup  lang="ts">
 import User from './models/User'
 import { useRepo } from 'pinia-orm'
+onBeforeMount(() => {
+  const userRepo = useRepo(User)
+  const users = userRepo.save([
+    {
+      id: 1,
+      email: 'test@test.de',
+      name: 'test',
+      todos: [
+        {
+          id: 1,
+          title: 'Hoho',
+        },
+        {
+          id: 2,
+          title: 'Blub',
+        },
+      ],
+    },
+  ])
+  console.log(userRepo.with('todos').get())
+})
 
-const userRepo = useRepo(User)
-const users = userRepo.save([
-  {
-    id: 1,
-    email: 'test@test.de',
-    name: 'test',
-    todos: [
-      {
-        id: 1,
-        title: 'Hoho',
-      },
-      {
-        id: 2,
-        title: 'Blub',
-      },
-    ],
-  },
-])
-console.log(userRepo.with('todos').get())
 </script>
diff --git a/playgrounds/nuxt3/nuxt.config.ts b/playgrounds/nuxt3/nuxt.config.ts
@@ -1,8 +1,10 @@
 import { defineNuxtConfig } from 'nuxt'
 
 export default defineNuxtConfig({
-  buildModules: ['@pinia/nuxt'],
-  modules: ['@pinia-orm/nuxt'],
+  modules: [
+    '@pinia/nuxt',
+    '@pinia-orm/nuxt'
+  ],
   // See https://github.com/nuxt/framework/issues/2371
   nitro: {
     externals: {

diff --git a/playgrounds/nuxt3/package.json b/playgrounds/nuxt3/package.json
@@ -12,6 +12,6 @@
     "@pinia/nuxt": "^0.1.9",
     "nuxt": "^3.0.0-rc.4",
     "pinia": "^2.0.14",
-    "pinia-orm": "^0.9.2"
+    "pinia-orm": "^0.10.0"
   }
 }