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.

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

fix: Vue using Vite #3157

Merged
merged 1 commit into from
Feb 22, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/prerelease-tolgee-5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
fetch-depth: 0

- name: Build
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
fetch-depth: 0

- name: Build
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-examples-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
path: root

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- name: Read last commit
id: get-commit-message
run: echo "::set-output name=COMMIT::$(git show -s --format=%s)"
run: echo "COMMIT=$(git show -s --format=%s)" >> $GITHUB_OUTPUT
working-directory: root

- run: mkdir -p testapps/${{ matrix.project }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ jobs:
path: root

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- name: Read last commit
id: get-commit-message
run: echo "::set-output name=COMMIT::$(git show -s --format=%s)"
run: echo "COMMIT=$(git show -s --format=%s)" >> $GITHUB_OUTPUT
working-directory: root

- run: mkdir -p testapps/${{ matrix.project }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Release

on:
workflow_run:
workflows: [ "Test" ]
branches: [ "main"]
workflows: ['Test']
branches: ['main']
types:
- completed

Expand All @@ -19,9 +19,9 @@ jobs:
fetch-depth: 0

- name: Build
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/report-intermittent-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down Expand Up @@ -54,9 +54,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
run: pnpm build:e2e

- id: set-dirs
run: echo "::set-output name=dirs::$(ls | jq -R -s -c 'split("\n")[:-1]')"
run: echo "dirs=$(ls | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
working-directory: e2e/cypress/e2e

outputs:
Expand All @@ -113,9 +113,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Test
on:
pull_request:
push:
branches: [ main ]
branches: [main]

jobs:
test:
Expand All @@ -12,9 +12,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down Expand Up @@ -55,9 +55,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
run: pnpm build:e2e

- id: set-dirs
run: echo "::set-output name=dirs::$(ls | jq -R -s -c 'split("\n")[:-1]')"
run: echo "dirs=$(ls | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
working-directory: e2e/cypress/e2e

outputs:
Expand All @@ -114,9 +114,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down Expand Up @@ -164,9 +164,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.15.1'
node-version: '18'

- uses: pnpm/[email protected]
name: Install pnpm
Expand Down
8 changes: 4 additions & 4 deletions packages/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"@tolgee/web": "5.3.1"
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^14.1.0",
"@rollup/plugin-typescript": "8.3.4",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-typescript": "11.0.0",
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/vue": "^6.6.1",
"@tolgee/format-icu": "5.3.0",
Expand All @@ -54,13 +54,13 @@
"concurrently": "7.2.2",
"jest": "^27.3.1",
"jest-fetch-mock": "^3.0.3",
"rollup": "2.78.1",
"rollup": "3.15.0",
"rollup-plugin-bundle-size": "^1.0.3",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-terser": "7.0.2",
"rollup-plugin-vue": "^6.0.0",
"ts-jest": "^27.0.7",
"typescript": "^4.7.4",
"typescript": "^4.9.5",
"vue": "^3.0.0"
},
"exports": {
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/VueTolgee.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const VueTolgee = {
},
};

declare module '@vue/runtime-core' {
declare module 'vue' {
export interface ComponentCustomProperties {
$t: TFnType<DefaultParamType, string>;
$tolgee: TolgeeInstance;
Expand Down
Loading