Skip to content

Commit

Permalink
workflow: pre-commit runs prettier on *.html (vitejs#1555)
Browse files Browse the repository at this point in the history
  • Loading branch information
@bompus
bompus committed Jan 16, 2021
1 parent 4a7d2eb commit 571545d
Show file tree
Hide file tree
Showing 19 changed files with 150 additions and 135 deletions.
3 changes: 3 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
"*.ts": [
"eslint",
"prettier --parser=typescript --write"
],
"*.html": [
"prettier --write"
]
}
}
18 changes: 9 additions & 9 deletions packages/create-app/template-preact-ts/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
18 changes: 9 additions & 9 deletions packages/create-app/template-preact/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
18 changes: 9 additions & 9 deletions packages/create-app/template-react-ts/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
18 changes: 9 additions & 9 deletions packages/create-app/template-react/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
18 changes: 9 additions & 9 deletions packages/create-app/template-vanilla/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/main.js"></script>
</body>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/main.js"></script>
</body>
</html>
20 changes: 10 additions & 10 deletions packages/create-app/template-vue-ts/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.ts"></script>
</body>
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.ts"></script>
</body>
</html>
20 changes: 10 additions & 10 deletions packages/create-app/template-vue/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.js"></script>
</body>
<head>
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite App</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/src/main.js"></script>
</body>
</html>
25 changes: 17 additions & 8 deletions packages/playground/define/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,24 @@ <h1>Define</h1>
<p>String <code class="string"></code></p>
<p>Number <code class="number"></code></p>
<p>Boolean <code class="boolean"></code></p>
<p>Object <pre class="object"></pre></p>
<p>Object <span class="pre object"></span></p>

<script type="module">
text('.string', __STRING__)
text('.number', __NUMBER__)
text('.boolean', __BOOLEAN__)
text('.object', JSON.stringify(__OBJ__, null, 2))
text('.string', __STRING__)
text('.number', __NUMBER__)
text('.boolean', __BOOLEAN__)
text('.object', JSON.stringify(__OBJ__, null, 2))

function text(el, text) {
document.querySelector(el).textContent = text
}
function text(el, text) {
document.querySelector(el).textContent = text
}
</script>

<style>
.pre {
display: block;
unicode-bidi: embed;
font-family: monospace;
white-space: pre;
}
</style>
69 changes: 31 additions & 38 deletions packages/playground/env/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,37 @@
<h1>Environment Variables</h1>
<p>import.meta.env.BASE_URL: <code class="base"></code></p>
<p>import.meta.env.MODE: <code class="mode"></code></p>
<p>import.meta.env.DEV: <code class="dev"></code></p>
<p>import.meta.env.PROD: <code class="prod"></code></p>
<p>import.meta.env.VITE_CUSTOM_ENV_VARIABLE: <code class="custom"></code></p>
<p>
import.meta.env.BASE_URL: <code class="base"></code>
</p>
<p>
import.meta.env.MODE: <code class="mode"></code>
</p>
<p >
import.meta.env.DEV: <code class="dev"></code>
</p>
<p >
import.meta.env.PROD: <code class="prod"></code>
</p>
<p >
import.meta.env.VITE_CUSTOM_ENV_VARIABLE: <code class="custom"></code>
</p>
<p >
import.meta.env.VITE_EFFECTIVE_MODE_FILE_NAME: <code class="mode-file"></code>
</p>
<p >
import.meta.env.VITE_INLINE: <code class="inline"></code>
</p>
<p>
process.env.NODE_ENV: <code class="node-env"></code>
</p>
<p >
import.meta.env: <pre class="env-object"></pre>
import.meta.env.VITE_EFFECTIVE_MODE_FILE_NAME: <code class="mode-file"></code>
</p>
<p>import.meta.env.VITE_INLINE: <code class="inline"></code></p>
<p>process.env.NODE_ENV: <code class="node-env"></code></p>
<p>import.meta.env: <span class="pre env-object"></span></p>

