Skip to content

chore: solve merge conflict #1931

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
Merged
2heal1 merged 37 commits into from
Jan 8, 2024
Merged

chore: solve merge conflict #1931

2heal1 merged 37 commits into from
Jan 8, 2024

Conversation

@2heal1
Copy link
Member

@2heal1 2heal1 commented Jan 8, 2024

Description

Related Issue

Types of changes

  • Docs change / refactoring / dependency upgrade
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

Checklist

  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • I have updated the documentation.

2heal1 and others added 30 commits December 28, 2023 11:48
@2heal1
feat(runtime): support entry with query (#1833)
0dce151
@2heal1
chore: vitest not throw error while using @nx/vite:test directly (#1855)
5749eec
@renovate
chore(deps): update dependency classnames to v2.5.0 (#1853)
8e0f76e 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@2heal1
chore: export sdk simpleJoinRemoteEntry function (#1858)
5a79cb3
@renovate
fix(deps): update dependency unplugin to v1.6.0 (#1860)
e611b1c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
fix(deps): update dependency axios to v1.6.3 (#1852)
a426486 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency vue-tsc to v1.8.27 (#1851)
aa867bc 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency @types/node-fetch to v2.6.10 (#1850)
4c50ecc 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update nrwl monorepo to v17.2.7 (#1830)
bea4fc2 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@zhoushaw
chore: add release.yml file
fa005c6
@zhoushaw
Create release.yml
10b6eea
@zhoushaw
chore: add release note (#1864)
81ede5d 
Co-authored-by: zhouxiao.shaw <zhouxiao.shaw@bytdance.com>
@zhoushaw @github-actions @2heal1
Release v0.0.5 (#1861)
09f1ebd 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: 2heal1 <TwoHeal@163.com>
@renovate
chore(deps): update react monorepo (#1865)
124e6d3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency @rollup/plugin-replace to v5 (#1870)
22261f1 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency inquirer to v9 (#1871)
540a0f7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency @types/react to v18.2.46 (#1874)
007022c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update nrwl monorepo to v17.2.8 (#1876)
013b2c0 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency vite-tsconfig-paths to v4.2.3 (#1875)
21fcb2f 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@2heal1
fix: rename usePlugins to prevent swc react-refresh from throwing err…
b505deb 
…ors when replacing variables (#1880)
@zhoushaw @github-actions
Release v0.0.6 (#1887)
863508f 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency prettier-eslint to v16 (#1879)
f1d8067 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency open to v10 (#1878)
284a6da 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency @rollup/plugin-alias to v5 (#1869)
f1e8af7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency @jscutlery/semver to v4 (#1868)
8c3eb7c 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@zhoushaw
chore: modify renovate schedule (#1894)
ebc0856 
Co-authored-by: zhouxiao.shaw <zhouxiao.shaw@bytdance.com>
@renovate
chore(deps): update dependency @builder.io/qwik-city to v1.3.2 (#1893)
aa652ce 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency @antora/site-generator to v3.1.7 (#1891)
42184d7 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@2heal1
feat: add init container hook (#1889)
7df24df
@zhoushaw
fix(runtime): fixed an exception in global object processing in the m…
f6d18e5 
…icro-front-end scenario (#1859)

Co-authored-by: zhouxiao.shaw <zhouxiao.shaw@bytdance.com>
renovate bot and others added 7 commits January 3, 2024 18:52
@renovate
chore(deps): update dependency @swc/core to v1.3.102 (#1896)
d150340 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@zhoushaw
chore: update renovate.json
78ff269
@zhoushaw @github-actions
Release v0.0.7 (#1897)
052a455 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency esbuild to v0.19.11 (#1905)
577ffc8 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
chore(deps): update dependency postcss-custom-properties to v13.3.4 (#…
d64fbc9 
…1907)
@renovate
fix(deps): update dependency axios to v1.6.5 (#1910)
7b64248 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@2heal1
chore: solve merge conflict
71add5b
@2heal1 2heal1 merged commit b3b35f1 into canary Jan 8, 2024
@2heal1 2heal1 deleted the chore/solve-merge-conflict branch January 8, 2024 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@2heal1 @zhoushaw