@teambit/react 0.0.827 → 0.0.830

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/react",
-  "version": "0.0.827",
+  "version": "0.0.830",
   "homepage": "https://bit.dev/teambit/react/react",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.react",
     "name": "react",
-    "version": "0.0.827"
+    "version": "0.0.830"
   },
   "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",
@@ -84,36 +84,36 @@
     "@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.827",
-    "@teambit/bundler": "0.0.827",
-    "@teambit/compiler": "0.0.827",
+    "@teambit/builder": "0.0.830",
+    "@teambit/bundler": "0.0.830",
+    "@teambit/compiler": "0.0.830",
     "@teambit/component.modules.component-url": "0.0.128",
-    "@teambit/component": "0.0.827",
-    "@teambit/dependency-resolver": "0.0.827",
-    "@teambit/envs": "0.0.827",
-    "@teambit/eslint": "0.0.827",
-    "@teambit/formatter": "0.0.378",
-    "@teambit/jest": "0.0.827",
-    "@teambit/linter": "0.0.827",
+    "@teambit/component": "0.0.830",
+    "@teambit/dependency-resolver": "0.0.830",
+    "@teambit/envs": "0.0.830",
+    "@teambit/eslint": "0.0.830",
+    "@teambit/formatter": "0.0.381",
+    "@teambit/jest": "0.0.830",
+    "@teambit/linter": "0.0.830",
     "@teambit/logger": "0.0.648",
-    "@teambit/pkg": "0.0.827",
-    "@teambit/prettier": "0.0.378",
+    "@teambit/pkg": "0.0.830",
+    "@teambit/prettier": "0.0.381",
     "@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.827",
-    "@teambit/tester": "0.0.827",
-    "@teambit/typescript": "0.0.827",
-    "@teambit/webpack": "0.0.827",
-    "@teambit/workspace": "0.0.827",
-    "@teambit/application": "0.0.469",
+    "@teambit/schema": "0.0.830",
+    "@teambit/tester": "0.0.830",
+    "@teambit/typescript": "0.0.830",
+    "@teambit/webpack": "0.0.830",
+    "@teambit/workspace": "0.0.830",
+    "@teambit/application": "0.0.472",
     "@teambit/cli": "0.0.555",
-    "@teambit/generator": "0.0.827",
-    "@teambit/graphql": "0.0.827",
-    "@teambit/preview": "0.0.827",
+    "@teambit/generator": "0.0.830",
+    "@teambit/graphql": "0.0.830",
+    "@teambit/preview": "0.0.830",
     "@teambit/react.ui.highlighter-provider": "0.0.190",
-    "@teambit/compositions": "0.0.827",
-    "@teambit/ui": "0.0.827",
+    "@teambit/compositions": "0.0.830",
+    "@teambit/ui": "0.0.830",
     "@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",

