Fixing test for createGenerateId

cssinjs · Jul 17, 2021 · f7480af · f7480af
1 parent 5c8657a
commit f7480af
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git a/packages/jss-plugin-isolate/src/index.test.js b/packages/jss-plugin-isolate/src/index.test.js
@@ -2,7 +2,7 @@ import expect from 'expect.js'
 import {create, sheets} from 'jss'
 
 import nested from 'jss-plugin-nested'
-import isolate from './index'
+import isolate from '.'
 
 describe('jss-plugin-isolate', () => {
   let jss

diff --git a/packages/jss/.size-snapshot.json b/packages/jss/.size-snapshot.json
@@ -1,21 +1,21 @@
 {
   "jss.js": {
-    "bundled": 63661,
+    "bundled": 63710,
     "minified": 23308,
     "gzipped": 7131
   },
   "jss.min.js": {
-    "bundled": 62274,
+    "bundled": 62323,
     "minified": 22543,
     "gzipped": 6771
   },
   "jss.cjs.js": {
-    "bundled": 59388,
+    "bundled": 59435,
     "minified": 26209,
     "gzipped": 7211
   },
   "jss.esm.mjs": {
-    "bundled": 57800,
+    "bundled": 57847,
     "minified": 24937,
     "gzipped": 7040,
     "treeshaked": {

diff --git a/packages/jss/src/RuleList.js b/packages/jss/src/RuleList.js
@@ -1,6 +1,7 @@
 // @flow
 import createRule from './utils/createRule'
-import {StyleRule, KeyframesRule} from './plugins'
+/* eslint-disable-next-line import/no-cycle */
+import {StyleRule, KeyframesRule} from './plugins/index'
 import type {
   RuleListOptions,
   ToCssOptions,

diff --git a/packages/jss/src/index.d.ts b/packages/jss/src/index.d.ts
@@ -11,7 +11,7 @@ export interface MinimalObservable<T> {
   ): {unsubscribe: () => void}
 }
 
-type Func<P, T, R> = T extends undefined ? ((data: P) => R) : ((data: P & {theme: T}) => R)
+type Func<P, T, R> = T extends undefined ? (data: P) => R : (data: P & {theme: T}) => R
 
 type NormalCssProperties = CSSProperties<string | number>
 type NormalCssValues<K> = K extends keyof NormalCssProperties ? NormalCssProperties[K] : JssValue

diff --git a/packages/jss/src/plugins/conditionalRule.js b/packages/jss/src/plugins/conditionalRule.js
@@ -1,4 +1,5 @@
 // @flow
+/* eslint-disable-next-line import/no-cycle */
 import RuleList from '../RuleList'
 import type {CSSMediaRule, Rule, RuleOptions, ToCssOptions, JssStyle, ContainerRule} from '../types'
 

diff --git a/packages/jss/src/plugins/index.js b/packages/jss/src/plugins/index.js
@@ -1,6 +1,9 @@
 // @flow
+/* eslint-disable-next-line import/no-cycle */
 import pluginStyleRule, {StyleRule} from './styleRule'
+/* eslint-disable-next-line import/no-cycle */
 import pluginConditionalRule, {ConditionalRule} from './conditionalRule'
+/* eslint-disable-next-line import/no-cycle */
 import pluginKeyframesRule, {KeyframesRule} from './keyframesRule'
 import pluginKeyframeRule, {KeyframeRule} from './keyframeRule'
 import pluginFontFaceRule, {FontFaceRule} from './fontFaceRule'

diff --git a/packages/jss/src/plugins/keyframesRule.js b/packages/jss/src/plugins/keyframesRule.js
@@ -1,5 +1,6 @@
 // @flow
 import warning from 'tiny-warning'
+/* eslint-disable-next-line import/no-cycle */
 import RuleList from '../RuleList'
 import type {
   CSSKeyframesRule,

diff --git a/packages/jss/tests/unit/createGenerateId.js b/packages/jss/tests/unit/createGenerateId.js
@@ -13,8 +13,8 @@ const sheetMock = {
 
 describe('Unit: jss - createGenerateId', () => {
   beforeEach(() => {
-    resetModuleId()
     resetSheets()
+    resetModuleId()
   })
 
   it('should return a function', () => {

diff --git a/scripts/update-changelog.js b/scripts/update-changelog.js
@@ -2,7 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const log = require('npmlog/log')
 
-const lerna = require('../lerna')
+const lerna = require('../lerna.json')
 const {CHANGELOG_FILENAME} = require('./constants')
 
 const changelogPath = path.join(process.cwd(), CHANGELOG_FILENAME)

diff --git a/tests/utils.js b/tests/utils.js
@@ -2,7 +2,7 @@ import {sheets as defaultSheets} from '../packages/jss/src'
 import {setVersion} from '../packages/jss/src/utils/moduleId'
 
 export function resetModuleId() {
-  setVersion(-1)
+  setVersion(0)
 }
 
 export function resetSheets(sheets = defaultSheets) {