Skip to content
This repository has been archived by the owner on Feb 20, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into const-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Earlopain committed Jan 25, 2024
2 parents b0b573d + 6986365 commit c543eac
Show file tree
Hide file tree
Showing 20 changed files with 10,564 additions and 10,379 deletions.
45 changes: 24 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,38 @@ jobs:
test-webpack4:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set node version to 16
uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
- uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
- run: yarn install
- run: yarn test:webpack4
node-version: '16'
cache: 'pnpm'
- run: pnpm install
- run: pnpm pretest:webpack4
- run: pnpm test:webpack4

test-webpack5:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set node version to 16
uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
- uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
- run: yarn install
- run: yarn test
node-version: '16'
cache: 'pnpm'
- run: pnpm install
- run: pnpm pretest
- run: pnpm test

test-webpack5-inline-match-resource:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set node version to 16
uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
- uses: actions/setup-node@v3
with:
node-version: 16
cache: 'yarn'
- run: yarn install
- run: yarn test:match-resource
node-version: '16'
cache: 'pnpm'
- run: pnpm install
- run: pnpm pretest:match-resource
- run: pnpm test:match-resource
49 changes: 49 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,52 @@
## [17.4.2](https://github.com/vuejs/vue-loader/compare/v17.4.1...v17.4.2) (2023-12-30)


### Bug Fixes

* pass compilerOptions to sfc parse & re-enable AST reuse ([d2a2e05](https://github.com/vuejs/vue-loader/commit/d2a2e051c3d985d1ae6bb468749b24543631b482))



## [17.4.1](https://github.com/vuejs/vue-loader/compare/v17.4.0...v17.4.1) (2023-12-30)


### Bug Fixes

* (temporarily) disable template ast reuse ([31b03af](https://github.com/vuejs/vue-loader/commit/31b03af121edbe70337f538b1def95acbef4d0f1))



# [17.4.0](https://github.com/vuejs/vue-loader/compare/v17.3.1...v17.4.0) (2023-12-25)


### Features

* leverage ast reuse in 3.4 ([479835f](https://github.com/vuejs/vue-loader/commit/479835fe751691a39c62cda12bffeef9e6830443))



## [17.3.1](https://github.com/vuejs/vue-loader/compare/v17.3.0...v17.3.1) (2023-10-31)


### Bug Fixes

* do not skip style post loader for v-bind() in CSS ([d7071bb](https://github.com/vuejs/vue-loader/commit/d7071bbdeb45518c053bdae8eb7de52fc598adc6)), closes [#2061](https://github.com/vuejs/vue-loader/issues/2061)


# [17.3.0](https://github.com/vuejs/vue-loader/compare/v17.2.2...v17.3.0) (2023-10-07)


### Bug Fixes

* re-use ident of vue rule for template compiler, fixes [#2029](https://github.com/vuejs/vue-loader/issues/2029) ([#2030](https://github.com/vuejs/vue-loader/issues/2030)) ([b50fa56](https://github.com/vuejs/vue-loader/commit/b50fa5665f2cbc1c0b8e18f65dd3adf1dfe848dc))


### Features

* skip normal css files without scoped flag in stylePostLoader ([#2053](https://github.com/vuejs/vue-loader/issues/2053)) ([98782e7](https://github.com/vuejs/vue-loader/commit/98782e794fadca83b600b047b55aa6f0c230cc25))



## [17.2.2](https://github.com/vuejs/vue-loader/compare/v17.2.1...v17.2.2) (2023-06-02)


Expand Down
1 change: 1 addition & 0 deletions example/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<Button foo="hello!"><span>slot</span></Button>
<ScriptSetup/>
<TypeScript/>
<custom-web-component>aaa</custom-web-component>
</div>
</template>

Expand Down
4 changes: 4 additions & 0 deletions example/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ module.exports = (env = {}) => {
loader: 'vue-loader',
options: {
// reactivityTransform: true,
compilerOptions: {
isCustomElement: (tag) => tag.startsWith('custom-'),
},
},
},
{
Expand Down Expand Up @@ -107,6 +110,7 @@ module.exports = (env = {}) => {
__IS_SSR__: !!isSSR,
__VUE_OPTIONS_API__: true,
__VUE_PROD_DEVTOOLS__: false,
__VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false,
}),
],
optimization: {
Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-loader",
"version": "17.2.2",
"version": "17.4.2",
"license": "MIT",
"author": "Evan You",
"repository": "vuejs/vue-loader",
Expand Down Expand Up @@ -35,9 +35,9 @@
"prettier --parser=typescript --write"
]
},
"packageManager": "[email protected]",
"dependencies": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"watchpack": "^2.4.0"
},
"peerDependencies": {
Expand All @@ -55,8 +55,8 @@
"@babel/core": "^7.7.7",
"@babel/preset-env": "^7.11.5",
"@intlify/vue-i18n-loader": "^3.0.0",
"@types/cssesc": "^3.0.2",
"@types/estree": "^0.0.45",
"@types/hash-sum": "^1.0.0",
"@types/jest": "^26.0.13",
"@types/jsdom": "^16.2.13",
"@types/mini-css-extract-plugin": "^0.9.1",
Expand All @@ -65,6 +65,7 @@
"cache-loader": "^4.1.0",
"conventional-changelog-cli": "^2.1.1",
"css-loader": "^4.3.0",
"cssesc": "^3.0.0",
"file-loader": "^6.1.0",
"html-webpack-plugin": "^4.5.0",
"html-webpack-plugin-v5": "npm:html-webpack-plugin@^5.3.2",
Expand All @@ -90,7 +91,7 @@
"ts-loader-v9": "npm:ts-loader@^9.2.4",
"typescript": "^4.4.3",
"url-loader": "^4.1.0",
"vue": "^3.3.0",
"vue": "^3.4.3",
"vue-i18n": "^9.1.7",
"webpack": "^5.79.0",
"webpack-cli": "^3.3.12",
Expand Down
Loading

0 comments on commit c543eac

Please sign in to comment.