Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update all non-major dependencies #48

Merged
merged 4 commits into from Aug 4, 2023
Merged

Update all non-major dependencies #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f85744
Update all non-major dependencies
renovate[bot] Aug 4, 2023
4d3e00f
Fix eslint warnings
Demivan Aug 4, 2023
de96acf
Update snapshots
Demivan Aug 4, 2023
ec75136
Merge remote-tracking branch 'origin/main' into renovate/all-minor-patch
Demivan Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/test.yml
View file
Open in desktop
Expand Up @@ -19,12 +19,12 @@ jobs:
node: [18]
steps:
- name: Checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.3
- name: Setup Node.js ${{ matrix.node }}
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@v3.7.0
with:
node-version: ${{ matrix.node }}
- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v2.4.0
with:
version: 8.x.x
run_install: true
Expand All @@ -40,10 +40,10 @@ jobs:
name: Lint source code
steps:
- name: Checkout
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.3
- name: Setup Node.js
uses: actions/setup-node@v3.6.0
- uses: pnpm/action-setup@v2.2.4
uses: actions/setup-node@v3.7.0
- uses: pnpm/action-setup@v2.4.0
with:
version: 8.x.x
run_install: true
Expand All @@ -56,15 +56,15 @@ jobs:
name: Test build of example projects
steps:
- name: Checkout unplugin-fluent-vue
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.3
- name: Checkout examples
uses: actions/checkout@v3.4.0
uses: actions/checkout@v3.5.3
with:
repository: fluent-vue/examples
path: examples
- name: Setup Node.js
uses: actions/setup-node@v3.6.0
- uses: pnpm/action-setup@v2.2.4
uses: actions/setup-node@v3.7.0
- uses: pnpm/action-setup@v2.4.0
with:
version: 8.x.x
run_install: true
Expand Down
Binary file modified __tests__/frameworks/vite/__snapshots__/external.spec.ts.snap
View file
Open in desktop
Binary file not shown.
Binary file modified __tests__/frameworks/vite/__snapshots__/sfc.spec.ts.snap
View file
Open in desktop
Binary file not shown.
14 changes: 7 additions & 7 deletions __tests__/frameworks/vite/errors.spec.ts
View file
Open in desktop
@@ -1,16 +1,12 @@
import { resolve } from 'node:path'
import { describe, expect, it } from 'vitest'

import vue3base from '@vitejs/plugin-vue'
import vue3 from '@vitejs/plugin-vue'
import compiler from '@vue/compiler-sfc'

import { ExternalFluentPlugin, SFCFluentPlugin } from '../../../src/vite'
import { compile } from './util'

const vue3 = () => vue3base({
compiler,
})

const baseDir = resolve(__dirname, '../..')

