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

Commit

Permalink
better module resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob-8 committed May 20, 2023
1 parent fcfaa09 commit 01dc630
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 18 deletions.
2 changes: 1 addition & 1 deletion examples/svelte-vite-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"marked": "^5.0.2",
"svelte": "^3.59.1",
"svelte-check": "^3.3.2",
"svelte-scoped-uno": "^0.1.3",
"svelte-scoped-uno": "^0.1.4",
"tslib": "^2.5.2",
"typescript": "^5.0.4",
"vite": "^4.3.8"
Expand Down
6 changes: 5 additions & 1 deletion examples/svelte-vite-plugin/src/lib/Prose.svelte
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<script lang="ts">
import { marked } from "marked";
marked.use({
mangle: false,
headerIds: false
});
</script>

<div
class="text-base prose prose-purple md:prose-orange dark:prose-invert max-w-full text-left mt-10 p-3 md:p-5 shadow-xl border rounded"
>
{@html marked(`# Svelte Scoped Uno with Vite + Svelte
{@html marked.parse(`# Svelte Scoped Uno with Vite + Svelte
This project has the following **example usages**:
- dark mode
Expand Down
2 changes: 1 addition & 1 deletion examples/sveltekit-preprocess/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"publint": "^0.1.11",
"svelte": "^3.59.1",
"svelte-check": "^3.3.2",
"svelte-preprocess-unocss": "^0.1.3",
"svelte-preprocess-unocss": "^0.1.4",
"tslib": "^2.5.2",
"typescript": "^5.0.4",
"vite": "^4.3.8",
Expand Down
2 changes: 1 addition & 1 deletion examples/sveltekit-vite-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"marked": "^5.0.2",
"svelte": "^3.59.1",
"svelte-check": "^3.3.2",
"svelte-scoped-uno": "^0.1.3",
"svelte-scoped-uno": "^0.1.4",
"tslib": "^2.5.2",
"typescript": "^5.0.4",
"vite": "^4.3.8"
Expand Down
2 changes: 1 addition & 1 deletion examples/sveltekit-vite-plugin/src/routes/Prose.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</script>

<div
class="text-base prose prose-purple md:prose-orange dark:prose-invert max-w-full text-left mt-10 p-3 md:p-5 shadow-lg border rounded"
class="text-base prose prose-purple md:prose-orange dark:prose-invert max-w-full text-left mt-10 p-3 md:p-5 shadow-lg border rounded"
>
{@html marked.parse(`# Svelte Scoped Uno with SvelteKit
This project has the following **example usages**:
Expand Down
8 changes: 8 additions & 0 deletions packages/svelte-preprocess-unocss/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# svelte-preprocess-unocss

## 0.1.4

### Patch Changes

- better module resolution
- Updated dependencies
- svelte-scoped-uno@0.1.4

## 0.1.3

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/svelte-preprocess-unocss/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "svelte-preprocess-unocss",
"version": "0.1.3",
"version": "0.1.4",
"description": "Run UnoCSS in svelte-scoped mode via a svelte-preprocessor for use in component libraries",
"type": "module",
"scripts": {
Expand All @@ -21,7 +21,7 @@
"dist"
],
"dependencies": {
"svelte-scoped-uno": "^0.1.3"
"svelte-scoped-uno": "^0.1.4"
},
"devDependencies": {
"@vitest/ui": "^0.31.1",
Expand Down
6 changes: 6 additions & 0 deletions packages/svelte-scoped-uno/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# svelte-scoped-uno

## 0.1.4

### Patch Changes

- better module resolution

## 0.1.3

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte-scoped-uno/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "svelte-scoped-uno",
"version": "0.1.3",
"version": "0.1.4",
"description": "Use UnoCSS utility styles in a modular fashion in Svelte, with styles being stored only where needed.",
"type": "module",
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions packages/svelte-scoped-uno/src/vite/fallbackreset.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const tempTailwindFallbackReset = '*,::after,::before{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}textarea{resize:vertical}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}'
20 changes: 10 additions & 10 deletions packages/svelte-scoped-uno/src/vite/getReset.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
import { existsSync, readFileSync, statSync } from 'node:fs'
import { dirname, resolve } from 'node:path'
import { fileURLToPath } from 'node:url'
import { tempTailwindFallbackReset } from './fallbackreset';

const _dirname = typeof __dirname !== 'undefined'
? __dirname
: dirname(fileURLToPath(import.meta.url))

const tempTailwindResetUntilFixed = '*,::after,::before{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;font-weight:inherit;line-height:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}textarea{resize:vertical}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}'

export function getReset(injectReset: string): string {
if (injectReset === '@unocss/reset/tailwind.css') return tempTailwindResetUntilFixed;

if (injectReset.startsWith("@unocss/reset")) {
const resolvedPNPM = resolve(resolve(_dirname, `../node_modules/${injectReset}`));
if (isFile(resolvedPNPM))
return readFileSync(resolvedPNPM, "utf-8");

const resolvedNPM = resolve(process.cwd(), "node_modules", injectReset);
return readFileSync(resolvedNPM, "utf-8");
if (isFile(resolvedNPM))
return readFileSync(resolvedNPM, "utf-8");

if (injectReset === '@unocss/reset/tailwind.css') {
console.log("Using tailwind reset fallback. Please file a bug report as this means there is an issue with the reset module resolving with this environment or package manager.")
return tempTailwindFallbackReset;
}
throw new Error(`"${injectReset}" given as your injectReset value is not found. Please check to make sure it is one of the five supported @unocss/reset options. If it is file a bug report detailing your environment and package manager`)
}


if (injectReset.startsWith('@unocss/reset'))
return readFileSync(resolve(_dirname, `../node_modules/${injectReset}`), 'utf-8')

if (injectReset.startsWith('.')) {
const resolved = resolve(process.cwd(), injectReset)
if (!isFile(resolved))
Expand Down

0 comments on commit 01dc630

Please sign in to comment.