Skip to content

Commit

Permalink
it seems volar has some new feature/bug where components defined by f…
Browse files Browse the repository at this point in the history
…ilenames are treated to override native html elements, causing types clashes.
  • Loading branch information
ndelangen committed Jun 9, 2023
1 parent a56a6ec commit ea7c392
Show file tree
Hide file tree
Showing 22 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion code/addons/storyshots-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"devDependencies": {
"@angular/core": "^16.0.0-rc.4",
"@angular/platform-browser-dynamic": "^16.0.0-rc.4",
"@emotion/jest": "^11.8.0",
"@emotion/jest": "^11.10.0",
"@storybook/addon-docs": "7.1.0-alpha.30",
"@storybook/angular": "7.1.0-alpha.30",
"@storybook/react": "7.1.0-alpha.30",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion code/renderers/vue/src/public-types.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { Component } from 'vue';
import type { ExtendedVue } from 'vue/types/vue';
import { Vue } from 'vue/types/vue';
import type { Decorator, Meta, StoryObj } from './public-types';
import Button from './__tests__/Button.vue';
import Button from './__tests__/MyButton.vue';
import type { VueRenderer } from './types';

describe('Meta', () => {
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/src/public-types.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { h } from 'vue';
import type { ComponentPropsAndSlots, Decorator, Meta, StoryObj } from './public-types';
import type { VueRenderer } from './types';
import BaseLayout from './__tests__/BaseLayout.vue';
import Button from './__tests__/Button.vue';
import Button from './__tests__/MyButton.vue';
import DecoratorTsVue from './__tests__/Decorator.vue';
import Decorator2TsVue from './__tests__/Decorator2.vue';

Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/template/cli/js/Button.stories.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import MyButton from './Button.vue';
import MyButton from './MyButton.vue';

// More on how to set up stories at: https://storybook.js.org/docs/vue/writing-stories/introduction
export default {
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/template/cli/js/Header.stories.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import MyHeader from './Header.vue';
import MyHeader from './MyHeader.vue';

export default {
title: 'Example/Header',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<script>
import './header.css';
import MyButton from './Button.vue';
import MyButton from './MyButton.vue';
export default {
name: 'my-header',
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/template/cli/ts-3-8/Button.stories.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Meta, StoryObj } from '@storybook/vue3';

import Button from './Button.vue';
import Button from './MyButton.vue';

// More on how to set up stories at: https://storybook.js.org/docs/vue/writing-stories/introduction
const meta: Meta<typeof Button> = {
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/template/cli/ts-3-8/Header.stories.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Meta, StoryObj } from '@storybook/vue3';

import MyHeader from './Header.vue';
import MyHeader from './MyHeader.vue';

const meta: Meta<typeof MyHeader> = {
/* 👇 The title prop is optional.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<script lang="ts" setup>
import './header.css';
import MyButton from './Button.vue';
import MyButton from './MyButton.vue';
defineProps<{ user: { name: string } | null }>();
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/template/cli/ts-3-8/Page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<script lang="ts" setup>
import './page.css';
import MyHeader from './Header.vue';
import MyHeader from './MyHeader.vue';
import { ref } from 'vue';
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/template/cli/ts-4-9/Button.stories.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Meta, StoryObj } from '@storybook/vue3';

import Button from './Button.vue';
import Button from './MyButton.vue';

// More on how to set up stories at: https://storybook.js.org/docs/vue/writing-stories/introduction
const meta = {
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/template/cli/ts-4-9/Header.stories.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Meta, StoryObj } from '@storybook/vue3';

import MyHeader from './Header.vue';
import MyHeader from './MyHeader.vue';

const meta = {
/* 👇 The title prop is optional.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<script lang="ts" setup>
import './header.css';
import MyButton from './Button.vue';
import MyButton from './MyButton.vue';
defineProps<{ user: { name: string } | null }>();
Expand Down
2 changes: 1 addition & 1 deletion code/renderers/vue3/template/cli/ts-4-9/Page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<script lang="ts" setup>
import './page.css';
import MyHeader from './Header.vue';
import MyHeader from './MyHeader.vue';
import { ref } from 'vue';
Expand Down
4 changes: 2 additions & 2 deletions code/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2600,7 +2600,7 @@ __metadata:
languageName: node
linkType: hard

"@emotion/jest@npm:^11.10.0, @emotion/jest@npm:^11.8.0":
"@emotion/jest@npm:^11.10.0":
version: 11.11.0
resolution: "@emotion/jest@npm:11.11.0"
dependencies:
Expand Down Expand Up @@ -5482,7 +5482,7 @@ __metadata:
dependencies:
"@angular/core": ^16.0.0-rc.4
"@angular/platform-browser-dynamic": ^16.0.0-rc.4
"@emotion/jest": ^11.8.0
"@emotion/jest": ^11.10.0
"@jest/transform": ^29.3.1
"@storybook/addon-docs": 7.1.0-alpha.30
"@storybook/angular": 7.1.0-alpha.30
Expand Down
2 changes: 1 addition & 1 deletion scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@babel/preset-react": "^7.22.0",
"@babel/preset-typescript": "^7.21.0",
"@babel/types": "^7.22.0",
"@emotion/jest": "^11.10.5",
"@emotion/jest": "^11.10.0",
"@jest/globals": "^29.3.1",
"@nx/workspace": "16.2.1",
"@octokit/graphql": "^5.0.5",
Expand Down
4 changes: 2 additions & 2 deletions scripts/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1544,7 +1544,7 @@ __metadata:
languageName: node
linkType: hard

"@emotion/jest@npm:^11.10.5":
"@emotion/jest@npm:^11.10.0":
version: 11.11.0
resolution: "@emotion/jest@npm:11.11.0"
dependencies:
Expand Down Expand Up @@ -2953,7 +2953,7 @@ __metadata:
"@babel/preset-react": ^7.22.0
"@babel/preset-typescript": ^7.21.0
"@babel/types": ^7.22.0
"@emotion/jest": ^11.10.5
"@emotion/jest": ^11.10.0
"@jest/globals": ^29.3.1
"@nx/workspace": 16.2.1
"@octokit/graphql": ^5.0.5
Expand Down

0 comments on commit ea7c392

Please sign in to comment.