Skip to content

Commit

Permalink
fix: bump consola to 3.x to align with other nuxt 2 packages (#224)
Browse files Browse the repository at this point in the history
  • Loading branch information
rchl authored Nov 27, 2023
1 parent 87fa5f0 commit c1aee33
Show file tree
Hide file tree
Showing 8 changed files with 5,746 additions and 5,835 deletions.
7 changes: 5 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ module.exports = {
sourceType: 'module'
},
extends: [
'@nuxtjs/eslint-config-typescript'
]
'@nuxtjs/eslint-config'
],
rules: {
'vue/multi-word-component-names': 'off'
}
}
4 changes: 3 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ on:
push:
branches:
- master
- v1
pull_request:
branches:
- master
- v1

jobs:
build:
Expand All @@ -16,7 +18,7 @@ jobs:
CI: true
strategy:
matrix:
node-version: [12.x, 14.x]
node-version: [18.x, 20.x]
name: Use Node.js ${{ matrix.node-version }}
steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
2 changes: 1 addition & 1 deletion lib/module.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const glob = require('glob-all')
const consola = require('consola')
const logger = consola.withScope('nuxt-style-resources')
const logger = consola.withTag('nuxt-style-resources')

/** @type {import('@nuxt/types').Module<import('../types').Options>} */
export default function nuxtStyledResources (moduleOptions) {
Expand Down
46 changes: 28 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"scripts": {
"dev": "nuxt dev --config-file test/fixture/sass/nuxt.config.js",
"lint": "eslint --ext .js,.ts,.vue lib test types",
"lint": "eslint --ext .js,.ts,.vue lib test",
"test": "yarn lint && jest",
"release": "standard-version && git push --follow-tags && npm publish",
"commitlint": "commitlint -e $GIT_PARAMS",
Expand Down Expand Up @@ -59,34 +59,44 @@
"collectCoverage": true,
"collectCoverageFrom": [
"lib/**/*.js"
],
"transform": {
"\\.[jt]sx?$": "babel-jest"
},
"transformIgnorePatterns": [
"/node_modules/(?!@nuxt)"
]
},
"dependencies": {
"consola": "^2.15.3",
"glob-all": "^3.2.1",
"sass-resources-loader": "^2.2.4"
"consola": "^3.2.3",
"glob-all": "^3.3.1",
"sass-resources-loader": "^2.2.5"
},
"devDependencies": {
"@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^13.1.0",
"@nuxt/types": "^2.15.7",
"@nuxtjs/eslint-config-typescript": "^6.0.1",
"@types/jest": "^27.0.0",
"@babel/core": "^7.23.3",
"@babel/preset-env": "^7.23.3",
"@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3",
"@nuxt/types": "^2.17.2",
"@nuxtjs/eslint-config": "^12.0.0",
"@types/jest": "^29.5.10",
"babel-jest": "^29.7.0",
"codecov": "^3.8.3",
"eslint": "^7.32.0",
"eslint": "^8.54.0",
"eslint-plugin-jest": "^27.6.0",
"get-port": "^5.1.1",
"husky": "^7.0.1",
"jest": "^27.0.6",
"jsdom": "^16.7.0",
"less": "^4.1.1",
"husky": "^7.0.4",
"jest": "^29.7.0",
"jsdom": "^22.1.0",
"less": "^4.2.0",
"less-loader": "^4.1.0",
"mathsass": "^0.11.0",
"nuxt-edge": "^2.16.0-27132492.cdbea391",
"sass": "^1.37.5",
"nuxt-edge": "^2.17.2-28284499.5674f49",
"sass": "^1.69.5",
"sass-loader": "^7.3.1",
"standard-version": "^9.3.1",
"standard-version": "^9.5.0",
"stylus": "^0.54.8",
"stylus-loader": "^3.0.2",
"typescript": "^4.3.5"
"typescript": "^5.3.2"
}
}
3 changes: 3 additions & 0 deletions test/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
extends: ['plugin:jest/recommended']
}
8 changes: 4 additions & 4 deletions test/module.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
jest.setTimeout(60000)
import { consola } from 'consola'
import getPort from 'get-port'
import { Nuxt, Builder } from 'nuxt-edge'

const consola = require('consola')
const getPort = require('get-port')
const { Nuxt, Builder } = require('nuxt-edge')
jest.setTimeout(60000)

let nuxt, port

Expand Down
Loading

0 comments on commit c1aee33

Please sign in to comment.