Try to see if this new tests work

withastro · Feb 5, 2022 · 321a468 · 321a468
1 parent af8e6c8
commit 321a468
Show file tree

Hide file tree

Showing 29 changed files with 290 additions and 100 deletions.
diff --git a/packages/astro/test/astro-markdown-shiki.test.js b/packages/astro/test/astro-markdown-shiki.test.js
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/langs/astro.config.mjs b/packages/astro/test/fixtures/astro-markdown-shiki/langs/astro.config.mjs
@@ -0,0 +1,27 @@
+const riGrammar = JSON.parse(
+	String.raw`{"name":"rinfo","patterns":[{"include":"#lf-rinfo"}],"repository":{"lf-rinfo":{"patterns":[{"include":"#control"},{"include":"#operator"},{"include":"#strings"},{"include":"#number"},{"include":"#comment"},{"include":"#literal"}]},"control":{"patterns":[{"name":"keyword.control.ri","match":"\\b(si|mientras|repetir)\\b"},{"name":"keyword.other.ri","match":"\\b(programa|robots|areas|variables|comenzar|fin)\\b"},{"name":"support.function.other.ri","match":"\\b(tomarFlor|HayFlorEnLaBolsa|HayFlorEnLaEsquina|depositarFlor|HayPapelEnLaBolsa|HayPapelEnLaEsquina|tomarPapel|depositarPapel)\\b"}]},"operator":{"comment":"Captures operators and also puts them in different sub-groups that further describe them","patterns":[{"match":"\\+|-|\\*|/","name":"keyword.operator.arithmetic.ri"},{"match":"<|>|<=|>=|=|<>|!=","name":"keyword.operator.comparison.ri"},{"match":"\\b(Pos|Informar|Leer|Iniciar|AsignarArea|AreaC)\\b","name":"support.function.arithmetic.ri"},{"match":":=","name":"keyword.operator.assign.ri"},{"match":"(&|~)","name":"support.function.logical.ri"}]},"strings":{"name":"string.quoted.double.ri","beginCaptures":{"0":{"name":"string.quoted.double.begin.ri"}},"endCaptures":{"0":{"name":"string.quoted.double.end.ri"}},"begin":"\"","end":"\"","patterns":[{"name":"constant.character.escape.ri","match":"\\\\."}]},"comment":{"patterns":[{"name":"comment.block.ri","begin":"{","end":"}","patterns":[{"include":"#comment"}]}]},"literal":{"patterns":[{"name":"constant.language.ri","match":"\\b(verdadero|falso|boolean|numero)\\b"}]},"number":{"patterns":[{"comment":"Captures decimal numbers, with the negative sign being considered an operator","match":"(-)?(?:((?:\\b\\d+(?:\\.\\d*)?|\\.\\d+)(?:\\b|e-?\\d+\\b)%?)|(\\$[0-9]+\\b))","captures":{"1":{"name":"keyword.operator.arithmetic.ri"},"2":{"name":"constant.numeric.decimal.ri"},"3":{"name":"constant.numeric.hex.ri"}}}]}},"scopeName":"source.rinfo"}`
+);
+
+export default {
+	markdownOptions: {
+		render: [
+			"@astrojs/markdown-remark",
+			{
+				syntaxHighlight: 'shiki',
+				shikiConfig: {
+					langs: [
+						{
+							id: 'rinfo',
+							scopeName: 'source.rinfo',
+							grammar: riGrammar,
+							aliases: ['ri'],
+						},
+					],
+				},
+			},
+		],
+	},
+	buildOptions: {
+		sitemap: false,
+	},
+}
diff --git a/...own-shiki-langs/src/layouts/content.astro → ...own-shiki/langs/src/layouts/content.astro b/...own-shiki-langs/src/layouts/content.astro → ...own-shiki/langs/src/layouts/content.astro
diff --git a/...arkdown-shiki-langs/src/pages/astro.astro → ...arkdown-shiki/langs/src/pages/astro.astro b/...arkdown-shiki-langs/src/pages/astro.astro → ...arkdown-shiki/langs/src/pages/astro.astro
diff --git a/...o-markdown-shiki-langs/src/pages/index.md → ...o-markdown-shiki/langs/src/pages/index.md b/...o-markdown-shiki-langs/src/pages/index.md → ...o-markdown-shiki/langs/src/pages/index.md
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/normal/astro.config.mjs b/packages/astro/test/fixtures/astro-markdown-shiki/normal/astro.config.mjs
@@ -0,0 +1,8 @@
+export default {
+	markdownOptions: {
+		render: ['@astrojs/markdown-remark', { syntaxHighlight: 'shiki' }],
+	},
+	buildOptions: {
+		sitemap: false,
+	},
+}
diff --git a/...wn-shiki-themes/src/layouts/content.astro → ...wn-shiki/normal/src/layouts/content.astro b/...wn-shiki-themes/src/layouts/content.astro → ...wn-shiki/normal/src/layouts/content.astro
diff --git a/...stro-markdown-shiki/src/pages/astro.astro → ...rkdown-shiki/normal/src/pages/astro.astro b/...stro-markdown-shiki/src/pages/astro.astro → ...rkdown-shiki/normal/src/pages/astro.astro
diff --git a/...-markdown-shiki-themes/src/pages/index.md → ...-markdown-shiki/normal/src/pages/index.md b/...-markdown-shiki-themes/src/pages/index.md → ...-markdown-shiki/normal/src/pages/index.md
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/themes-custom/astro.config.mjs b/packages/astro/test/fixtures/astro-markdown-shiki/themes-custom/astro.config.mjs
diff --git a/...-markdown-shiki/src/layouts/content.astro → ...i/themes-custom/src/layouts/content.astro b/...-markdown-shiki/src/layouts/content.astro → ...i/themes-custom/src/layouts/content.astro
diff --git a/...rkdown-shiki-themes/src/pages/astro.astro → ...shiki/themes-custom/src/pages/astro.astro b/...rkdown-shiki-themes/src/pages/astro.astro → ...shiki/themes-custom/src/pages/astro.astro
diff --git a/...s/astro-markdown-shiki/src/pages/index.md → ...wn-shiki/themes-custom/src/pages/index.md b/...s/astro-markdown-shiki/src/pages/index.md → ...wn-shiki/themes-custom/src/pages/index.md
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/themes-integrated/astro.config.mjs b/packages/astro/test/fixtures/astro-markdown-shiki/themes-integrated/astro.config.mjs
@@ -0,0 +1,8 @@
+export default {
+	markdownOptions: {
+		render: ["@astrojs/markdown-remark", { syntaxHighlight: 'shiki', shikiConfig: { theme: 'github-light' } }],
+	},
+	buildOptions: {
+		sitemap: false,
+	},
+}
diff --git a/...ages/astro/test/fixtures/astro-markdown-shiki/themes-integrated/src/layouts/content.astro b/...ages/astro/test/fixtures/astro-markdown-shiki/themes-integrated/src/layouts/content.astro
@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <!-- Head Stuff -->
+  </head>
+  <body>
+    <div class="container">
+      <slot></slot>
+    </div>
+  </body>
+</html>
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/themes-integrated/src/pages/astro.astro b/packages/astro/test/fixtures/astro-markdown-shiki/themes-integrated/src/pages/astro.astro
@@ -0,0 +1,14 @@
+---
+import { Markdown } from 'astro/components';
+import Layout from '../layouts/content.astro';
+---
+
+<Layout>
+	<Markdown>
+		# Hello world
+
+		```js
+			console.log('JavaScript')
+		```
+	</Markdown>
+</Layout>
diff --git a/...s/astro/test/fixtures/astro-markdown-shiki/themes-integrated/src/pages/index.md b/...s/astro/test/fixtures/astro-markdown-shiki/themes-integrated/src/pages/index.md
@@ -0,0 +1,24 @@
+---
+layout: ../layouts/content.astro
+---
+
+# Hello world
+
+```yaml
+apiVersion: v3
+kind: Pod
+metadata:
+  name: rss-site
+  labels:
+    app: web
+spec:
+  containers:
+    - name: front-end
+      image: nginx
+      ports:
+        - containerPort: 80
+    - name: rss-reader
+      image: nickchase/rss-php-nginx:v1
+      ports:
+        - containerPort: 88
+```
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-false/astro.config.mjs b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-false/astro.config.mjs
@@ -0,0 +1,8 @@
+export default {
+	markdownOptions: {
+		render: ['@astrojs/markdown-remark', { syntaxHighlight: 'shiki', shikiConfig: { wrap: false } }],
+	},
+	buildOptions: {
+		sitemap: false,
+	},
+}
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-false/src/layouts/content.astro b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-false/src/layouts/content.astro
@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <!-- Head Stuff -->
+  </head>
+  <body>
+    <div class="container">
+      <slot></slot>
+    </div>
+  </body>
+</html>
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-false/src/pages/astro.astro b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-false/src/pages/astro.astro
@@ -0,0 +1,18 @@
+---
+import { Markdown } from 'astro/components';
+import Layout from '../layouts/content.astro';
+---
+
+<Layout>
+	<Markdown>
+		# Hello world
+
+		```
+			plaintext
+		```
+
+		```js
+			console.log('JavaScript')
+		```
+	</Markdown>
+</Layout>
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-false/src/pages/index.md b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-false/src/pages/index.md
@@ -0,0 +1,24 @@
+---
+layout: ../layouts/content.astro
+---
+
+# Hello world
+
+```yaml
+apiVersion: v3
+kind: Pod
+metadata:
+  name: rss-site
+  labels:
+    app: web
+spec:
+  containers:
+    - name: front-end
+      image: nginx
+      ports:
+        - containerPort: 80
+    - name: rss-reader
+      image: nickchase/rss-php-nginx:v1
+      ports:
+        - containerPort: 88
+```
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-null/astro.config.mjs b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-null/astro.config.mjs
@@ -0,0 +1,8 @@
+export default {
+	markdownOptions: {
+		render: ['@astrojs/markdown-remark', { syntaxHighlight: 'shiki', shikiConfig: { wrap: null } }],
+	},
+	buildOptions: {
+		sitemap: false,
+	},
+}
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-null/src/layouts/content.astro b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-null/src/layouts/content.astro
@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <!-- Head Stuff -->
+  </head>
+  <body>
+    <div class="container">
+      <slot></slot>
+    </div>
+  </body>
+</html>
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-null/src/pages/astro.astro b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-null/src/pages/astro.astro
@@ -0,0 +1,18 @@
+---
+import { Markdown } from 'astro/components';
+import Layout from '../layouts/content.astro';
+---
+
+<Layout>
+	<Markdown>
+		# Hello world
+
+		```
+			plaintext
+		```
+
+		```js
+			console.log('JavaScript')
+		```
+	</Markdown>
+</Layout>
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-null/src/pages/index.md b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-null/src/pages/index.md
@@ -0,0 +1,24 @@
+---
+layout: ../layouts/content.astro
+---
+
+# Hello world
+
+```yaml
+apiVersion: v3
+kind: Pod
+metadata:
+  name: rss-site
+  labels:
+    app: web
+spec:
+  containers:
+    - name: front-end
+      image: nginx
+      ports:
+        - containerPort: 80
+    - name: rss-reader
+      image: nickchase/rss-php-nginx:v1
+      ports:
+        - containerPort: 88
+```
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-true/astro.config.mjs b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-true/astro.config.mjs
@@ -0,0 +1,8 @@
+export default {
+	markdownOptions: {
+		render: ['@astrojs/markdown-remark', { syntaxHighlight: 'shiki', shikiConfig: { wrap: true } }],
+	},
+	buildOptions: {
+		sitemap: false,
+	},
+}
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-true/src/layouts/content.astro b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-true/src/layouts/content.astro
@@ -0,0 +1,10 @@
+<html>
+  <head>
+    <!-- Head Stuff -->
+  </head>
+  <body>
+    <div class="container">
+      <slot></slot>
+    </div>
+  </body>
+</html>
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-true/src/pages/astro.astro b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-true/src/pages/astro.astro
@@ -0,0 +1,18 @@
+---
+import { Markdown } from 'astro/components';
+import Layout from '../layouts/content.astro';
+---
+
+<Layout>
+	<Markdown>
+		# Hello world
+
+		```
+			plaintext
+		```
+
+		```js
+			console.log('JavaScript')
+		```
+	</Markdown>
+</Layout>
diff --git a/packages/astro/test/fixtures/astro-markdown-shiki/wrap-true/src/pages/index.md b/packages/astro/test/fixtures/astro-markdown-shiki/wrap-true/src/pages/index.md
@@ -0,0 +1,24 @@
+---
+layout: ../layouts/content.astro
+---
+
+# Hello world
+
+```yaml
+apiVersion: v3
+kind: Pod
+metadata:
+  name: rss-site
+  labels:
+    app: web
+spec:
+  containers:
+    - name: front-end
+      image: nginx
+      ports:
+        - containerPort: 80
+    - name: rss-reader
+      image: nickchase/rss-php-nginx:v1
+      ports:
+        - containerPort: 88
+```