Skip to content

Commit

Permalink
chore: fix edge case in license files bundling
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperchupuDev authored Sep 8, 2024
1 parent 7ab0f4a commit 4abfd13
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 24 deletions.
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@vite-pwa/vitepress": "^0.5.0",
"@vitejs/plugin-vue": "^5.1.2",
"https-localhost": "^4.7.1",
"tinyglobby": "^0.2.5",
"tinyglobby": "^0.2.6",
"unocss": "^0.62.0",
"unplugin-vue-components": "^0.27.4",
"vite": "^5.2.8",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"rollup-plugin-dts": "^6.1.1",
"rollup-plugin-esbuild": "^6.1.1",
"rollup-plugin-license": "^3.5.2",
"tinyglobby": "^0.2.5",
"tinyglobby": "^0.2.6",
"tsx": "^4.17.0",
"typescript": "^5.5.4",
"vite": "^5.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"flatted": "^3.3.1",
"pathe": "^1.1.2",
"sirv": "^2.0.4",
"tinyglobby": "^0.2.5",
"tinyglobby": "^0.2.6",
"tinyrainbow": "^1.2.0"
},
"devDependencies": {
Expand Down
31 changes: 31 additions & 0 deletions packages/vitest/LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,14 @@ License: MIT
By: thecodrr
Repository: git+https://github.com/thecodrr/fdir.git

> Copyright 2023 Abdullah Atta
>
> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
>
> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
>
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---------------------------------------

## fill-range
Expand Down Expand Up @@ -1265,6 +1273,29 @@ Repository: git+https://github.com/antfu/strip-literal.git
---------------------------------------

## tinyglobby
License: ISC
By: Superchupu
Repository: git+https://github.com/SuperchupuDev/tinyglobby.git

> ISC License
>
> Copyright (c) 2024 Madeline Gurriarán
>
> Permission to use, copy, modify, and/or distribute this software for any
> purpose with or without fee is hereby granted, provided that the above
> copyright notice and this permission notice appear in all copies.
>
> THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---------------------------------------

## to-regex-range
License: MIT
By: Jon Schlinkert, Rouven Weßling
Expand Down
2 changes: 1 addition & 1 deletion packages/vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
"prompts": "^2.4.2",
"strip-ansi": "^7.1.0",
"strip-literal": "^2.1.0",
"tinyglobby": "^0.2.5",
"tinyglobby": "^0.2.6",
"ws": "^8.18.0"
}
}
5 changes: 4 additions & 1 deletion packages/vitest/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,10 @@ function licensePlugin() {
preserveSymlinks: false,
}),
)
const [licenseFile] = globSync([`${pkgDir}/(LICENSE)|(license)*`], { expandDirectories: false })
const [licenseFile] = globSync([`${pkgDir}/LICENSE*`], {
expandDirectories: false,
caseSensitiveMatch: false,
})
if (licenseFile) {
licenseText = fs.readFileSync(licenseFile, 'utf-8')
}
Expand Down
38 changes: 19 additions & 19 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4abfd13

Please sign in to comment.