chore: conflicts

thepassle · thepassle · commit bb7d19943c8f · 2023-07-05T08:54:04.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/dev-server-storybook/CHANGELOG.md b/packages/dev-server-storybook/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web/dev-server-storybook
 
+## 0.7.3
+
+### Patch Changes
+
+- e9c77e06: Version Packages
+
 ## 0.7.2
 
 ### Patch Changes
diff --git a/packages/dev-server-storybook/package.json b/packages/dev-server-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web/dev-server-storybook",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "publishConfig": {
     "access": "public"
   },
@@ -75,7 +75,7 @@
   },
   "devDependencies": {
     "@types/path-is-inside": "^1.0.0",
-    "@web/dev-server": "^0.2.2",
+    "@web/dev-server": "^0.2.4",
     "htm": "^3.1.0"
   }
 }
diff --git a/packages/dev-server/CHANGELOG.md b/packages/dev-server/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web/dev-server
 
+## 0.2.4
+
+### Patch Changes
+
+- e9c77e06: Version Packages
+
 ## 0.2.3
 
 ### Patch Changes
diff --git a/packages/dev-server/package.json b/packages/dev-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web/dev-server",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "publishConfig": {
     "access": "public"
   },
diff --git a/packages/mocks/CHANGELOG.md b/packages/mocks/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @web/mocks
 
+## 0.1.2
+
+### Patch Changes
+
+- e9c77e06: Version Packages
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/packages/mocks/demo/wc/src/MyFeature.js b/packages/mocks/demo/wc/src/MyFeature.js
@@ -1,3 +1,5 @@
+// @ts-nocheck
+
 import { LitElement, html } from 'lit';
 
 class MyElement extends LitElement {
diff --git a/packages/mocks/package.json b/packages/mocks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web/mocks",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "publishConfig": {
     "access": "public"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@web/dev-server-storybook",`
`3`		`- "version": "0.7.2",`
	`3`	`+ "version": "0.7.3",`
`4`	`4`	`"publishConfig": {`
`5`	`5`	`"access": "public"`
`6`	`6`	`},`
`@@ -75,7 +75,7 @@`
`75`	`75`	`},`
`76`	`76`	`"devDependencies": {`
`77`	`77`	`"@types/path-is-inside": "^1.0.0",`
`78`		`- "@web/dev-server": "^0.2.2",`
	`78`	`+ "@web/dev-server": "^0.2.4",`
`79`	`79`	`"htm": "^3.1.0"`
`80`	`80`	`}`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@web/dev-server",`
`3`		`- "version": "0.2.3",`
	`3`	`+ "version": "0.2.4",`
`4`	`4`	`"publishConfig": {`
`5`	`5`	`"access": "public"`
`6`	`6`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// @ts-nocheck`
	`2`	`+`
`1`	`3`	`import { LitElement, html } from 'lit';`
`2`	`4`
`3`	`5`	`class MyElement extends LitElement {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@web/mocks",`
`3`		`- "version": "0.1.1",`
	`3`	`+ "version": "0.1.2",`
`4`	`4`	`"publishConfig": {`
`5`	`5`	`"access": "public"`
`6`	`6`	`},`