package/{preview-1661484705674.js → preview-1661759589772.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.827/dist/react.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.827/dist/react.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.830/dist/react.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.react_react@0.0.830/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`,

package/artifacts/env-template/public/peers.3ceeaa7278c391d0a2d8.js

@@ -1 +0,0 @@
-(()=>{"use strict";var __webpack_modules__={8816:(__unused_webpack_module,__unused_webpack___webpack_exports__,__webpack_require__2)=>{var react__WEBPACK_IMPORTED_MODULE_0___namespace_cache,react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache,react__WEBPACK_IMPORTED_MODULE_0__=__webpack_require__2(67294),react_dom__WEBPACK_IMPORTED_MODULE_1__=__webpack_require__2(73935),_teambit_mdx_ui_mdx_scope_context__WEBPACK_IMPORTED_MODULE_2__=__webpack_require__2(38168),_mdx_js_react__WEBPACK_IMPORTED_MODULE_3__=__webpack_require__2(3905);const globalObj=window;guard("React",react__WEBPACK_IMPORTED_MODULE_0___namespace_cache||(react__WEBPACK_IMPORTED_MODULE_0___namespace_cache=__webpack_require__2.t(react__WEBPACK_IMPORTED_MODULE_0__,2))),guard("ReactDom",react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache||(react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache=__webpack_require__2.t(react_dom__WEBPACK_IMPORTED_MODULE_1__,2))),guard("TeambitMdxUiMdxScopeContext",_teambit_mdx_ui_mdx_scope_context__WEBPACK_IMPORTED_MODULE_2__),guard("MdxJsReact",_mdx_js_react__WEBPACK_IMPORTED_MODULE_3__),globalObj.React=react__WEBPACK_IMPORTED_MODULE_0___namespace_cache||(react__WEBPACK_IMPORTED_MODULE_0___namespace_cache=__webpack_require__2.t(react__WEBPACK_IMPORTED_MODULE_0__,2)),globalObj.ReactDom=react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache||(react_dom__WEBPACK_IMPORTED_MODULE_1___namespace_cache=__webpack_require__2.t(react_dom__WEBPACK_IMPORTED_MODULE_1__,2)),globalObj.TeambitMdxUiMdxScopeContext=_teambit_mdx_ui_mdx_scope_context__WEBPACK_IMPORTED_MODULE_2__,globalObj.MdxJsReact=_mdx_js_react__WEBPACK_IMPORTED_MODULE_3__;function guard(property,expected){var existing=globalObj[property];if(existing===expected&&expected!==void 0)console.warn('[expose-peers] "'+property+'" already exists in global scope, but with correct value');else if(existing!==void 0)throw new Error('[expose-peers] "'+property+'" already exists in the global scope, cannot overwrite')}}},__webpack_module_cache__={};function __webpack_require__(moduleId){var cachedModule=__webpack_module_cache__[moduleId];if(cachedModule!==void 0)return cachedModule.exports;var module=__webpack_module_cache__[moduleId]={id:moduleId,loaded:!1,exports:{}};return __webpack_modules__[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.loaded=!0,module.exports}__webpack_require__.m=__webpack_modules__,(()=>{var deferred=[];__webpack_require__.O=(result,chunkIds,fn,priority)=>{if(chunkIds){priority=priority||0;for(var i=deferred.length;i>0&&deferred[i-1][2]>priority;i--)deferred[i]=deferred[i-1];deferred[i]=[chunkIds,fn,priority];return}for(var notFulfilled=1/0,i=0;i<deferred.length;i++){for(var[chunkIds,fn,priority]=deferred[i],fulfilled=!0,j=0;j<chunkIds.length;j++)(priority&!1||notFulfilled>=priority)&&Object.keys(__webpack_require__.O).every(key=>__webpack_require__.O[key](chunkIds[j]))?chunkIds.splice(j--,1):(fulfilled=!1,priority<notFulfilled&&(notFulfilled=priority));if(fulfilled){deferred.splice(i--,1);var r=fn();r!==void 0&&(result=r)}}return result}})(),__webpack_require__.n=module=>{var getter=module&&module.__esModule?()=>module.default:()=>module;return __webpack_require__.d(getter,{a:getter}),getter},(()=>{var getProto=Object.getPrototypeOf?obj=>Object.getPrototypeOf(obj):obj=>obj.__proto__,leafPrototypes;__webpack_require__.t=function(value,mode){if(mode&1&&(value=this(value)),mode&8||typeof value=="object"&&value&&(mode&4&&value.__esModule||mode&16&&typeof value.then=="function"))return value;var ns=Object.create(null);__webpack_require__.r(ns);var def={};leafPrototypes=leafPrototypes||[null,getProto({}),getProto([]),getProto(getProto)];for(var current=mode&2&&value;typeof current=="object"&&!~leafPrototypes.indexOf(current);current=getProto(current))Object.getOwnPropertyNames(current).forEach(key=>def[key]=()=>value[key]);return def.default=()=>value,__webpack_require__.d(ns,def),ns}})(),__webpack_require__.d=(exports,definition)=>{for(var key in definition)__webpack_require__.o(definition,key)&&!__webpack_require__.o(exports,key)&&Object.defineProperty(exports,key,{enumerable:!0,get:definition[key]})},__webpack_require__.g=function(){if(typeof globalThis=="object")return globalThis;try{return this||new Function("return this")()}catch{if(typeof window=="object")return window}}(),__webpack_require__.o=(obj,prop)=>Object.prototype.hasOwnProperty.call(obj,prop),__webpack_require__.r=exports=>{typeof Symbol<"u"&&Symbol.toStringTag&&Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(exports,"__esModule",{value:!0})},__webpack_require__.nmd=module=>(module.paths=[],module.children||(module.children=[]),module),(()=>{var installedChunks={703:0};__webpack_require__.O.j=chunkId=>installedChunks[chunkId]===0;var webpackJsonpCallback=(parentChunkLoadingFunction,data)=>{var[chunkIds,moreModules,runtime]=data,moduleId,chunkId,i=0;if(chunkIds.some(id=>installedChunks[id]!==0)){for(moduleId in moreModules)__webpack_require__.o(moreModules,moduleId)&&(__webpack_require__.m[moduleId]=moreModules[moduleId]);if(runtime)var result=runtime(__webpack_require__)}for(parentChunkLoadingFunction&&parentChunkLoadingFunction(data);i<chunkIds.length;i++)chunkId=chunkIds[i],__webpack_require__.o(installedChunks,chunkId)&&installedChunks[chunkId]&&installedChunks[chunkId][0](),installedChunks[chunkIds[i]]=0;return __webpack_require__.O(result)},chunkLoadingGlobal=self.__loadChunks_EnvTemplate=self.__loadChunks_EnvTemplate||[];chunkLoadingGlobal.forEach(webpackJsonpCallback.bind(null,0)),chunkLoadingGlobal.push=webpackJsonpCallback.bind(null,chunkLoadingGlobal.push.bind(chunkLoadingGlobal))})();var __webpack_exports__=__webpack_require__.O(void 0,[244],()=>__webpack_require__(8816));__webpack_exports__=__webpack_require__.O(__webpack_exports__)})();