chore: update deps, use mtc

.eslintrc.json

@@ -9,7 +9,7 @@
   "settings": {
     "import/resolver": {
       "typescript": {
-        "project": "packages/*/tsconfig.json"
+        "project": true
       }
     }
   },

package.json

@@ -4,12 +4,13 @@
   "workspaces": [
     "packages/frameworks/*",
     "packages/renderers/*",
-    "tests/frameworks/*"
+    "tests/frameworks/*",
+    "tests/fixtures"
   ],
   "scripts": {
     "build": "npm run build:types && npm run build:js",
     "build:js": "node -r ~preload ./scripts/build.ts",
-    "build:types": "tsc -b tsconfig.build.json",
+    "build:types": "mtc -p tsconfig.build.json",
     "change": "changeset add",
     "ci:test": "c8 npm test",
     "format": "eslint -f unix --fix . && prettier . --write --log-level=error && sort-package-json --quiet ./{,packages/*/*/,tests/frameworks/*/}package.json",
@@ -19,34 +20,33 @@
     "version": "changeset version && npm i --package-lock-only"
   },
   "devDependencies": {
-    "@babel/plugin-transform-modules-commonjs": "^7.22.15",
-    "@babel/preset-typescript": "^7.22.15",
+    "@babel/plugin-transform-modules-commonjs": "^7.23.0",
+    "@babel/preset-typescript": "^7.23.0",
     "@babel/register": "^7.22.15",
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",
     "@marko/compiler": "^5.33.2",
     "@marko/testing-library": "^6.1.4",
-    "@playwright/test": "^1.38.0",
+    "@marko/type-check": "^1.0.0",
+    "@playwright/test": "^1.38.1",
     "@testing-library/dom": "^9.3.3",
     "@types/babel__register": "^7.17.1",
-    "@types/node": "^20.6.2",
-    "@types/resolve": "^1.20.2",
-    "@types/wait-on": "^5.3.1",
-    "@typescript-eslint/eslint-plugin": "^6.7.2",
-    "@typescript-eslint/parser": "^6.7.2",
+    "@types/node": "^20.7.1",
+    "@types/resolve": "^1.20.3",
+    "@typescript-eslint/eslint-plugin": "^6.7.3",
+    "@typescript-eslint/parser": "^6.7.3",
     "c8": "^8.0.1",
-    "esbuild": "^0.19.3",
-    "eslint": "^8.49.0",
+    "esbuild": "^0.19.4",
+    "eslint": "^8.50.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-import-resolver-typescript": "^3.6.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.28.1",
     "husky": "^8.0.3",
     "jsdom": "^22.1.0",
     "lint-staged": "^14.0.1",
     "marko": "^5.31.10",
     "prettier": "^3.0.3",
-    "sort-package-json": "^2.5.1",
-    "tsconfig-paths": "^4.2.0",
+    "sort-package-json": "^2.6.0",
     "typescript": "^5.2.2",
     "~preload": "file:scripts/preload.js"
   }

packages/frameworks/marko-vite/package.json

@@ -40,10 +40,10 @@
     "@babel/core": "^7",
     "@marko/compiler": "^5",
     "@marko/vite": "^2",
-    "@storybook/builder-vite": "^7.4.2",
-    "@storybook/core-common": "^7.4.2",
+    "@storybook/builder-vite": "^7.4.5",
+    "@storybook/core-common": "^7.4.5",
     "@storybook/global": "^5.0.0",
-    "@storybook/types": "^7.4.2",
+    "@storybook/types": "^7.4.5",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
   }

packages/frameworks/marko-vite/tsconfig.json

@@ -2,11 +2,6 @@
   "extends": "../../../tsconfig.json",
   "include": ["src"],
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@storybook/marko-vite": ["src/index.ts"],
-      "@storybook/marko-vite/preset": ["src/preset.ts"]
-    },
     "outDir": "dist",
     "rootDir": "src",
     "tsBuildInfoFile": "dist/.tsbuildinfo"

packages/frameworks/marko-webpack/package.json

@@ -40,10 +40,10 @@
     "@babel/core": "^7",
     "@marko/compiler": "^5",
     "@marko/webpack": "^9",
-    "@storybook/builder-webpack5": "^7.4.2",
-    "@storybook/core-common": "^7.4.2",
+    "@storybook/builder-webpack5": "^7.4.5",
+    "@storybook/core-common": "^7.4.5",
     "@storybook/global": "^5.0.0",
-    "@storybook/types": "^7.4.2",
+    "@storybook/types": "^7.4.5",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
   }

packages/frameworks/marko-webpack/tsconfig.json

