Commitb38e406

committed

fix vscode / storybook dep conflict

1 parente2665b5 commitb38e406Copy full SHA for b38e406

File tree

+15

-11

lines changed

+15

-11

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-import*asvscodefrom'vscode'`
`2`	`1`	`import{join}from'path'`
`3`		`-import{setStorage}from'../storage'`
	`2`	`+import*asCRfrom'typings'`
	`3`	`+import*asvscodefrom'vscode'`
`4`	`4`	`importReactWebViewfrom'../ReactWebView'`
	`5`	`+import{setStorage}from'../storage'`
`5`	`6`	`import{isEmptyWorkspace}from'../workspace'`
`6`		`-import*asCRfrom'typings'`
`7`	`7`	`importrunTestfrom'./runTest'`
`8`	`8`
`9`	`9`	`constCOMMANDS={`
`@@ -44,7 +44,6 @@ export const createCommands = ({ context, machine, storage, git, position }: Cre`
`44`	`44`
`45`	`45`	`// activate machine`
`46`	`46`	`webview=newReactWebView(context.extensionPath)`
`47`		`-console.log('webview',webview.panel.webview.postMessage)`
`48`	`47`	`machine.activate()`
`49`	`48`	`},`
`50`	`49`	`// open React webview`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`	`"class-name":true,`
`9`	`9`	`"semicolon": [true,"never"],`
`10`	`10`	`"triple-equals":true,`
`11`		`-"interface-name": [true,"never-prefix"]`
	`11`	`+"interface-name": [true,"never-prefix"],`
	`12`	`+"object-literal-sort-keys":false`
`12`	`13`	`},`
`13`	`14`	`"defaultSeverity":"warning",`
`14`	`15`	`"no-submodule-imports":false`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,15 @@ import '@alifd/next/dist/next.css'`
`2`	`2`	`import{configure}from'@storybook/react'`
`3`	`3`	`import'../src/styles/index.css'`
`4`	`4`
	`5`	`+// setup acquireVsCodeApi mock`
	`6`	`+//@ts-ignore`
	`7`	`+global.acquireVsCodeApi=()=>({`
	`8`	`+postMessage(event:string){`
	`9`	`+console.log('postMessage',event)`
	`10`	`+}`
	`11`	`+})`
	`12`	`+`
	`13`	`+`
`5`	`14`	`// automatically import all files ending in *.stories.tsx`
`6`	`15`	`constreq=require.context('../stories',true,/\.stories\.tsx$/)`
`7`	`16`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,7 @@ import { Action } from 'typings'`
`2`	`2`
`3`	`3`	`declarevaracquireVsCodeApi:any`
`4`	`4`
`5`		`-//@ts-ignore`
`6`		`-constvscode=window.acquireVsCodeApi ?acquireVsCodeApi() :{`
`7`		`-postMessage(event:string){`
`8`		`-console.log('postMessage',event)`
`9`		`-}`
`10`		`-}`
	`5`	`+constvscode=acquireVsCodeApi()`
`11`	`6`
`12`	`7`	`exportfunctionsend(event:string\|Action){`
`13`	`8`	`returnvscode.postMessage(event)`

Comments

(0)