chore: pnpm to v7

Author: haoziqaq

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 6
+          version: 7
 
       - name: Set node version to 14
         uses: actions/setup-node@v2
@@ -32,4 +32,4 @@ jobs:
       - name: Report coverage to Codecov
         uses: codecov/codecov-action@v1
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}

package.json

@@ -3,7 +3,7 @@
   "version": "0.1.3",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "bootstrap": "pnpm install && node scripts/bootstrap.mjs",
+    "bootstrap": "pnpm install --shamefully-hoist && node scripts/bootstrap.mjs",
     "lint": "varlet-vue2-cli lint",
     "changelog": "varlet-vue2-cli changelog",
     "release": "node scripts/publish.mjs && varlet-vue2-cli release"
@@ -67,5 +67,5 @@
     "surge": "^0.23.0",
     "typescript": "^4.4.4"
   },
-  "packageManager": "pnpm@6.24.3"
-}
+  "packageManager": "pnpm@7.9"
+}

packages/varlet-vue2-cli/package.json

@@ -24,25 +24,25 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@babel/core": "^7.16.0",
-    "@babel/plugin-transform-typescript": "^7.16.1",
-    "@babel/preset-env": "^7.16.4",
-    "@babel/helper-plugin-utils": "^7.14.5",
-    "@babel/preset-typescript": "^7.16.0",
-    "babel-plugin-jsx-event-modifiers": "^2.0.5",
+    "@babel/core": "7.16.0",
+    "@babel/plugin-transform-typescript": "7.16.1",
+    "@babel/preset-env": "7.16.4",
+    "@babel/helper-plugin-utils": "7.14.5",
+    "@babel/preset-typescript": "7.16.0",
+    "babel-plugin-jsx-event-modifiers": "2.0.5",
     "@varlet/icons": "latest",
     "@varlet/touch-emulator": "latest",
     "@varlet-vue2/markdown-vite-plugin": "workspace:*",
-    "@vue/babel-preset-jsx": "^1.2.4",
-    "@vue/test-utils": "^1.2.2",
-    "@vue/component-compiler-utils": "^3.3.0",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+    "@vue/babel-preset-jsx": "1.2.4",
+    "@vue/test-utils": "1.2.2",
+    "@vue/component-compiler-utils": "3.3.0",
+    "@vue/babel-helper-vue-jsx-merge-props": "1.2.1",
     "glob": "^7.2.0",
     "semver": "^7.3.5",
     "inquirer": "^8.1.2",
     "conventional-changelog": "^3.1.25",
     "babel-jest": "26.6.3",
-    "babel-plugin-jsx-v-model": "^2.0.3",
+    "babel-plugin-jsx-v-model": "2.0.3",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "commander": "^8.3.0",
@@ -58,19 +58,19 @@
     "stylelint": "^13.13.1",
     "typescript": "^4.4.4",
     "vite": "2.8.1",
-    "vite-plugin-html": "^2.1.1",
-    "vite-plugin-vue2": "^1.9.3",
+    "vite-plugin-html": "2.1.1",
+    "vite-plugin-vue2": "1.9.3",
     "vue-jest": "4.0.0-rc.0",
     "vue-template-compiler": "2.6.14",
-    "vue": "^2.6.14",
-    "lodash-es": "^4.17.21",
+    "vue": "2.6.14",
+    "lodash-es": "4.17.21",
     "vue-router": "^3.5.3"
   },
   "peerDependencies": {
     "@varlet/touch-emulator": "latest",
-    "@babel/runtime": "^7.16.0",
-    "@vue/test-utils": "^1.2.2",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
+    "@babel/runtime": "7.16.0",
+    "@vue/test-utils": "1.2.2",
+    "@vue/babel-helper-vue-jsx-merge-props": "1.2.1",
     "vue-template-compiler": "2.6.14",
     "vue": "2.6.14",
     "live-server": "^1.2.1",
@@ -86,4 +86,4 @@
     "@types/slash": "^3.0.0",
     "@types/semver": "^7.3.9"
   }
-}
+}

packages/varlet-vue2-ui/package.json

