Merge branch 'next' into preact-typescript-pragma-fix

# Conflicts: # app/preact/src/server/framework-preset-preact.ts # code/examples/preact-kitchen-sink/.storybook/main.ts # code/examples/preact-kitchen-sink/src/stories/test-cases/__snapshots__/test-component.stories.storyshot # code/examples/preact-kitchen-sink/src/stories/test-cases/no-pragma.tsx # code/examples/preact-kitchen-sink/src/stories/test-cases/test-component.stories.tsx # code/examples/preact-kitchen-sink/tsconfig.json
storybookjs · Jul 27, 2022 · e3115fd · e3115fd
2 parents ea6fbd4 + 3db4db6
commit e3115fd
Show file tree

Hide file tree

Showing 4,266 changed files with 162,394 additions and 155,769 deletions.
diff --git a/.ci/danger/dangerfile.ts b/.ci/danger/dangerfile.ts
@@ -7,7 +7,7 @@ const flatten = require('lodash/flatten');
 const intersection = require('lodash/intersection');
 const isEmpty = require('lodash/isEmpty');
 
-const pkg = require('../../package.json'); // eslint-disable-line import/newline-after-import
+const pkg = require('../../code/package.json'); // eslint-disable-line import/newline-after-import
 const prLogConfig = pkg['pr-log'];
 
 const Versions = {