@@ -2,11 +2,6 @@
   "extends": "../../../tsconfig.json",
   "include": ["src"],
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@storybook/marko-webpack": ["src/index.ts"],
-      "@storybook/marko-webpack/preset": ["src/preset.ts"]
-    },
     "outDir": "dist",
     "rootDir": "src",
     "tsBuildInfoFile": "dist/.tsbuildinfo"

packages/renderers/marko/package.json

@@ -36,10 +36,10 @@
     "!**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@storybook/core-client": "^7.4.2",
-    "@storybook/docs-tools": "^7.4.2",
+    "@storybook/core-client": "^7.4.5",
+    "@storybook/docs-tools": "^7.4.5",
     "@storybook/global": "^5.0.0",
-    "@storybook/preview-api": "^7.4.2",
-    "@storybook/types": "^7.4.2"
+    "@storybook/preview-api": "^7.4.5",
+    "@storybook/types": "^7.4.5"
   }
 }

packages/renderers/marko/src/testing-api.ts

@@ -8,39 +8,28 @@ import type {
   ComposedStoryFn,
   ProjectAnnotations,
   Store_CSFExports,
-  StoryAnnotationsOrFn,
 } from "@storybook/types";
 import { deprecate } from "@storybook/client-logger";
 
 import { render } from "./render";
-import type { Meta } from "./public-types";
+import type { Meta, Story } from "./public-types";
 import type { MarkoRenderer } from "./types";
 
-type StoryInputForExport<StoryExports> =
-  StoryExports extends StoryAnnotationsOrFn<
-    MarkoRenderer<infer Input>,
-    infer Input
-  >
-    ? Input
-    : never;
+type StoryInputForExport<Exports> = Exports extends Story<infer Input>
+  ? Input
+  : never;
 
