Merge branch 'main' of github.com:BuilderIO/builder into fix/columns-…

…updates

examples/nextjs-pages-dir-v2/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@builder.io/sdk-react": "^1.0.21",
-    "next": "14.1.0",
+    "next": "^14.2.2",
     "react": "^18",
     "react-dom": "^18"
   },

examples/nextjs-pages-dir-v2/src/pages/[[...page]].tsx

@@ -1,11 +1,4 @@
-import {
-  BuilderContent,
-  Content,
-  fetchEntries,
-  fetchOneEntry,
-  isEditing,
-  isPreviewing,
-} from '@builder.io/sdk-react';
+import { BuilderContent, Content, fetchEntries, fetchOneEntry } from '@builder.io/sdk-react';
 import { GetStaticProps } from 'next';
 import DefaultErrorPage from 'next/error';
 import Head from 'next/head';
@@ -58,7 +51,10 @@ export async function getStaticPaths() {
 export default function Page(props: { page: BuilderContent | null }) {
   const router = useRouter();
 
-  const canShowContent = props.page || isPreviewing(router.asPath) || isEditing(router.asPath);
+  const canShowContent =
+    props.page ||
+    router.asPath.includes('builder.preview') ||
+    router.asPath.includes('builder.frameEditing');
 
   // If the page content is not available
   // and not in preview/editing mode, show a 404 error page

examples/qwik/.eslintrc.cjs

@@ -6,37 +6,37 @@ module.exports = {
     node: true,
   },
   extends: [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:qwik/recommended",
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:qwik/recommended',
   ],
-  parser: "@typescript-eslint/parser",
+  parser: '@typescript-eslint/parser',
   parserOptions: {
     tsconfigRootDir: __dirname,
-    project: ["./tsconfig.json"],
+    project: ['./tsconfig.json'],
     ecmaVersion: 2021,
-    sourceType: "module",
+    sourceType: 'module',
     ecmaFeatures: {
       jsx: true,
     },
   },
-  plugins: ["@typescript-eslint"],
+  plugins: ['@typescript-eslint'],
   rules: {
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/no-inferrable-types": "off",
-    "@typescript-eslint/no-non-null-assertion": "off",
-    "@typescript-eslint/no-empty-interface": "off",
-    "@typescript-eslint/no-namespace": "off",
-    "@typescript-eslint/no-empty-function": "off",
-    "@typescript-eslint/no-this-alias": "off",
-    "@typescript-eslint/ban-types": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-    "prefer-spread": "off",
-    "no-case-declarations": "off",
-    "no-console": "off",
-    "@typescript-eslint/no-unused-vars": ["error"],
-    "@typescript-eslint/consistent-type-imports": "warn",
-    "@typescript-eslint/no-unnecessary-condition": "warn",
+    '@typescript-eslint/no-explicit-any': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-inferrable-types': 'off',
+    '@typescript-eslint/no-non-null-assertion': 'off',
+    '@typescript-eslint/no-empty-interface': 'off',
+    '@typescript-eslint/no-namespace': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
+    '@typescript-eslint/no-this-alias': 'off',
+    '@typescript-eslint/ban-types': 'off',
+    '@typescript-eslint/ban-ts-comment': 'off',
+    'prefer-spread': 'off',
+    'no-case-declarations': 'off',
+    'no-console': 'off',
+    '@typescript-eslint/no-unused-vars': ['error'],
+    '@typescript-eslint/consistent-type-imports': 'warn',
+    '@typescript-eslint/no-unnecessary-condition': 'warn',
   },
 };

examples/qwik/.prettierignore

@@ -26,7 +26,6 @@ build
 .cache
 .vscode
 .rollup.cache
-dist
 tsconfig.tsbuildinfo
 vite.config.ts
 *.spec.tsx