fix(shared): resolve internal circular reference

vueuse · Aug 12, 2022 · 0fdbbf4 · 0fdbbf4
1 parent e2a7828
commit 0fdbbf4
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 48 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,5 +1,19 @@
 const { resolve } = require('path')
 
+const restricted = [
+  'vue',
+  '@vue/composition-api',
+  '..',
+  '../..',
+  resolve(__dirname, 'packages/core/index.ts'),
+  resolve(__dirname, 'packages/shared/index.ts'),
+  {
+    name: 'vue-demi',
+    importNames: ['onMounted', 'onUnmounted'],
+    message: 'Use tryOnMounted and tryOnScopeDispose instead.',
+  },
+]
+
 module.exports = {
   root: true,
   env: {
@@ -19,18 +33,7 @@ module.exports = {
     'no-restricted-imports': [
       'error',
       {
-        paths: [
-          'vue',
-          '@vue/composition-api',
-          '..',
-          '../..',
-          resolve(__dirname, 'packages/core/index.ts'),
-          {
-            name: 'vue-demi',
-            importNames: ['onMounted', 'onUnmounted'],
-            message: 'Use tryOnMounted and tryOnScopeDispose instead.',
-          },
-        ],
+        paths: restricted,
       },
     ],
     'node/no-callback-literal': 'off',
@@ -40,6 +43,19 @@ module.exports = {
     'import/no-named-as-default-member': 'off',
   },
   overrides: [
+    {
+      files: ['packages/shared/**/*.ts'],
+      rules: {
+        'no-restricted-imports': ['error',
+          {
+            paths: [
+              ...restricted,
+              '@vueuse/shared',
+            ],
+          },
+        ],
+      },
+    },
     {
       files: ['**/*.md', '**/*.md/*.*', 'demo.vue', 'scripts/*.ts', '*.test.ts'],
       rules: {

diff --git a/.gitignore b/.gitignore
@@ -12,5 +12,6 @@ packages/*/LICENSE
 packages/contributing.md
 packages/core/README.md
 packages/public/badge-*
+packages/*/index.mjs
 playgrounds/*/pnpm-lock.yaml
 types
diff --git a/package.json b/package.json
@@ -50,10 +50,10 @@
     "@vitest/ui": "^0.18.1",
     "@vue/compiler-sfc": "^3.2.37",
     "@vue/test-utils": "^2.0.2",
-    "@vueuse/core": "link:packages/core",
-    "@vueuse/integrations": "link:packages/integrations",
-    "@vueuse/math": "link:packages/math",
-    "@vueuse/shared": "link:packages/shared",
+    "@vueuse/core": "workspace:*",
+    "@vueuse/integrations": "workspace:*",
+    "@vueuse/math": "workspace:*",
+    "@vueuse/shared": "workspace:*",
     "axios": "^0.27.2",
     "bumpp": "^8.2.1",
     "consola": "^2.15.3",

diff --git a/packages/ecosystem.md b/packages/ecosystem.md
@@ -26,7 +26,7 @@ import * as console from 'vue-chemistry/console'
 const a = ref(1)
 const b = ref(2)
 
-let c = sum(a, b) // c = a + b = 3
+const c = sum(a, b) // c = a + b = 3
 
 set(a, 2) // shorthand for a.value = 2
 

diff --git a/packages/shared/createInjectionState/demo/useCounterStore.ts b/packages/shared/createInjectionState/demo/useCounterStore.ts
@@ -1,5 +1,5 @@
 import { computed, ref } from 'vue-demi'
-import { createInjectionState } from '@vueuse/shared'
+import { createInjectionState } from '../../createInjectionState'
 
 const [useProvideCounterStore, useCounterStore] = createInjectionState((initialValue: number) => {
   // state

diff --git a/packages/shared/refAutoReset/index.ts b/packages/shared/refAutoReset/index.ts
@@ -1,7 +1,7 @@
 import type { Ref } from 'vue-demi'
 import { customRef } from 'vue-demi'
-import { resolveUnref } from '@vueuse/shared'
-import type { MaybeComputedRef } from '@vueuse/shared'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 import { tryOnScopeDispose } from '../tryOnScopeDispose'
 
 /**

diff --git a/packages/shared/useArrayEvery/index.ts b/packages/shared/useArrayEvery/index.ts
@@ -1,7 +1,7 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
-import { resolveUnref } from '@vueuse/shared'
 import type { ComputedRef } from 'vue-demi'
 import { computed } from 'vue-demi'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 
 /**
  * Reactive `Array.every`

diff --git a/packages/shared/useArrayFilter/index.ts b/packages/shared/useArrayFilter/index.ts
@@ -1,7 +1,7 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
-import { resolveUnref } from '@vueuse/shared'
 import type { ComputedRef } from 'vue-demi'
 import { computed } from 'vue-demi'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 
 /**
  * Reactive `Array.filter`

diff --git a/packages/shared/useArrayFind/index.ts b/packages/shared/useArrayFind/index.ts
@@ -1,7 +1,7 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
 import type { ComputedRef } from 'vue-demi'
-import { resolveUnref } from '@vueuse/shared'
 import { computed } from 'vue-demi'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 
 /**
  * Reactive `Array.find`

diff --git a/packages/shared/useArrayFindIndex/index.ts b/packages/shared/useArrayFindIndex/index.ts
@@ -1,7 +1,7 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
-import { resolveUnref } from '@vueuse/shared'
 import type { ComputedRef } from 'vue-demi'
 import { computed } from 'vue-demi'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 
 /**
  * Reactive `Array.findIndex`

diff --git a/packages/shared/useArrayJoin/index.ts b/packages/shared/useArrayJoin/index.ts
@@ -1,7 +1,7 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
-import { resolveUnref } from '@vueuse/shared'
 import type { ComputedRef } from 'vue-demi'
 import { computed } from 'vue-demi'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 
 /**
  * Reactive `Array.join`

diff --git a/packages/shared/useArrayMap/index.ts b/packages/shared/useArrayMap/index.ts
@@ -1,7 +1,7 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
-import { resolveUnref } from '@vueuse/shared'
 import type { ComputedRef } from 'vue-demi'
 import { computed } from 'vue-demi'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 
 /**
  * Reactive `Array.map`

diff --git a/packages/shared/useArrayReduce/index.ts b/packages/shared/useArrayReduce/index.ts
@@ -1,7 +1,7 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
-import { resolveUnref } from '@vueuse/shared'
 import type { ComputedRef } from 'vue-demi'
 import { computed } from 'vue-demi'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 
 export type UseArrayReducer<PV, CV, R> = (previousValue: PV, currentValue: CV, currentIndex: number) => R
 

diff --git a/packages/shared/useArraySome/index.ts b/packages/shared/useArraySome/index.ts
@@ -1,7 +1,7 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
-import { resolveUnref } from '@vueuse/shared'
 import type { ComputedRef } from 'vue-demi'
 import { computed } from 'vue-demi'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 
 /**
  * Reactive `Array.some`

diff --git a/packages/shared/useDateFormat/index.ts b/packages/shared/useDateFormat/index.ts
@@ -1,6 +1,6 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
-import { resolveUnref } from '@vueuse/shared'
 import { computed } from 'vue-demi'
+import type { MaybeComputedRef } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 
 export type DateLike = Date | number | string | undefined
 

diff --git a/packages/shared/useDebounceFn/index.ts b/packages/shared/useDebounceFn/index.ts
@@ -1,5 +1,4 @@
-import type { MaybeComputedRef } from '@vueuse/shared'
-import type { DebounceFilterOptions, FunctionArgs } from '../utils'
+import type { DebounceFilterOptions, FunctionArgs, MaybeComputedRef } from '../utils'
 import { createFilterWrapper, debounceFilter } from '../utils'
 
 /**

diff --git a/packages/shared/useTimeoutFn/index.ts b/packages/shared/useTimeoutFn/index.ts
@@ -1,8 +1,7 @@
 import { ref } from 'vue-demi'
-import type { MaybeComputedRef } from '@vueuse/shared'
-import { resolveUnref } from '@vueuse/shared'
+import type { MaybeComputedRef, Stoppable } from '../utils'
+import { resolveUnref } from '../resolveUnref'
 import { tryOnScopeDispose } from '../tryOnScopeDispose'
-import type { Stoppable } from '../utils'
 import { isClient } from '../utils'
 
 export interface UseTimeoutFnOptions {

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