Skip to content

Commit

Permalink
fix: lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
filiphazardous committed Aug 5, 2024
1 parent 3e8fee8 commit 5352fa4
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 23 deletions.
70 changes: 70 additions & 0 deletions .github/workflows/test-nuxt3-i18n.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Nuxt 3 tests

on:
push:
branches:
- main
- feat/*
- fix/*
pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build-and-test:
runs-on: ubuntu-latest
name: Build and test

env:
dir: ./examples/nuxt3-i18n

steps:
- uses: actions/checkout@v2

- name: Install node
uses: actions/setup-node@v2
with:
node-version: 20

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 8.15.9

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- name: Cache pnpm modules
uses: actions/cache@v2
with:
path: |
${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
~/.cache/Cypress
key: pnpm-v1-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
pnpm-v1-${{ runner.os }}-
- name: Install dependencies
run: pnpm install

- name: Build
run: pnpm run build

- name: Build book
working-directory: ${{env.dir}}
run: pnpm run story:build

- name: Run tests
working-directory: ${{env.dir}}
run: pnpm run ci

- uses: actions/upload-artifact@v2
if: failure()
with:
name: cypress-screenshots
path: ${{env.dir}}/cypress/screenshots
2 changes: 1 addition & 1 deletion examples/nuxt3-i18n/components/LocaleWrapper.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts" setup>
import { type Ref, watch, computed } from 'vue'
import { type Ref, computed, watch } from 'vue'
const { locale } = useI18n()
Expand Down
10 changes: 5 additions & 5 deletions examples/nuxt3-i18n/histoire.config.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { defineConfig } from 'histoire';
import { HstVue } from '@histoire/plugin-vue';
import { HstNuxt } from '@histoire/plugin-nuxt';
import { defineConfig } from 'histoire'
import { HstVue } from '@histoire/plugin-vue'
import { HstNuxt } from '@histoire/plugin-nuxt'

export default defineConfig({
plugins: [
HstVue(),
HstNuxt({ nuxtAppSettings: { include: '*' }}),
HstNuxt({ nuxtAppSettings: { include: '*' } }),
],
setupFile: 'histoire.setup.ts',
});
})
2 changes: 1 addition & 1 deletion examples/nuxt3-i18n/nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineNuxtConfig } from 'nuxt/config';
import { defineNuxtConfig } from 'nuxt/config'
// https://v3.nuxtjs.org/api/configuration/nuxt.config
export default defineNuxtConfig({
modules: [
Expand Down
32 changes: 16 additions & 16 deletions packages/histoire-plugin-nuxt/runtime/composables.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ function parseOptionalRegexp(_key, value) {
function shallowClone(obj) {
return Object.create(
Object.getPrototypeOf(obj),
Object.getOwnPropertyDescriptors(obj)
);
Object.getOwnPropertyDescriptors(obj),
)
}

function findValueFunc(value) {
return function(item) {
return function (item) {
if (typeof item === 'string') {
return (item === value)
}
Expand All @@ -38,13 +38,13 @@ function nuxtAppInclusion(originalApp, include, mock) {
throw new TypeError('Include has to be the string \'*\' or an array of strings or RegExps')
}

const nuxtAppClone = Object.create(Object.getPrototypeOf(originalApp));
const nuxtAppClone = Object.create(Object.getPrototypeOf(originalApp))
Object.getOwnPropertyNames(originalApp).forEach((key) => {
if (include.find(findValueFunc(key))) {
const descriptor = Object.getOwnPropertyDescriptor(originalApp, key);
const conflictingMockDescriptor = Object.getOwnPropertyDescriptor(mock, key);
const descriptor = Object.getOwnPropertyDescriptor(originalApp, key)
const conflictingMockDescriptor = Object.getOwnPropertyDescriptor(mock, key)
if (!conflictingMockDescriptor) {
Object.defineProperty(nuxtAppClone, key, descriptor);
Object.defineProperty(nuxtAppClone, key, descriptor)
}
}
})
Expand All @@ -56,13 +56,13 @@ function nuxtAppExclusion(originalApp, exclude, mock) {
throw new TypeError('Exclude has to be an array of strings or RegExps')
}

const nuxtAppClone = Object.create(Object.getPrototypeOf(originalApp));
const nuxtAppClone = Object.create(Object.getPrototypeOf(originalApp))
Object.getOwnPropertyNames(originalApp).forEach((key) => {
if (!exclude.find(findValueFunc(key))) {
const descriptor = Object.getOwnPropertyDescriptor(originalApp, key);
const conflictingMockDescriptor = Object.getOwnPropertyDescriptor(mock, key);
const descriptor = Object.getOwnPropertyDescriptor(originalApp, key)
const conflictingMockDescriptor = Object.getOwnPropertyDescriptor(mock, key)
if (!conflictingMockDescriptor) {
Object.defineProperty(nuxtAppClone, key, descriptor);
Object.defineProperty(nuxtAppClone, key, descriptor)
}
}
})
Expand All @@ -80,8 +80,8 @@ function deriveNuxtApp(originalApp, settings) {

// @TODO: Do we want a recursive merge strategy for the mock?
Object.getOwnPropertyNames(settings.mock).forEach((key) => {
const descriptor = Object.getOwnPropertyDescriptor(settings.mock, key);
Object.defineProperty(nuxtAppClone, key, descriptor);
const descriptor = Object.getOwnPropertyDescriptor(settings.mock, key)
Object.defineProperty(nuxtAppClone, key, descriptor)
})
return nuxtAppClone
}
Expand All @@ -94,10 +94,10 @@ export function useNuxtApp() {
const nuxtAppOriginal = useNuxtAppOriginal()
const options = nuxtAppOriginal.$config?.public?.histoireNuxtPluginOptions
? JSON.parse(nuxtAppOriginal.$config.public.histoireNuxtPluginOptions, parseOptionalRegexp)
: defaultOptions;
const _options = defu(options, defaultOptions);
: defaultOptions
const _options = defu(options, defaultOptions)

const settings = _options.nuxtAppSettings;
const settings = _options.nuxtAppSettings

const nuxtApp = deriveNuxtApp(nuxtAppOriginal, settings)
nuxtApp.runWithContext = nuxtAppOriginal.runWithContext
Expand Down

0 comments on commit 5352fa4

Please sign in to comment.