<script type="module">
text('.base', import.meta.env.BASE_URL)
text('.mode', import.meta.env.MODE)
text('.dev', import.meta.env.DEV)
text('.prod', import.meta.env.PROD)
text('.custom', import.meta.env.VITE_CUSTOM_ENV_VARIABLE)
text('.mode-file', import.meta.env.VITE_EFFECTIVE_MODE_FILE_NAME)
text('.inline', import.meta.env.VITE_INLINE)
text('.node-env', process.env.NODE_ENV)
text('.env-object', JSON.stringify(import.meta.env, null, 2))
text('.base', import.meta.env.BASE_URL)
text('.mode', import.meta.env.MODE)
text('.dev', import.meta.env.DEV)
text('.prod', import.meta.env.PROD)
text('.custom', import.meta.env.VITE_CUSTOM_ENV_VARIABLE)
text('.mode-file', import.meta.env.VITE_EFFECTIVE_MODE_FILE_NAME)
text('.inline', import.meta.env.VITE_INLINE)
text('.node-env', process.env.NODE_ENV)
text('.env-object', JSON.stringify(import.meta.env, null, 2))

function text(el, text) {
document.querySelector(el).textContent = text
}
</script>

function text(el, text) {
document.querySelector(el).textContent = text
}
</script>
<style>
.pre {
display: block;
unicode-bidi: embed;
font-family: monospace;
white-space: pre;
}
</style>
2 changes: 1 addition & 1 deletion packages/playground/hmr/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
<div class="app"></div>
<div class="dep"></div>
<div class="nested"></div>
<div class="custom"></div>
<div class="custom"></div>
4 changes: 2 additions & 2 deletions packages/playground/html/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<link rel="stylesheet" href="./main.css">
<link rel="stylesheet" href="./main.css" />

<!-- comment one -->
<h1>Hello</h1>
<!-- comment two -->

<script type="module" src="./main.js"></script>
<script type="module" src="./main.js"></script>
4 changes: 2 additions & 2 deletions packages/playground/html/nested/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<link rel="stylesheet" href="./nested.css">
<link rel="stylesheet" href="./nested.css" />
<h1>Nested</h1>
<script type="module" src="./nested.js"></script>
<script type="module" src="./nested.js"></script>
2 changes: 1 addition & 1 deletion packages/playground/legacy/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<h1 id="app"></h1>
<script type="module" src="./main.js"></script>
<script type="module" src="./main.js"></script>
6 changes: 3 additions & 3 deletions packages/playground/lib/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="demo"></div>

<script type="module">
import myLib from './src/main.js'
import myLib from './src/main.js'

myLib('.demo')
</script>
myLib('.demo')
</script>
8 changes: 4 additions & 4 deletions packages/playground/lib/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<div class="umd"></div>

<script type="module">
import myLib from './my-lib.es.js'
import myLib from './my-lib.es.js'

myLib('.es')
myLib('.es')
</script>

<script src="./my-lib.umd.js"></script>
<script>
MyLib('.umd')
</script>
MyLib('.umd')
</script>
15 changes: 11 additions & 4 deletions packages/playground/resolve/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h1>Resolve</h1>

<h2>Deep import</h2>
<p>Should show [2,4]:<pre class="deep-import">fail</pre></p>
<p>Should show [2,4]:<span class="pre deep-import">fail</span></p>

<h2>Entry resolving with exports field</h2>
<p class="exports-entry">fail</p>
Expand Down Expand Up @@ -54,9 +54,7 @@ <h2>Inline package</h2>
yield 8
})()

text('.deep-import', JSON.stringify(
slicedToArray(iterable, 2)
))
text('.deep-import', JSON.stringify(slicedToArray(iterable, 2)))

// exports field
import { msg } from 'resolve-exports-path'
Expand Down Expand Up @@ -108,3 +106,12 @@ <h2>Inline package</h2>
import { msg as inlineMsg } from './inline-package'
text('.inline-pkg', inlineMsg)
</script>

<style>
.pre {
display: block;
unicode-bidi: embed;
font-family: monospace;
white-space: pre;
}
</style>
2 changes: 1 addition & 1 deletion packages/playground/vue-jsx/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<div id="app"></div>
<script type="module" src="./main.jsx"></script>
<script type="module" src="./main.jsx"></script>
Loading

0 comments on commit 571545d

Please sign in to comment.