Merge branch 'main' of github.com:BuilderIO/builder into contentstack-data-plugin

Author: samijaber

examples/next-js-simple/README.md

@@ -11,7 +11,7 @@ Before using this example, make sure you have the following:
 
 A basic understanding of the following is helpful too:
 * The [command line](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Understanding_client-side_tools/Command_line)
-* JavaScript and [React](https://reactjs.org/).
+* JavaScript and [React](https://reactjs.org/)
 * [Next.js](https://nextjs.org/)
 * What it means to [clone a GitHub repo](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository)
 
@@ -52,23 +52,20 @@ For this example, click **Add Builder to an existing site or app**.
 
 <figure>
     <img src="https://cdn.builder.io/api/v1/image/assets%2FYJIGb4i01jvw0SRdL5Bt%2F19683b4ef3f54eb78e8c2fa6c65759a7" alt="Builder.io Welcome screen for creating a new Organization" width="600" style="display: block; margin: auto"/>
-    <figcaption style="text-align: center">You can choose to create a new Builder site or Add Builder to an existing application.</figcaption>
 </figure>
 
 **If you don't have the introductory prompt for creating a space, take the following steps. If you do have the prompt in the previous step, skip to step 4.**
 
 1. Click on the Organization icon on the bottom left. 
 
     <figure>
-      <img src="https://cdn.builder.io/api/v1/image/assets%2FYJIGb4i01jvw0SRdL5Bt%2F279657f9a38743e99a028173200d6f76" alt="Space icon with two people standing together" width="600" style="display: block; margin: auto"/>
-      <figcaption style="text-align: center">The Organization icon features two figures and is on the left sidebar at the bottom.</figcaption>
+      <img src="https://cdn.builder.io/api/v1/image/assets%2FYJIGb4i01jvw0SRdL5Bt%2F279657f9a38743e99a028173200d6f76" alt="Organization icon with two people standing together" width="600" style="display: block; margin: auto"/>
     </figure>
 
 1. Hover over **Builder.io** and choose **+ New Space**.
 
     <figure>
       <img src="https://cdn.builder.io/api/v1/image/assets%2FYJIGb4i01jvw0SRdL5Bt%2F32d67ac4249c40fda0486fb7f38ac71b" alt="Menu options for creating a new space" width="400" style="display: block; margin: auto"/>
-      <figcaption style="text-align: center">Access the menu for creating a new space by clicking on the Organization icon.</figcaption>
     </figure>
 
 1. Click **Add Builder to an existing site or app**.
@@ -79,7 +76,6 @@ For this example, click **Add Builder to an existing site or app**.
 
 <figure>
     <img src="https://cdn.builder.io/api/v1/image/assets%2FYJIGb4i01jvw0SRdL5Bt%2F3b434d77529f4ae392a3d481a926092d" alt="Dialogue for creating a new space" width="400" style="display: block; margin: auto"/>
-    <figcaption style="text-align: center">Enter a name for your new space, such as "My Next.js App".</figcaption>
 </figure>
 
 Now that you have a new space, the next step is connecting "My Next.js App" with your application.
@@ -92,14 +88,12 @@ To connect your Builder.io space and your application, set the site URL and get
 
     <figure>
        <img src="https://cdn.builder.io/api/v1/image/assets%2FYJIGb4i01jvw0SRdL5Bt%2Fd26eb45cd52a4cada42413cd5c99419d" alt="Account icon in left sidenav" width="200" style="display: block; margin: auto"/>
-       <figcaption style="text-align: center">The Account icon takes you to important data about this space.</figcaption>
     </figure>
 
 1. Change the Site URL to `http://localhost:3000` and click to copy the Public API Key.
 
     <figure>
        <img src="https://cdn.builder.io/api/v1/image/assets%2FYJIGb4i01jvw0SRdL5Bt%2Faec18bf8ccf543ab94c4230a7791c894" alt="Change the Site URL in account settings." width="400" style="display: block; margin: auto"/>
-       <figcaption style="text-align: center">The Site URL and API Key are in the **Space** tab.</figcaption>
     </figure>
 
 1. In your code editor, configure `.env.production` and `.env.development` with the [Public API Key](https://builder.io/account/space) by adding a line to each file as follows, but using your Public API Key that you copied in the previous step. 
@@ -142,6 +136,7 @@ You can deploy anywhere you like, but for this project we recommend [Vercel](htt
 
 ## Next steps
 
+* Learn how to [use your react components in our visual editor](https://www.builder.io/c/docs/custom-react-components)
 * For more information on previewing your applications, see [Editing and previewing directly on your site](https://www.builder.io/c/docs/guides/preview-url).
 * See [Getting started with the visual editor](https://www.builder.io/c/docs/guides/page-building) for an introduction to editing your pages without having to code. 
 * Check out [Builder best practices](https://www.builder.io/c/docs/best-practices) for guidance on how to approach site development with Builder.

examples/next-js-simple/pages/[[...path]].tsx renamed to examples/next-js-simple/pages/[[...page]].tsx

@@ -1,19 +1,22 @@
 import type { GetStaticPropsContext, InferGetStaticPropsType } from 'next'
-import { NextSeo } from 'next-seo'
 import { useRouter } from 'next/router'
 import { BuilderComponent, Builder, builder } from '@builder.io/react'
-import builderConfig from '@config/builder'
 import DefaultErrorPage from 'next/error'
 import Head from 'next/head'
-import { resolveBuilderContent } from '@lib/resolve-builder-content'
-import { Link } from '@components/Link/Link'
 
+const BUILDER_API_KEY = 'PUT YOUR API KEY HERE'
+builder.init(BUILDER_API_KEY)
+
+// tells you what paths are being built 
 export async function getStaticProps({
   params,
 }: GetStaticPropsContext<{ path: string[] }>) {
-  const page = await resolveBuilderContent('page', {
-    urlPath: '/' + (params?.path?.join('/') || ''),
+  const page = await builder.get('page', {
+    userAttributes: {
+      urlPath: '/' + (params?.page?.join('/') || ''),
+    }
   })
+  .toPromise() || null
 
   return {
     props: {
@@ -26,10 +29,11 @@ export async function getStaticProps({
   }
 }
 
+// returns a list
 export async function getStaticPaths() {
   const pages = await builder.getAll('page', {
     options: { noTargeting: true },
-    apiKey: builderConfig.apiKey,
+    omit: "data.blocks"
   })
 
   return {
@@ -38,7 +42,9 @@ export async function getStaticPaths() {
   }
 }
 
-export default function Path({
+
+// React Component
+export default function Page({
   page,
 }: InferGetStaticPropsType<typeof getStaticProps>) {
   const router = useRouter()
@@ -58,30 +64,13 @@ export default function Path({
     )
   }
 
-  const { title, description, image } = page?.data! || {}
   return (
     <>
       <Head>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
       </Head>
-      <NextSeo
-        title={title}
-        description={description}
-        openGraph={{
-          type: 'website',
-          title,
-          description,
-          images: [
-            {
-              url: image,
-              width: 800,
-              height: 600,
-              alt: title,
-            },
-          ],
-        }}
-      />
-      <BuilderComponent renderLink={Link} model="page" content={page} />
+      
+      <BuilderComponent model="page" content={page} />
     </>
   )
-}
+}

packages/commerce-plugin-tools/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/commerce-plugin-tools",
-  "version": "0.2.1-4",
+  "version": "0.2.1",
   "description": "",
   "keywords": [],
   "main": "dist/index.umd.js",

packages/commerce-plugin-tools/package.json

@@ -64,6 +64,8 @@ export const registerCommercePlugin = async (
       Builder.register('editor.onLoad', onEditorLoad(config, apiOperations, resourceName));
       Builder.registerEditor({
         name: `${config.name}${capitalize(resourceName)}`,
+        isDataResource: true,
+        pluginId: config.id,
         component: (props: ResourcesPickerButtonProps) => (
           <ErrorBoundary>
             <ResourcesPickerButton {...props} {...contextProps} />

packages/commerce-plugin-tools/src/index.tsx

@@ -0,0 +1,12 @@
+node_modules
+coverage
+.nyc_output
+.DS_Store
+*.log
+.vscode
+.idea
+dist
+compiled
+.awcache
+.rpt2_cache
+docs

packages/data-plugin-tools/.gitignore

@@ -0,0 +1,20 @@
+language: node_js
+cache:
+  directories:
+    - ~/.npm
+notifications:
+  email: false
+node_js:
+  - '10'
+  - '11'
+  - '8'
+  - '6'
+script:
+  - npm run test:prod && npm run build
+after_success:
+  - npm run travis-deploy-once "npm run report-coverage"
+  - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then npm run travis-deploy-once "npm run deploy-docs"; fi
+  - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then npm run travis-deploy-once "npm run semantic-release"; fi
+branches:
+  except:
+    - /^v\d+\.\d+\.\d+$/

packages/data-plugin-tools/.travis.yml

@@ -0,0 +1,17 @@
+We're really glad you're reading this, because we need volunteer developers to help this project come to fruition. 👏
+
+## Instructions
+
+These steps will guide you through contributing to this project:
+
+- Fork the repo
+- Clone it and install dependencies
+
+      		git clone https://github.com/YOUR-USERNAME/typescript-library-starter
+      		npm install
+
+Keep in mind that after running `npm install` the git repo is reset. So a good way to cope with this is to have a copy of the folder to push the changes, and the other to try them.
+
+Make and commit your changes. Make sure the commands npm run build and npm run test:prod are working.
+
+Finally send a [GitHub Pull Request](https://github.com/alexjoverm/typescript-library-starter/compare?expand=1) with a clear list of what you've done (read more [about pull requests](https://help.github.com/articles/about-pull-requests/)). Make sure all of your commits are atomic (one feature per commit).

packages/data-plugin-tools/CONTRIBUTING.md

@@ -0,0 +1,7 @@
+Copyright 2021 Builder.io, Inc <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

packages/data-plugin-tools/LICENSE

@@ -0,0 +1 @@
+Experimental