describe('Error checking', () => {
Expand All @@ -19,7 +15,9 @@ describe('Error checking', () => {
// Act
const code = compile({
plugins: [
vue3(),
vue3({
compiler,
}),
ExternalFluentPlugin({
baseDir: resolve(baseDir, 'fixtures'),
ftlDir: resolve(baseDir, 'fixtures/ftl'),
Expand Down Expand Up @@ -53,7 +51,9 @@ describe('Error checking', () => {
// Act
const code = compile({
plugins: [
vue3(),
vue3({
compiler,
}),
SFCFluentPlugin({
checkSyntax: true,
}),
Expand Down
28 changes: 16 additions & 12 deletions __tests__/frameworks/vite/external.spec.ts
View file
Open in desktop
@@ -1,16 +1,12 @@
import { relative, resolve } from 'node:path'
import { describe, expect, it } from 'vitest'

import vue3base from '@vitejs/plugin-vue'
import vue3 from '@vitejs/plugin-vue'
import compiler from '@vue/compiler-sfc'

import { ExternalFluentPlugin } from '../../../src/vite'
import { compile } from './util'

const vue3 = () => vue3base({
compiler,
})

const baseDir = resolve(__dirname, '../..')

describe('Vite external', () => {
Expand All @@ -19,7 +15,9 @@ describe('Vite external', () => {
// Act
const code = await compile({
plugins: [
vue3(),
vue3({
compiler,
}),
ExternalFluentPlugin({
baseDir: resolve(baseDir, 'fixtures'),
ftlDir: resolve(baseDir, 'fixtures/ftl'),
Expand All @@ -38,7 +36,9 @@ describe('Vite external', () => {
// Act
const code = await compile({
plugins: [
vue3(),
vue3({
compiler,
}),
ExternalFluentPlugin({
getFtlPath: (locale, vuePath) => {
return `${baseDir}/fixtures/ftl/${locale}/${relative(resolve(baseDir, 'fixtures'), vuePath)}.ftl`
Expand All @@ -58,7 +58,9 @@ describe('Vite external', () => {
// Act
const code = await compile({
plugins: [
vue3(),
vue3({
compiler,
}),
ExternalFluentPlugin({
baseDir: resolve(baseDir, 'fixtures'),
ftlDir: resolve(baseDir, 'fixtures/ftl'),
Expand All @@ -77,7 +79,9 @@ describe('Vite external', () => {
// Act
const code = await compile({
plugins: [
vue3(),
vue3({
compiler,
}),
ExternalFluentPlugin({
baseDir: resolve(baseDir, 'fixtures'),
ftlDir: resolve(baseDir, 'fixtures/ftl'),
Expand All @@ -89,15 +93,15 @@ describe('Vite external', () => {
// Assert
expect(code).toMatchInlineSnapshot(`
"=== /fixtures/importer.js ===
import translations from '/@id/virtual:ftl-for-file?importer=/fixtures/importer.js'
import translations from \\"/@id/virtual:ftl-for-file?importer=/fixtures/importer.js\\"

// eslint-disable-next-line no-console -- this is a test file
console.log(translations)


=== virtual:ftl-for-file?importer=/fixtures/importer.js ===
import en_ftl from '/fixtures/ftl/en/importer.js.ftl?import';
import da_ftl from '/fixtures/ftl/da/importer.js.ftl?import';
import en_ftl from \\"/fixtures/ftl/en/importer.js.ftl?import\\";
import da_ftl from \\"/fixtures/ftl/da/importer.js.ftl?import\\";
export default { 'en': en_ftl, 'da': da_ftl }
"
`)
Expand Down
14 changes: 7 additions & 7 deletions __tests__/frameworks/vite/sfc.spec.ts
View file
Open in desktop
@@ -1,22 +1,20 @@
import { describe, expect, it } from 'vitest'

import vue3base from '@vitejs/plugin-vue'
import vue3 from '@vitejs/plugin-vue'

import compiler from '@vue/compiler-sfc'
import { SFCFluentPlugin } from '../../../src/vite'
import { compile } from './util'

const vue3 = () => vue3base({
compiler,
})

describe('Vite SFC', () => {
it('generates custom block code', async () => {
// Arrange
// Act
const code = await compile({
plugins: [
vue3(),
vue3({
compiler,
}),
SFCFluentPlugin(),
],
}, '/fixtures/test.vue')
Expand All @@ -30,7 +28,9 @@ describe('Vite SFC', () => {
// Act
const code = await compile({
plugins: [
vue3(),
vue3({
compiler,
}),
SFCFluentPlugin({
blockType: 'i18n',
}),
Expand Down
2 changes: 1 addition & 1 deletion __tests__/frameworks/webpack/sfc.spec.ts
View file
Open in desktop
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest'

import type { Stats } from 'webpack'
import type { Stats } from 'webpack/types'

import { compile } from './util'

Expand Down
42 changes: 21 additions & 21 deletions package.json
View file
Open in desktop
Expand Up @@ -27,24 +27,24 @@
"exports": {
".": {
"types": "./dist/index.d.ts",
"require": "./dist/index.js",
"import": "./dist/index.mjs"
"import": "./dist/index.mjs",
"require": "./dist/index.js"
},
"./*": "./*",
"./rollup": {
"types": "./dist/rollup.d.ts",
"require": "./dist/rollup.js",
"import": "./dist/rollup.mjs"
"import": "./dist/rollup.mjs",
"require": "./dist/rollup.js"
},
"./vite": {
"types": "./dist/vite.d.ts",
"require": "./dist/vite.js",
"import": "./dist/vite.mjs"
"import": "./dist/vite.mjs",
"require": "./dist/vite.js"
},
"./webpack": {
"types": "./dist/webpack.d.ts",
"require": "./dist/webpack.js",
"import": "./dist/webpack.mjs"
"import": "./dist/webpack.mjs",
"require": "./dist/webpack.js"
}
},
"main": "dist/index.js",
Expand All @@ -68,26 +68,26 @@
"unplugin": "^1.0.0"
},
"devDependencies": {
"@antfu/eslint-config-ts": "0.37.0",
"@antfu/eslint-config-ts": "0.40.0",
"@release-it-plugins/lerna-changelog": "6.0.0",
"@types/node": "18.15.5",
"@vitejs/plugin-vue": "4.1.0",
"@types/node": "18.17.2",
"@vitejs/plugin-vue": "4.2.3",
"@vitest/coverage-istanbul": "^0.34.1",
"@vue/compiler-sfc": "3.2.47",
"dotenv-cli": "7.1.0",
"eslint": "8.36.0",
"execa": "7.1.1",
"@vue/compiler-sfc": "3.3.4",
"dotenv-cli": "7.2.1",
"eslint": "8.46.0",
"execa": "7.2.0",
"husky": "8.0.3",
"lint-staged": "13.2.0",
"lint-staged": "13.2.3",
"memfs": "4.2.0",
"release-it": "16.1.3",
"tsup": "7.2.0",
"typescript": "5.0.2",
"vite": "4.2.1",
"typescript": "5.1.6",
"vite": "4.4.8",
"vitest": "0.34.1",
"vue": "3.2.47",
"vue-loader": "17.0.1",
"webpack": "5.76.2"
"vue": "3.3.4",
"vue-loader": "17.2.2",
"webpack": "5.88.2"
},
"lint-staged": {
"*.js": "eslint --fix",
Expand Down