@teambit/react 0.0.828 → 0.0.831

package/dist/templates/workspace-common/generate-files.js.map

@@ -1 +1 @@
-{"version":3,"names":["generateFiles","context","relativePath","content","workspaceConfig","gitIgnore","launchJson","readme","eslintConfig","tsConfig","prettierConfig","assetTypes","styleTypes"],"sources":["generate-files.ts"],"sourcesContent":["import { WorkspaceContext } from '@teambit/generator';\nimport { workspaceConfig } from './files/workspace-config';\nimport { readme } from './files/readme-file';\nimport { gitIgnore } from './files/git-ignore';\nimport { assetTypes } from './files/types/asset';\nimport { styleTypes } from './files/types/style';\nimport { eslintConfig } from './files/eslint-config';\nimport { tsConfig } from './files/ts-config';\nimport { prettierConfig } from './files/prettier-config';\nimport { launchJson } from './files/launch-json';\n\ntype GeneratedFile = {\n  relativePath: string;\n  content: string;\n};\n\nexport async function generateFiles(context: WorkspaceContext): Promise<GeneratedFile[]> {\n  return [\n    {\n      relativePath: 'workspace.jsonc',\n      content: await workspaceConfig(context),\n    },\n    {\n      relativePath: `.gitignore`,\n      content: gitIgnore(),\n    },\n    {\n      relativePath: '.vscode/launch.json',\n      content: launchJson(context),\n    },\n    {\n      relativePath: `README.md`,\n      content: readme(),\n    },\n    {\n      relativePath: `.eslintrc.js`,\n      content: eslintConfig,\n    },\n    {\n      relativePath: `tsconfig.json`,\n      content: tsConfig,\n    },\n    {\n      relativePath: `.prettierrc.js`,\n      content: prettierConfig,\n    },\n    {\n      relativePath: `types/asset.d.ts`,\n      content: assetTypes,\n    },\n    {\n      relativePath: `types/style.d.ts`,\n      content: styleTypes,\n    },\n  ];\n}\n"],"mappings":";;;;;;;;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAOO,eAAeA,aAAf,CAA6BC,OAA7B,EAAkF;EACvF,OAAO,CACL;IACEC,YAAY,EAAE,iBADhB;IAEEC,OAAO,EAAE,MAAM,IAAAC,kCAAA,EAAgBH,OAAhB;EAFjB,CADK,EAKL;IACEC,YAAY,EAAG,YADjB;IAEEC,OAAO,EAAE,IAAAE,sBAAA;EAFX,CALK,EASL;IACEH,YAAY,EAAE,qBADhB;IAEEC,OAAO,EAAE,IAAAG,wBAAA,EAAWL,OAAX;EAFX,CATK,EAaL;IACEC,YAAY,EAAG,WADjB;IAEEC,OAAO,EAAE,IAAAI,oBAAA;EAFX,CAbK,EAiBL;IACEL,YAAY,EAAG,cADjB;IAEEC,OAAO,EAAEK;EAFX,CAjBK,EAqBL;IACEN,YAAY,EAAG,eADjB;IAEEC,OAAO,EAAEM;EAFX,CArBK,EAyBL;IACEP,YAAY,EAAG,gBADjB;IAEEC,OAAO,EAAEO;EAFX,CAzBK,EA6BL;IACER,YAAY,EAAG,kBADjB;IAEEC,OAAO,EAAEQ;EAFX,CA7BK,EAiCL;IACET,YAAY,EAAG,kBADjB;IAEEC,OAAO,EAAES;EAFX,CAjCK,CAAP;AAsCD"}
+{"version":3,"names":["generateFiles","context","extraConfig","relativePath","content","workspaceConfig","gitIgnore","launchJson","readme","eslintConfig","tsConfig","prettierConfig","assetTypes","styleTypes"],"sources":["generate-files.ts"],"sourcesContent":["import { WorkspaceContext } from '@teambit/generator';\nimport { workspaceConfig } from './files/workspace-config';\nimport { readme } from './files/readme-file';\nimport { gitIgnore } from './files/git-ignore';\nimport { assetTypes } from './files/types/asset';\nimport { styleTypes } from './files/types/style';\nimport { eslintConfig } from './files/eslint-config';\nimport { tsConfig } from './files/ts-config';\nimport { prettierConfig } from './files/prettier-config';\nimport { launchJson } from './files/launch-json';\n\ntype GeneratedFile = {\n  relativePath: string;\n  content: string;\n};\n\nexport async function generateFiles(\n  context: WorkspaceContext,\n  extraConfig?: Record<string, any>\n): Promise<GeneratedFile[]> {\n  return [\n    {\n      relativePath: 'workspace.jsonc',\n      content: await workspaceConfig(context, extraConfig),\n    },\n    {\n      relativePath: `.gitignore`,\n      content: gitIgnore(),\n    },\n    {\n      relativePath: '.vscode/launch.json',\n      content: launchJson(context),\n    },\n    {\n      relativePath: `README.md`,\n      content: readme(),\n    },\n    {\n      relativePath: `.eslintrc.js`,\n      content: eslintConfig,\n    },\n    {\n      relativePath: `tsconfig.json`,\n      content: tsConfig,\n    },\n    {\n      relativePath: `.prettierrc.js`,\n      content: prettierConfig,\n    },\n    {\n      relativePath: `types/asset.d.ts`,\n      content: assetTypes,\n    },\n    {\n      relativePath: `types/style.d.ts`,\n      content: styleTypes,\n    },\n  ];\n}\n"],"mappings":";;;;;;;;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAOO,eAAeA,aAAf,CACLC,OADK,EAELC,WAFK,EAGqB;EAC1B,OAAO,CACL;IACEC,YAAY,EAAE,iBADhB;IAEEC,OAAO,EAAE,MAAM,IAAAC,kCAAA,EAAgBJ,OAAhB,EAAyBC,WAAzB;EAFjB,CADK,EAKL;IACEC,YAAY,EAAG,YADjB;IAEEC,OAAO,EAAE,IAAAE,sBAAA;EAFX,CALK,EASL;IACEH,YAAY,EAAE,qBADhB;IAEEC,OAAO,EAAE,IAAAG,wBAAA,EAAWN,OAAX;EAFX,CATK,EAaL;IACEE,YAAY,EAAG,WADjB;IAEEC,OAAO,EAAE,IAAAI,oBAAA;EAFX,CAbK,EAiBL;IACEL,YAAY,EAAG,cADjB;IAEEC,OAAO,EAAEK;EAFX,CAjBK,EAqBL;IACEN,YAAY,EAAG,eADjB;IAEEC,OAAO,EAAEM;EAFX,CArBK,EAyBL;IACEP,YAAY,EAAG,gBADjB;IAEEC,OAAO,EAAEO;EAFX,CAzBK,EA6BL;IACER,YAAY,EAAG,kBADjB;IAEEC,OAAO,EAAEQ;EAFX,CA7BK,EAiCL;IACET,YAAY,EAAG,kBADjB;IAEEC,OAAO,EAAES;EAFX,CAjCK,CAAP;AAsCD"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/react",
-  "version": "0.0.828",
+  "version": "0.0.831",
   "homepage": "https://bit.dev/teambit/react/react",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.react",
     "name": "react",
-    "version": "0.0.828"
+    "version": "0.0.831"
   },
   "dependencies": {
     "fs-extra": "10.0.0",
@@ -37,12 +37,12 @@
     "@babel/plugin-transform-modules-commonjs": "7.12.13",
     "@babel/preset-env": "7.12.17",
     "camelcase": "6.2.0",
+    "comment-json": "3.0.3",
     "react-error-overlay": "6.0.9",
     "strip-ansi": "6.0.0",
     "prerender-spa-plugin-next": "4.2.0",
     "express": "4.17.1",
     "url-join": "4.0.1",
-    "comment-json": "3.0.3",
     "react-refresh": "0.10.0",
     "@babel/runtime": "^7.12.18",
     "less-loader": "10.0.0",
@@ -82,49 +82,49 @@
     "@teambit/react.instructions.react.adding-compositions": "0.0.6",
     "@teambit/react.instructions.react.adding-tests": "0.0.6",
     "@teambit/react.rendering.ssr": "0.0.3",
-    "@teambit/compositions.ui.hooks.use-composition": "0.0.163",
     "@teambit/design.ui.tooltip": "0.0.352",
-    "@teambit/builder": "0.0.828",
-    "@teambit/bundler": "0.0.828",
-    "@teambit/compiler": "0.0.828",
+    "@teambit/builder": "0.0.831",
+    "@teambit/bundler": "0.0.831",
+    "@teambit/compiler": "0.0.831",
     "@teambit/component.modules.component-url": "0.0.128",
-    "@teambit/component": "0.0.828",
-    "@teambit/dependency-resolver": "0.0.828",
-    "@teambit/envs": "0.0.828",
-    "@teambit/eslint": "0.0.828",
-    "@teambit/formatter": "0.0.379",
-    "@teambit/jest": "0.0.828",
-    "@teambit/linter": "0.0.828",
-    "@teambit/logger": "0.0.648",
-    "@teambit/pkg": "0.0.828",
-    "@teambit/prettier": "0.0.379",
-    "@teambit/react.ui.compositions-app": "0.0.2",
-    "@teambit/react.ui.docs-app": "0.0.184",
-    "@teambit/react.ui.highlighter.component-metadata.bit-component-meta": "0.0.21",
-    "@teambit/schema": "0.0.828",
-    "@teambit/tester": "0.0.828",
-    "@teambit/typescript": "0.0.828",
-    "@teambit/webpack": "0.0.828",
-    "@teambit/workspace": "0.0.828",
-    "@teambit/application": "0.0.470",
-    "@teambit/cli": "0.0.555",
-    "@teambit/generator": "0.0.828",
-    "@teambit/graphql": "0.0.828",
-    "@teambit/preview": "0.0.828",
-    "@teambit/react.ui.highlighter-provider": "0.0.190",
-    "@teambit/compositions": "0.0.828",
-    "@teambit/ui": "0.0.828",
-    "@teambit/react.eslint-config-bit-react": "0.0.629",
-    "@teambit/mdx.modules.mdx-loader": "0.0.492",
-    "@teambit/react.babel.bit-react-transformer": "0.0.504",
+    "@teambit/component": "0.0.831",
+    "@teambit/dependency-resolver": "0.0.831",
+    "@teambit/envs": "0.0.831",
+    "@teambit/eslint": "0.0.831",
+    "@teambit/formatter": "0.0.382",
+    "@teambit/jest": "0.0.831",
+    "@teambit/linter": "0.0.831",
+    "@teambit/logger": "0.0.649",
+    "@teambit/pkg": "0.0.831",
+    "@teambit/prettier": "0.0.382",
+    "@teambit/schema": "0.0.831",
+    "@teambit/tester": "0.0.831",
+    "@teambit/typescript": "0.0.831",
+    "@teambit/webpack": "0.0.831",
+    "@teambit/workspace": "0.0.831",
+    "@teambit/application": "0.0.473",
+    "@teambit/cli": "0.0.556",
+    "@teambit/generator": "0.0.831",
+    "@teambit/graphql": "0.0.831",
+    "@teambit/preview": "0.0.831",
+    "@teambit/compositions": "0.0.831",
+    "@teambit/ui": "0.0.831",
     "@teambit/webpack.modules.generate-style-loaders": "0.0.103",
     "@teambit/webpack.modules.style-regexps": "0.0.132",
     "@teambit/component-id": "0.0.405",
     "@teambit/bit-error": "0.0.394",
     "@teambit/toolbox.network.get-port": "0.0.113",
-    "@teambit/react.modules.prerenderer-puppeteer": "0.0.2",
     "@teambit/ui-foundation.ui.pages.static-error": "0.0.75",
-    "@teambit/config": "0.0.568"
+    "@teambit/config": "0.0.569",
+    "@teambit/compositions.ui.hooks.use-composition": "0.0.163",
+    "@teambit/react.ui.compositions-app": "0.0.2",
+    "@teambit/react.ui.docs-app": "0.0.184",
+    "@teambit/react.ui.highlighter.component-metadata.bit-component-meta": "0.0.21",
+    "@teambit/react.ui.highlighter-provider": "0.0.190",
+    "@teambit/react.eslint-config-bit-react": "0.0.630",
+    "@teambit/mdx.modules.mdx-loader": "0.0.492",
+    "@teambit/react.babel.bit-react-transformer": "0.0.504",
+    "@teambit/react.modules.prerenderer-puppeteer": "0.0.2"
   },
   "devDependencies": {
     "@types/react": "^17.0.8",
@@ -146,7 +146,7 @@
     "@teambit/react.content.react-overview": "1.95.0"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.338",
+    "@teambit/legacy": "1.0.339",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },

