Skip to content

Commit 5e5c60e

Browse files
authored
chore(dev-deps): update eslint, prettier, vitest (#333)
1 parent afbc81f commit 5e5c60e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+601
-384
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ cd tutorialkit
2121

2222
4. Run `pnpm run dev` to build sources in watch mode
2323
- Development environment starts in http://localhost:4321/
24+
- You can use `TUTORIALKIT_VITE_INSPECT` environment variable to enable [`vite-plugin-inspect`](https://github.com/antfu-collective/vite-plugin-inspect) during deveplopment.
2425

2526
5. Run `pnpm run test` to run core tests
2627

docs/tutorialkit.dev/src/components/Buttons/Button/Button.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import type { FC, ReactNode } from 'react';
21
import type { ButtonTheme } from '@components/Buttons/Button/ButtonTheme';
3-
42
import cn from 'classnames';
3+
import type { FC, ReactNode } from 'react';
54
import styles from './Button.module.scss';
65

76
interface Props {

docs/tutorialkit.dev/src/components/react-examples/ExampleFileTree.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { useState, type ComponentProps } from 'react';
21
import FileTree from '@tutorialkit/react/core/FileTree';
2+
import { useState, type ComponentProps } from 'react';
33

44
export default function ExampleFileTree() {
55
const [files, setFiles] = useState(INITIAL_FILES);

docs/tutorialkit.dev/src/components/react-examples/ExampleTerminal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import type { Terminal as XTerm } from '@xterm/xterm';
12
import { Suspense, lazy, useEffect, useState } from 'react';
23
import { useTheme } from './hooks/useTheme';
3-
import type { Terminal as XTerm } from '@xterm/xterm';
44
import { useWebContainer } from './hooks/useWebcontainer';
55

66
const Terminal = lazy(() => import('@tutorialkit/react/core/Terminal'));

docs/tutorialkit.dev/src/content/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { defineCollection } from 'astro:content';
21
import { docsSchema } from '@astrojs/starlight/schema';
2+
import { defineCollection } from 'astro:content';
33

44
export const collections = {
55
docs: defineCollection({ schema: docsSchema() }),

extensions/vscode/scripts/build.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { watch } from 'chokidar';
2-
import * as esbuild from 'esbuild';
3-
import { execa } from 'execa';
41
import fs from 'node:fs';
52
import { createRequire } from 'node:module';
6-
import { join, dirname } from 'path';
7-
import { Worker } from 'node:worker_threads';
3+
import { join, dirname } from 'node:path';
84
import { fileURLToPath } from 'node:url';
5+
import { Worker } from 'node:worker_threads';
6+
import { watch } from 'chokidar';
7+
import * as esbuild from 'esbuild';
8+
import { execa } from 'execa';
99

1010
const __dirname = dirname(fileURLToPath(import.meta.url));
1111
const require = createRequire(import.meta.url);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { parentPort } from 'node:worker_threads';
2-
import { zodToJsonSchema } from 'zod-to-json-schema';
32
import { contentSchema } from '@tutorialkit/types';
3+
import { zodToJsonSchema } from 'zod-to-json-schema';
44

55
parentPort.postMessage(zodToJsonSchema(contentSchema));

extensions/vscode/src/commands/tutorialkit.add.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { cmd } from '.';
2-
import { Node, NodeType } from '../models/Node';
31
import * as vscode from 'vscode';
2+
import { Node, NodeType } from '../models/Node';
43
import { FILES_FOLDER, SOLUTION_FOLDER } from '../models/tree/constants';
54
import { updateNodeMetadataInVFS } from '../models/tree/update';
5+
import { cmd } from '.';
66

77
let kebabCase: (string: string) => string;
88
let capitalize: (string: string) => string;

extensions/vscode/src/commands/tutorialkit.delete.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { cmd } from '.';
21
import * as vscode from 'vscode';
3-
import { Node } from '../models/Node';
42
import { getLessonsTreeView } from '../global-state';
3+
import { Node } from '../models/Node';
54
import { updateNodeMetadataInVFS } from '../models/tree/update';
5+
import { cmd } from '.';
66

77
export async function deleteNode(selectedNode: Node | undefined, selectedNodes: Node[] | undefined) {
88
let nodes: readonly Node[] = (selectedNodes ? selectedNodes : [selectedNode]).filter((node) => node !== undefined);

extensions/vscode/src/commands/tutorialkit.initialize.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as vscode from 'vscode';
2-
import { cmd } from '.';
32
import isTutorialKitWorkspace from '../utils/isTutorialKit';
3+
import { cmd } from '.';
44

55
export async function initialize(toastIfEmpty = false) {
66
const tutorialWorkpaces = (vscode.workspace.workspaceFolders || []).filter(isTutorialKitWorkspace);

extensions/vscode/src/commands/tutorialkit.load-tutorial.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as vscode from 'vscode';
22
import { extContext } from '../extension';
3-
import { LessonsTreeDataProvider } from '../views/lessonsTree';
43
import { setLessonsTreeDataProvider, setLessonsTreeView } from '../global-state';
4+
import { LessonsTreeDataProvider } from '../views/lessonsTree';
55

66
export async function loadTutorial(uri: vscode.Uri) {
77
const treeDataProvider = new LessonsTreeDataProvider(uri, extContext);

extensions/vscode/src/commands/tutorialkit.select-tutorial.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as vscode from 'vscode';
2-
import { cmd } from '.';
32
import isTutorialKitWorkspace from '../utils/isTutorialKit';
3+
import { cmd } from '.';
44

55
export async function selectTutorial() {
66
const tutorialWorkpaces = (vscode.workspace.workspaceFolders || []).filter(isTutorialKitWorkspace);

extensions/vscode/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as serverProtocol from '@volar/language-server/protocol';
22
import { createLabsInfo } from '@volar/vscode';
33
import * as vscode from 'vscode';
4+
import * as lsp from 'vscode-languageclient/node';
45
import { useCommands } from './commands';
56
import { useLessonTree } from './views/lessonsTree';
6-
import * as lsp from 'vscode-languageclient/node';
77

88
export let extContext: vscode.ExtensionContext;
99

extensions/vscode/src/global-state.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { TreeView } from 'vscode';
2-
import type { LessonsTreeDataProvider } from './views/lessonsTree';
32
import type { Node } from './models/Node';
3+
import type { LessonsTreeDataProvider } from './views/lessonsTree';
44

55
let lessonsTreeDataProvider: LessonsTreeDataProvider;
66
let lessonsTreeView: TreeView<Node>;

extensions/vscode/src/models/Node.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as vscode from 'vscode';
21
import type { TutorialSchema, PartSchema, ChapterSchema, LessonSchema } from '@tutorialkit/types';
2+
import * as vscode from 'vscode';
33

44
export class Node {
55
/**

extensions/vscode/src/models/tree/load.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import * as vscode from 'vscode';
21
import grayMatter from 'gray-matter';
2+
import * as vscode from 'vscode';
3+
import { Utils } from 'vscode-uri';
34
import { Metadata, Node } from '../Node';
45
import { METADATA_FILES, FILES_FOLDER, SOLUTION_FOLDER } from './constants';
5-
import { Utils } from 'vscode-uri';
66

77
export async function loadTutorialTree(tutorialFolderPath: vscode.Uri, tutorialName: string): Promise<Node> {
88
const metaFilePath = vscode.Uri.joinPath(tutorialFolderPath, 'meta.md');

extensions/vscode/src/models/tree/update.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as vscode from 'vscode';
21
import grayMatter from 'gray-matter';
2+
import * as vscode from 'vscode';
33
import { Node } from '../Node';
44

55
export async function updateNodeMetadataInVFS(node: Node) {

extensions/vscode/src/utils/isTutorialKit.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import * as fs from 'fs';
2-
import * as path from 'path';
1+
import * as fs from 'node:fs';
2+
import * as path from 'node:path';
33
import * as vscode from 'vscode';
44

55
/**

extensions/vscode/src/views/lessonsTree.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import path from 'node:path';
12
import * as vscode from 'vscode';
2-
import path from 'path';
33
import { cmd } from '../commands';
44
import { Node } from '../models/Node';
5-
import { getIcon } from '../utils/getIcon';
6-
import { loadChildrenForNode, loadTutorialTree } from '../models/tree/load';
75
import { METADATA_FILES } from '../models/tree/constants';
6+
import { loadChildrenForNode, loadTutorialTree } from '../models/tree/load';
7+
import { getIcon } from '../utils/getIcon';
88

99
export const tutorialMimeType = 'application/tutorialkit.unit';
1010

integration/cli/create-tutorial.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import path from 'node:path';
21
import fs from 'node:fs/promises';
3-
import { describe, beforeEach, afterAll, expect, it } from 'vitest';
2+
import path from 'node:path';
43
import { execa } from 'execa';
54
import { temporaryDirectory } from 'tempy';
5+
import { describe, beforeEach, afterAll, expect, it } from 'vitest';
66

77
const baseDir = path.resolve(__dirname, '../..');
88

integration/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"dependencies": {
99
"execa": "^9.2.0",
1010
"tempy": "^3.1.0",
11-
"vitest": "^1.6.0"
11+
"vitest": "^2.1.1"
1212
}
1313
}

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
"license": "MIT",
2323
"packageManager": "pnpm@8.15.6",
2424
"devDependencies": {
25-
"@blitz/eslint-plugin": "0.1.0",
25+
"@blitz/eslint-plugin": "0.1.2",
2626
"@commitlint/config-conventional": "^19.2.2",
2727
"add-stream": "^1.0.0",
2828
"chalk": "^5.3.0",
2929
"commitlint": "^19.3.0",
3030
"conventional-changelog": "^6.0.0",
31-
"eslint-plugin-astro": "^1.2.3",
31+
"eslint-plugin-astro": "^1.2.4",
3232
"husky": "^9.0.11",
3333
"is-ci": "^3.0.1",
34-
"prettier": "^3.3.2",
34+
"prettier": "^3.3.3",
3535
"prettier-plugin-astro": "^0.14.1",
3636
"tempfile": "^5.0.0"
3737
},

packages/astro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"execa": "^9.2.0",
7171
"typescript": "^5.4.5",
7272
"vite-plugin-inspect": "0.8.4",
73-
"vitest": "^1.6.0"
73+
"vitest": "^2.1.1"
7474
},
7575
"peerDependencies": {
7676
"astro": "^4.15.0"

packages/astro/scripts/build.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import assert from 'node:assert';
2-
import path from 'node:path';
32
import { existsSync, rmSync, copyFileSync } from 'node:fs';
43
import { cp, rm } from 'node:fs/promises';
5-
import { execa } from 'execa';
4+
import path from 'node:path';
65
import chokidar from 'chokidar';
76
import esbuild from 'esbuild';
87
import { nodeExternalsPlugin } from 'esbuild-node-externals';
8+
import { execa } from 'execa';
99

1010
const isWatch = process.argv.includes('--watch');
1111

@@ -46,6 +46,7 @@ async function buildJS() {
4646
outdir: 'dist',
4747
define: {
4848
'process.env.TUTORIALKIT_DEV': JSON.stringify(process.env.TUTORIALKIT_DEV ?? null),
49+
'process.env.TUTORIALKIT_VITE_INSPECT': JSON.stringify(process.env.TUTORIALKIT_VITE_INSPECT ?? null),
4950
},
5051
plugins: [nodeExternalsPlugin()],
5152
});

packages/astro/src/default/components/WorkspacePanelWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { useEffect } from 'react';
21
import { useStore } from '@nanostores/react';
32
import { WorkspacePanel } from '@tutorialkit/react';
43
import type { Lesson } from '@tutorialkit/types';
4+
import { useEffect } from 'react';
55
import { themeStore } from '../stores/theme-store.js';
66
import { tutorialStore } from './webcontainer.js';
77

packages/astro/src/default/components/webcontainer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// must be imported first
1+
// eslint-disable-next-line -- must be imported first
22
import { useAuth } from './setup.js';
33

44
import { safeBoot, TutorialStore } from '@tutorialkit/runtime';

packages/astro/src/default/utils/content.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import path from 'node:path';
12
import type { ChapterSchema, Lesson, LessonSchema, PartSchema, Tutorial, TutorialSchema } from '@tutorialkit/types';
23
import { interpolateString } from '@tutorialkit/types';
34
import { getCollection } from 'astro:content';
4-
import path from 'node:path';
55
import { DEFAULT_LOCALIZATION } from './content/default-localization';
6+
import { getFilesRefList } from './content/files-ref';
67
import { squash } from './content/squash.js';
78
import { logger } from './logger';
89
import { joinPaths } from './url';
9-
import { getFilesRefList } from './content/files-ref';
1010

1111
export async function getTutorial(): Promise<Tutorial> {
1212
const collection = sortCollection(await getCollection('tutorial'));

packages/astro/src/default/utils/content/files-ref.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import path from 'node:path';
12
import type { FilesRefList } from '@tutorialkit/types';
23
import { folderPathToFilesRef } from '@tutorialkit/types';
34
import glob from 'fast-glob';
4-
import path from 'node:path';
55
import { IGNORED_FILES } from '../constants';
66

77
const CONTENT_DIR = path.join(process.cwd(), 'src/content/tutorial');

packages/astro/src/default/utils/content/squash.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { describe, it, test, expect } from 'vitest';
21
import type { Lesson } from '@tutorialkit/types';
2+
import { describe, it, test, expect } from 'vitest';
33
import { squash } from './squash.js';
44

55
type Metadata = Partial<Lesson['data']>;

packages/astro/src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import type { AstroConfig, AstroIntegration } from 'astro';
21
import { fileURLToPath } from 'node:url';
2+
import type { AstroConfig, AstroIntegration } from 'astro';
33
import { extraIntegrations } from './integrations.js';
44
import { updateMarkdownConfig } from './remark/index.js';
55
import { tutorialkitCore } from './vite-plugins/core.js';
66
import { userlandCSS, watchUserlandCSS } from './vite-plugins/css.js';
7-
import { tutorialkitStore } from './vite-plugins/store.js';
87
import { overrideComponents, type OverrideComponentsOptions } from './vite-plugins/override-components.js';
8+
import { tutorialkitStore } from './vite-plugins/store.js';
99
import { WebContainerFiles } from './webcontainer-files/index.js';
1010

1111
export interface Options {
@@ -101,7 +101,7 @@ export default function createPlugin({
101101
tutorialkitStore,
102102
tutorialkitCore,
103103
overrideComponents({ components, defaultRoutes: !!defaultRoutes }),
104-
process.env.TUTORIALKIT_DEV ? (await import('vite-plugin-inspect')).default() : null,
104+
process.env.TUTORIALKIT_VITE_INSPECT ? (await import('vite-plugin-inspect')).default() : null,
105105
],
106106
},
107107
});

packages/astro/src/integrations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import mdx from '@astrojs/mdx';
33
import react from '@astrojs/react';
44
import { pluginCollapsibleSections } from '@expressive-code/plugin-collapsible-sections';
55
import { pluginLineNumbers } from '@expressive-code/plugin-line-numbers';
6+
import { getInlineContentForPackage } from '@tutorialkit/theme';
67
import expressiveCode from 'astro-expressive-code';
78
import UnoCSS from 'unocss/astro';
8-
import { getInlineContentForPackage } from '@tutorialkit/theme';
99

1010
export function extraIntegrations({ root }: { root: string }) {
1111
return [

packages/astro/src/remark/import-file.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import fs from 'node:fs';
2+
import path from 'node:path';
13
import type { BaseSchema, ChapterSchema, LessonSchema, PartSchema, TutorialSchema } from '@tutorialkit/types';
24
import frontMatter from 'front-matter';
35
import * as kleur from 'kleur/colors';
46
import type { Root } from 'mdast';
5-
import fs from 'node:fs';
6-
import path from 'node:path';
77
import type { Transformer } from 'unified';
88
import { visit } from 'unist-util-visit';
99

packages/astro/src/vite-plugins/css.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
* the correct location to make sure the CSS customization are added after the
77
* default values.
88
*/
9+
import fs from 'node:fs/promises';
10+
import path from 'node:path';
11+
import type { AstroIntegrationLogger } from 'astro';
912
import { watch } from 'chokidar';
10-
import fs from 'fs/promises';
11-
import path from 'path';
1213
import type { ViteDevServer, VitePlugin } from '../types.js';
13-
import type { AstroIntegrationLogger } from 'astro';
1414

1515
const CUSTOM_PATHS = ['theme.css', 'theme/index.css'];
1616

packages/astro/src/webcontainer-files/cache.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
import path from 'node:path';
12
import type { AstroIntegrationLogger } from 'astro';
23
import { dim } from 'kleur/colors';
3-
import path from 'node:path';
44
import type { ViteDevServer } from '../types.js';
55
import { withResolvers } from '../utils.js';
66
import { FILES_FOLDER_NAME, SOLUTION_FOLDER_NAME } from './constants.js';

packages/astro/src/webcontainer-files/filesmap.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type { AstroIntegrationLogger } from 'astro';
2-
import glob from 'fast-glob';
31
import fs from 'node:fs';
42
import path from 'node:path';
3+
import type { AstroIntegrationLogger } from 'astro';
4+
import glob from 'fast-glob';
55
import { z } from 'zod';
66
import type { Files } from '../types';
77
import { EXTEND_CONFIG_FILEPATH, IGNORED_FILES } from './constants';

packages/astro/src/webcontainer-files/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { FSWatcher, watch } from 'chokidar';
2-
import { dim } from 'kleur/colors';
31
import fs from 'node:fs';
42
import path from 'node:path';
53
import { fileURLToPath } from 'node:url';
4+
import { FSWatcher, watch } from 'chokidar';
5+
import { dim } from 'kleur/colors';
66
import type { AstroBuildDoneOptions, AstroServerSetupOptions } from '../types.js';
77
import { FilesMapCache } from './cache.js';
88
import { FILES_FOLDER_NAME, IGNORED_FILES, SOLUTION_FOLDER_NAME } from './constants.js';

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"esbuild-node-externals": "^1.13.1",
5454
"fs-extra": "^11.2.0",
5555
"tempy": "^3.1.0",
56-
"vitest": "^1.6.0"
56+
"vitest": "^2.1.1"
5757
},
5858
"engines": {
5959
"node": ">=18.18.0"

0 commit comments

Comments
 (0)