Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [18]
node: [20]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Enable corepack
run: corepack enable
- name: Install pnpm
uses: pnpm/action-setup@v4

- name: Setup Node.js ${{ matrix.node }}
uses: actions/setup-node@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [18]
node: [20]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Enable corepack
run: corepack enable
- name: Install pnpm
uses: pnpm/action-setup@v4

- name: Setup Node.js ${{ matrix.node }}
uses: actions/setup-node@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [18, 20, 22]
node: [20, 22, 24]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Enable corepack
run: corepack enable
- name: Install pnpm
uses: pnpm/action-setup@v4

- name: Setup Node.js ${{ matrix.node }}
uses: actions/setup-node@v4
Expand Down Expand Up @@ -60,4 +60,4 @@ jobs:
run: pnpm build

- name: Testing
run: pnpm test
run: pnpm test:unit
2 changes: 1 addition & 1 deletion examples/vite/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import path from 'path'
import path from 'node:path'
import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
import vueI18n from '../../packages/unplugin-vue-i18n/src/vite'
Expand Down
14 changes: 11 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"tiny-glob": "^0.2.9",
"typescript": "^5.6.3",
"typescript-eslint": "^8.13.0",
"vite": "^5.4.10",
"vite": "https://pkg.pr.new/vitejs/rolldown-vite@12e3568",
"vitest": "^2.1.4",
"vue": "^3.2.25",
"vue-i18n": "^11.1.2",
Expand All @@ -79,11 +79,19 @@
"vue-loader17": "npm:[email protected]",
"vue-template-compiler": "^2.6.14",
"vue2": "npm:vue@^2.6.14",
"webpack": "^5.88.2",
"webpack": "^5.99.8",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
},
"pnpm": {
"overrides": {
"rolldown": "https://pkg.pr.new/rolldown@4554"
},
"onlyBuiltDependencies": [
"esbuild"
]
},
"license": "MIT",
"lint-staged": {
"*.js": [
Expand Down Expand Up @@ -150,5 +158,5 @@
"release:webpack": "pnpm --filter @intlify/vue-i18n-loader release",
"release:unplugin": "pnpm --filter @intlify/unplugin-vue-i18n release"
},
"packageManager": "pnpm@9.15.1"
"packageManager": "pnpm@10.10.0"
}
2 changes: 1 addition & 1 deletion packages/bundle-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"@intlify/message-compiler": "^11.1.2",
"@intlify/shared": "^11.1.2",
"acorn": "^8.8.2",
"esbuild": "^0.25.4",
"escodegen": "^2.1.0",
"estree-walker": "^2.0.2",
"jsonc-eslint-parser": "^2.3.0",
"mlly": "^1.2.0",
"source-map-js": "^1.0.1",
"yaml-eslint-parser": "^1.2.2"
},
Expand Down
28 changes: 13 additions & 15 deletions packages/bundle-utils/src/codegen.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import { SourceMapGenerator, SourceMapConsumer } from 'source-map-js'
import {
format,
escapeHtml as sanitizeHtml,
isBoolean,
friendlyJSONstringify
} from '@intlify/shared'
import {
baseCompile,
detectHtmlTag,
LOCATION_STUB
} from '@intlify/message-compiler'
import {
format,
friendlyJSONstringify,
isBoolean,
escapeHtml as sanitizeHtml
} from '@intlify/shared'
import { SourceMapConsumer, SourceMapGenerator } from 'source-map-js'

import type { RawSourceMap, MappedPosition, MappingItem } from 'source-map-js'
import type {
CompileError,
ResourceNode,
CompileOptions
CompileOptions,
ResourceNode
} from '@intlify/message-compiler'
import type { MappedPosition, MappingItem, RawSourceMap } from 'source-map-js'

/**
* Compilation dev environments
Expand All @@ -25,13 +25,13 @@ import type {
*/
export type DevEnv = 'development' | 'production'

export interface Position {
interface Position {
line: number
column: number
offset?: number
}

export interface SourceLocationable {
interface SourceLocationable {
start?: number
loc?: {
start: Position
Expand All @@ -44,8 +44,6 @@ export interface SourceLocationable {
*/
export interface CodeGenOptions {
type?: 'plain' | 'sfc' | 'bare'
legacy?: boolean
bridge?: boolean
exportESM?: boolean
onlyLocales?: string[]
source?: string
Expand Down Expand Up @@ -75,7 +73,7 @@ export interface CodeGenOptions {
) => void
}

export interface CodeGenContext {
interface CodeGenContext {
source?: string
code: string
indentLevel: number
Expand Down
Loading