@@ -55,10 +55,12 @@
     "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1"
   },
   "devDependencies": {
+    "@types/jest": "^26.0.15",
+    "@types/node": "^18.7.18",
     "@varlet-vue2/cli": "workspace:*",
     "@varlet/touch-emulator": "latest",
-    "@vue/test-utils": "^1.2.2",
-    "@babel/runtime": "^7.16.0",
+    "@vue/test-utils": "1.2.2",
+    "@babel/runtime": "7.16.0",
     "vue-template-compiler": "2.6.14",
     "vue": "2.6.14",
     "live-server": "^1.2.1",
@@ -70,4 +72,4 @@
     "Chrome >= 51",
     "iOS >= 10"
   ]
-}
+}

packages/varlet-vue2-ui/src/collapse/__tests__/index.spec.js

@@ -52,7 +52,7 @@ test('test collapse modelValue and onChange', async () => {
 
   await delay(0)
 
-  const collapseItemList = wrapper.findAllComponents('.var-collapse-item')
+  const collapseItemList = wrapper.findAll('.var-collapse-item')
   expect(collapseItemList.at(1).classes()).toContain('var-collapse-item__active')
 
   const firstCollapseItemHeader = collapseItemList.at(0).find('.var-collapse-item-header')
@@ -162,7 +162,7 @@ test('test collapseItem disabled', async () => {
 
   await delay(0)
 
-  const collapseItemList = wrapper.findAllComponents('.var-collapse-item')
+  const collapseItemList = wrapper.findAll('.var-collapse-item')
 
   expect(collapseItemList.at(0).classes()).toContain('var-collapse-item__disable')
 

packages/varlet-vue2-ui/src/date-picker/__tests__/index.spec.js

@@ -126,7 +126,7 @@ test('test firstDayOfWeek prop', async () => {
   })
 
   await delay(0)
-  expect(wrapper.findComponent('.var-day-picker__head').findComponent('li').text()).toBe('三')
+  expect(wrapper.find('.var-day-picker__head').find('li').text()).toBe('三')
 })
 
 test('test max and min', async () => {
@@ -139,18 +139,18 @@ test('test max and min', async () => {
   })
 
   await delay(0)
-  expect(wrapper.findComponent('.var-picker-header__value').text()).toBe('2021 四月')
+  expect(wrapper.find('.var-picker-header__value').text()).toBe('2021 四月')
 
-  await wrapper.findComponent('.var-picker-header').findComponent('button').trigger('click')
+  await wrapper.find('.var-picker-header').find('button').trigger('click')
   await delay(200)
-  expect(wrapper.findComponent('.var-picker-header__value').text()).toBe('2021 四月')
+  expect(wrapper.find('.var-picker-header__value').text()).toBe('2021 四月')
 
-  await wrapper.findComponent('.var-picker-header__value').trigger('click')
+  await wrapper.find('.var-picker-header__value').trigger('click')
   await delay(200)
-  await wrapper.findComponent('.var-picker-header__value').trigger('click')
+  await wrapper.find('.var-picker-header__value').trigger('click')
   await delay(200)
 
-  expect(wrapper.findComponent('.var-year-picker__panel').findAll('li').length).toBe(1)
+  expect(wrapper.find('.var-year-picker__panel').findAll('li').length).toBe(1)
 })
 
 test('test datePicker v-model', async () => {
@@ -170,22 +170,22 @@ test('test datePicker v-model', async () => {
   })
 
   await delay(0)
-  await wrapper.findComponent('.var-picker-header').findComponent('button').trigger('click')
+  await wrapper.find('.var-picker-header').find('button').trigger('click')
   await delay(200)
-  await wrapper.findComponent('.var-month-picker__content').findComponent('ul').findComponent('button').trigger('click')
+  await wrapper.find('.var-month-picker__content').find('ul').find('button').trigger('click')
   expect(wrapper.vm.date).toBe('2020-01')
 
-  await wrapper.findComponent('.var-picker-header__value').trigger('click')
+  await wrapper.find('.var-picker-header__value').trigger('click')
   await delay(200)
-  await wrapper.findComponent('.var-year-picker__panel').findComponent('li').trigger('click')
+  await wrapper.find('.var-year-picker__panel').find('li').trigger('click')
   await delay(200)
-  await wrapper.findComponent('.var-month-picker__content').findComponent('ul').findComponent('button').trigger('click')
+  await wrapper.find('.var-month-picker__content').find('ul').find('button').trigger('click')
   expect(wrapper.vm.date).not.toBe('2021-01')
 
   await wrapper.setData({ type: 'date', date: '2021-05-19' })
-  await wrapper.findComponent('.var-picker-header').findComponent('button').trigger('click')
+  await wrapper.find('.var-picker-header').find('button').trigger('click')
   await delay(200)
-  await wrapper.findComponent('.var-day-picker__button--usable').trigger('click')
+  await wrapper.find('.var-day-picker__button--usable').trigger('click')
   expect(wrapper.vm.date).toBe('2021-04-01')
 })
 
@@ -254,9 +254,9 @@ test('test datePicker range prop', async () => {
   await wrapper.setData({ type: 'month', date: null })
   await wrapper.setData({ type: 'month', date: ['2021-05', '2021-06'] })
   await delay(0)
-  const lis = wrapper.findComponent('.var-month-picker__content').findComponent('ul').findAll('li')
-  await lis.at(0).findComponent('button').trigger('click')
-  await lis.at(2).findComponent('button').trigger('click')
+  const lis = wrapper.find('.var-month-picker__content').find('ul').findAll('li')
+  await lis.at(0).find('button').trigger('click')
+  await lis.at(2).find('button').trigger('click')
   expect(wrapper.vm.date).toEqual([`${currentYear}-01`, `${currentYear}-03`])
   expect(fn).toHaveBeenCalledTimes(1)
 
@@ -280,12 +280,12 @@ test('test datePicker readonly', async () => {
   })
 
   await delay(0)
-  await wrapper.findComponent('.var-month-picker__content').findComponent('ul').findComponent('button').trigger('click')
+  await wrapper.find('.var-month-picker__content').find('ul').find('button').trigger('click')
   await delay(200)
   expect(wrapper.vm.date).toBe('2021-05')
 
   await wrapper.setData({ type: 'date', date: '2021-05-19' })
-  await wrapper.findComponent('.var-day-picker__button--usable').trigger('click')
+  await wrapper.find('.var-day-picker__button--usable').trigger('click')
   await delay(200)
   expect(wrapper.vm.date).toBe('2021-05-19')
 })
@@ -304,8 +304,8 @@ test('test datePicker touchable prop', async () => {
     template: `<var-date-picker v-model="date" :type="type" />`,
   })
 
-  const pickBodyEl = wrapper.findComponent('.var-date-picker-body')
-  const headerEl = wrapper.findComponent('.var-picker-header__value')
+  const pickBodyEl = wrapper.find('.var-date-picker-body')
+  const headerEl = wrapper.find('.var-picker-header__value')
 
   await triggerDrag(pickBodyEl, 0, 100)
   expect(headerEl.text()).toBe('2021 四月')

packages/varlet-vue2-ui/src/form/__tests__/__snapshots__/index.spec.js.snap

@@ -327,7 +327,11 @@ exports[`test form with select 1`] = `
         <div class=\\"var-select__wrap\\">
           <div class=\\"var-select__select var-select--disabled\\" style=\\"text-align: left;\\">
             <div>
-              <div class=\\"var-select__chips\\"></div>
+              <div class=\\"var-select__chips\\">
+                <transition-stub name=\\"var-fade\\" class=\\"var-select__chip\\"><span var-select-cover=\\"\\" class=\\"var-chip var--box var-chip--small var--inline-flex var-chip--default var-chip--round\\"> <span class=\\"var-chip--text-small\\">
+                选项1
+              </span> <span class=\\"var-chip--close\\"><i class=\\"var-icon var-icon--set var-icon-close-circle\\" style=\\"transition: transform 0ms;\\"></i></span></span></transition-stub>
+              </div>
             </div> <i class=\\"var-icon var-select__arrow var-icon--set var-icon-menu-down\\" style=\\"transition: transform 300ms;\\" var-select-cover=\\"\\"></i>
           </div> <label class=\\"var-select__placeholder var--ellipsis var-select--disabled var-select--placeholder-hint\\">
 

packages/varlet-vue2-ui/tsconfig.json

@@ -1,15 +1,16 @@
 {
   "compilerOptions": {
-    "baseUrl": ".",
+    "module": "esnext",
+    "moduleResolution": "node",
     "strict": true,
     "downlevelIteration": true,
     "declaration": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowJs": true,
     "lib": ["esnext", "dom"],
+    "allowSyntheticDefaultImports": true,
     "jsx": "preserve",
-    "isolatedModules": true,
-    "exclude": ["**/*.spec.ts", "**/*.spec.js", "node_modules"]
+    "isolatedModules": true
   }
 }