-export type ComposedStories<
-  StoryExports extends Store_CSFExports<MarkoRenderer>,
-> = {
-  [Key in Exclude<
-    keyof StoryExports,
-    keyof Store_CSFExports
-  >]: StoryExports[Key] extends StoryAnnotationsOrFn<MarkoRenderer>
-    ? ComposedStory<StoryExports[Key]>
-    : never;
+export type ComposedStories<Exports> = {
+  [Key in Exclude<keyof Exports, keyof Store_CSFExports>]: ComposedStory<
+    Exports[Key]
+  >;
 };
 
-export type ComposedStory<
-  StoryExport extends
-    StoryAnnotationsOrFn<MarkoRenderer> = StoryAnnotationsOrFn<MarkoRenderer>,
-  Input extends
-    StoryInputForExport<StoryExport> = StoryInputForExport<StoryExport>,
-> = ComposedStoryFn<MarkoRenderer, Input> & Marko.Template<Input>;
+export type ComposedStory<Export> = ComposedStoryFn<
+  MarkoRenderer,
+  StoryInputForExport<Export>
+> &
+  Marko.Template<StoryInputForExport<Export>>;
 
 /** Function that sets the globalConfig of your storybook. The global config is the preview module of your .storybook folder.
  *
@@ -114,19 +103,16 @@ const defaultProjectAnnotations: ProjectAnnotations<MarkoRenderer<any>> = {
  */
 export function composeStory<
   Input extends Args = Args,
-  StoryExport extends StoryAnnotationsOrFn<
-    MarkoRenderer,
-    Args
-  > = StoryAnnotationsOrFn<MarkoRenderer, Args>,
+  Export extends Story<Input> = Story<Input>,
 >(
-  story: StoryExport,
+  story: Export,
   componentAnnotations: Meta<Input>,
   projectAnnotations?: ProjectAnnotations<MarkoRenderer<any>>,
   exportsName?: string,
-): ComposedStory<StoryExport> {
+): ComposedStory<Export> {
   return toRenderable(
     originalComposeStory<MarkoRenderer<Input>, Input>(
-      story as StoryAnnotationsOrFn<MarkoRenderer<Input>, Args>,
+      story as any,
       componentAnnotations,
       projectAnnotations,
       defaultProjectAnnotations,
@@ -161,7 +147,7 @@ export function composeStory<
  * @param csfExports - e.g. (import * as stories from './Button.stories')
  * @param [projectAnnotations] - e.g. (import * as projectAnnotations from '../.storybook/preview') this can be applied automatically if you use `setProjectAnnotations` in your setup files.
  */
-export function composeStories<Exports extends Store_CSFExports<MarkoRenderer>>(
+export function composeStories<Exports>(
   csfExports: Exports,
   projectAnnotations?: ProjectAnnotations<MarkoRenderer>,
 ): ComposedStories<Exports> {

packages/renderers/marko/tsconfig.json

@@ -2,11 +2,6 @@
   "extends": "../../../tsconfig.json",
   "include": ["src"],
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@storybook/marko": ["src/index.ts"],
-      "@storybook/marko/preview": ["src/config.ts"]
-    },
     "outDir": "dist",
     "rootDir": "src",
     "tsBuildInfoFile": "dist/.tsbuildinfo"

tests/fixtures/click-count/test.ts

@@ -1,10 +1,13 @@
 import assert from "node:assert/strict";
 import { test } from "node:test";
-import { composeStories } from "@storybook/marko";
 import { render, screen } from "@marko/testing-library";
+import { composeStories } from "@storybook/marko";
 import { testPage } from "../../test-page";
 import * as stories from "./stories";
 
+// const x: string = 1;
+// console.log(x);
+
 const { Default, InitialCount } = composeStories(stories);
 
 test("click-count", async () => {

tests/frameworks/vite/package.json

@@ -5,18 +5,18 @@
     "storybook": "storybook dev -p $PORT --no-version-updates --disable-telemetry --no-open"
   },
   "devDependencies": {
-    "@babel/preset-typescript": "^7.22.15",
+    "@babel/preset-typescript": "^7.23.0",
     "@marko/compiler": "^5.33.2",
-    "@marko/vite": "^2.4.8",
-    "@storybook/addon-essentials": "^7.4.2",
-    "@storybook/addon-interactions": "^7.4.2",
-    "@storybook/addon-links": "^7.4.2",
-    "@storybook/blocks": "^7.4.2",
+    "@marko/vite": "^2.4.9",
+    "@storybook/addon-essentials": "^7.4.5",
+    "@storybook/addon-interactions": "^7.4.5",
+    "@storybook/addon-links": "^7.4.5",
+    "@storybook/blocks": "^7.4.5",
     "@storybook/marko": "*",
     "@storybook/marko-vite": "*",
     "@storybook/testing-library": "^0.2.1",
     "marko": "^5.31.10",
-    "storybook": "^7.4.2",
+    "storybook": "^7.4.5",
     "vite": "^4.4.9"
   }
 }

tests/frameworks/webpack/package.json

@@ -5,18 +5,18 @@
     "storybook": "storybook dev -p $PORT --no-version-updates --disable-telemetry --no-open"
   },
   "devDependencies": {
-    "@babel/preset-typescript": "^7.22.15",
+    "@babel/preset-typescript": "^7.23.0",
     "@marko/compiler": "^5.33.2",
     "@marko/webpack": "^9.3.3",
-    "@storybook/addon-essentials": "^7.4.2",
-    "@storybook/addon-interactions": "^7.4.2",
-    "@storybook/addon-links": "^7.4.2",
-    "@storybook/blocks": "^7.4.2",
+    "@storybook/addon-essentials": "^7.4.5",
+    "@storybook/addon-interactions": "^7.4.5",
+    "@storybook/addon-links": "^7.4.5",
+    "@storybook/blocks": "^7.4.5",
     "@storybook/marko": "*",
     "@storybook/marko-webpack": "*",
     "@storybook/testing-library": "^0.2.1",
     "marko": "^5.31.10",
-    "storybook": "^7.4.2",
+    "storybook": "^7.4.5",
     "webpack": "^5.88.2"
   }
 }

tsconfig.build.json

@@ -1,9 +1,13 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["**/dist"],
+  "include": ["tests/**/*"],
   "compilerOptions": {
     "noEmit": true,
-    "emitDeclarationOnly": false
+    "emitDeclarationOnly": false,
+    "baseUrl": ".",
+    "paths": {
+      "@storybook/marko": ["./packages/renderer/marko/src/index.ts"]
+    }
   },
   "references": [
     {

tsconfig.json

@@ -2,12 +2,12 @@
   "compilerOptions": {
     "lib": ["dom", "ESNext"],
     "strict": true,
-    "outDir": "dist",
     "composite": true,
     "target": "ESNext",
     "sourceMap": false,
     "declaration": true,
     "incremental": true,
+    "outDir": "dist",
     "module": "ESNext",
     "skipLibCheck": true,
     "stripInternal": true,
@@ -23,12 +23,6 @@
     "verbatimModuleSyntax": true,
     "moduleResolution": "bundler",
     "allowUnreachableCode": false,
-    "allowImportingTsExtensions": true,
     "forceConsistentCasingInFileNames": true
-  },
-  "references": [
-    { "path": "./packages/renderers/marko" },
-    { "path": "./packages/frameworks/marko-vite" },
-    { "path": "./packages/frameworks/marko-webpack" }
-  ]
+  }
 }