Skip to content

Commit 31c8f0a

Browse files
Merge pull request #23 from codebender828/main
chore: Nuxt 3 pre-release prep
2 parents 4efa66f + 77469f6 commit 31c8f0a

File tree

10 files changed

+7001
-6649
lines changed

10 files changed

+7001
-6649
lines changed

.eslintrc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
2-
"extends": [
3-
"@nuxtjs/eslint-config-typescript"
4-
],
2+
"plugins": ["prettier"],
3+
"extends": "@nuxtjs/eslint-config-typescript",
54
"rules": {
6-
"@typescript-eslint/no-unused-vars": [
7-
"off"
8-
]
9-
}
5+
"@typescript-eslint/no-unused-vars": ["off"],
6+
},
107
}

.github/workflows/ci.yml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: ci
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
ci:
@@ -25,27 +25,36 @@ jobs:
2525
- name: checkout
2626
uses: actions/checkout@master
2727

28-
- name: Get yarn cache directory path
29-
id: yarn-cache-dir-path
30-
run: echo "::set-output name=dir::$(yarn cache dir)"
28+
- uses: pnpm/action-setup@v2
29+
name: Install pnpm
30+
id: pnpm-install
31+
with:
32+
version: 7
33+
run_install: false
34+
35+
- name: Get pnpm store directory
36+
id: pnpm-cache
37+
shell: bash
38+
run: |
39+
echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
3140
32-
- uses: actions/cache@v2
33-
id: yarn-cache
41+
- uses: actions/cache@v3
42+
name: Setup pnpm cache
3443
with:
35-
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
36-
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
44+
path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
45+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
3746
restore-keys: |
38-
${{ runner.os }}-yarn-
47+
${{ runner.os }}-pnpm-store-
3948
4049
- name: Install dependencies
4150
if: steps.cache.outputs.cache-hit != 'true'
42-
run: yarn
51+
run: pnpm install && pnpm dev:prepare
4352

4453
- name: Lint
45-
run: yarn lint
54+
run: pnpm lint
4655

4756
- name: Test
48-
run: yarn test
57+
run: pnpm test
4958

5059
- name: Coverage
5160
uses: codecov/codecov-action@v3

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727

2828
## Setup
2929

30-
**IMPORTANT NOTE:** This module requires new hooks that works with nuxt `2.5.0` or `nuxt-edge` only.
31-
3230
1. Add `@nuxtjs/emotion` dependency to your project
3331

3432
```bash

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "@nuxtjs/emotion",
3-
"version": "0.1.0",
3+
"version": "1.0.0",
44
"description": "The Next Generation of CSS-in-JS for Nuxt.js",
5-
"repository": "nuxt-community/emotion-module",
5+
"repository": "nuxt-modules/emotion",
66
"license": "MIT",
77
"type": "module",
88
"exports": {
@@ -34,9 +34,13 @@
3434
"@nuxt/schema": "^3.0.0",
3535
"@nuxt/test-utils": "^3.0.0",
3636
"@nuxtjs/eslint-config-typescript": "^12.0.0",
37-
"eslint": "^8.31.0",
38-
"nitropack": "^1.0.0",
37+
"@typescript-eslint/eslint-plugin": "^5.0.0",
38+
"eslint": "^8.32.0",
39+
"eslint-plugin-prettier": "^4.2.1",
40+
"eslint-plugin-promise": "^6.0.0",
3941
"nuxt": "^3.0.0",
42+
"prettier": "^2.8.3",
43+
"typescript": "*",
4044
"vitest": "^0.27.2"
4145
},
4246
"publishConfig": {

playground/app.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</div>
1010
</template>
1111

12-
<script setup>
12+
<script lang="ts" setup>
1313
import { css } from '@emotion/css'
1414
1515
const styles = reactive({

0 commit comments

Comments
 (0)