package/{preview-1661553386796.js → preview-1661830538885.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.828/dist/react.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.828/dist/react.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.831/dist/react.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.831/dist/react.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/templates/react-workspace-app/index.ts

@@ -1,20 +1,26 @@
 import { WorkspaceContext, WorkspaceTemplate } from '@teambit/generator';
+import { parse } from 'comment-json';
 import { generateFiles as generateCommonFiles } from '../workspace-common';
+import { DEFAULT_SCOPE_NAME } from '../workspace-common/constants';
 
 export const reactWorkspaceAppTemplate: WorkspaceTemplate = {
   name: 'react-app',
   description: 'EXPERIMENTAL. react workspace for an app',
   hidden: true,
+  appName: 'my-app',
   generateFiles: async (context: WorkspaceContext) => {
-    return generateCommonFiles(context);
+    const scope = context.defaultScope || DEFAULT_SCOPE_NAME;
+    const extensions = {
+      [`${scope}/apps/my-app`]: parse(`{}`),
+    };
+    return generateCommonFiles(context, extensions);
   },
   fork: () => {
     return [
-      { id: 'teambit.react/templates/apps/my-app', path: 'apps/my-app' },
-      { id: 'teambit.react/templates/envs/my-react', path: 'envs/my-react' },
-      { id: 'teambit.react/templates/themes/theme', path: 'themes/theme' },
-      { id: 'teambit.react/templates/styles/colors', path: 'styles/colors' },
-      { id: 'teambit.react/templates/ui/heading', path: 'ui/heading' },
+      { id: 'teambit.react/templates/apps/my-app', targetName: 'apps/my-app' },
+      // { id: 'teambit.react/templates/envs/my-react', targetName: 'envs/my-react' }, // TODO: uncomment when ready
+      { id: 'teambit.react/templates/themes/theme', targetName: 'themes/theme' },
+      { id: 'teambit.react/templates/pages/home', targetName: 'pages/home' },
     ];
   },
 };

package/templates/workspace-common/constants.ts

@@ -0,0 +1 @@
+export const DEFAULT_SCOPE_NAME = 'my-org.my-scope';

package/templates/workspace-common/files/workspace-config.ts

@@ -1,9 +1,10 @@
 import { WorkspaceContext } from '@teambit/generator';
 import { getWorkspaceConfigTemplateParsed, stringifyWorkspaceConfig } from '@teambit/config';
 import { parse, assign } from 'comment-json';
+import { DEFAULT_SCOPE_NAME } from '../constants';
 
-export async function workspaceConfig({ name, defaultScope }: WorkspaceContext) {
-  const scope = defaultScope || 'my-org.my-scope';
+export async function workspaceConfig({ name, defaultScope }: WorkspaceContext, extraConfig?: Record<string, any>) {
+  const scope = defaultScope || DEFAULT_SCOPE_NAME;
   const configParsed = await getWorkspaceConfigTemplateParsed();
   configParsed['teambit.workspace/workspace'].name = name;
   configParsed['teambit.workspace/workspace'].defaultScope = scope;
@@ -30,7 +31,11 @@ export async function workspaceConfig({ name, defaultScope }: WorkspaceContext)
     'teambit.workspace/variants': parse(`{}`),
   };
 
-  const configMerged = assign(configParsed, variants);
+  let configMerged = assign(configParsed, variants);
+
+  if (extraConfig) {
+    configMerged = assign(configMerged, extraConfig);
+  }
 
   return stringifyWorkspaceConfig(configMerged);
 }

package/templates/workspace-common/generate-files.ts

@@ -14,11 +14,14 @@ type GeneratedFile = {
   content: string;
 };
 
-export async function generateFiles(context: WorkspaceContext): Promise<GeneratedFile[]> {
+export async function generateFiles(
+  context: WorkspaceContext,
+  extraConfig?: Record<string, any>
+): Promise<GeneratedFile[]> {
   return [
     {
       relativePath: 'workspace.jsonc',
-      content: await workspaceConfig(context),
+      content: await workspaceConfig(context, extraConfig),
     },
     {
       relativePath: `.gitignore`,