@teambit/bundler 1.0.185 → 1.0.186

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/artifacts/__bit_junit.xml +1 -1
  2. package/artifacts/preview/teambit_compilation_bundler-preview.js +1 -1
  3. package/artifacts/schema.json +6 -6
  4. package/dist/dev-server.service.d.ts +1 -1
  5. package/dist/dev-server.service.js +11 -22
  6. package/dist/dev-server.service.js.map +1 -1
  7. package/dist/{preview-1709695009203.js → preview-1709781440634.js} +2 -2
  8. package/package.json +10 -10
  9. package/dev-server.service.tsx +0 -193
package/artifacts/__bit_junit.xml CHANGED
@@ -1,4 +1,4 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <testsuites tests="0" failures="0" errors="0" skipped="0">
3
- <testsuite name="teambit.compilation/bundler@1.0.185" tests="0" failures="0" errors="0" skipped="0"/>
3
+ <testsuite name="teambit.compilation/bundler@1.0.186" tests="0" failures="0" errors="0" skipped="0"/>
4
4
  </testsuites>
package/artifacts/preview/teambit_compilation_bundler-preview.js CHANGED
@@ -1 +1 @@
1
- !function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["teambit.compilation/bundler-preview"]=t():e["teambit.compilation/bundler-preview"]=t()}(self,(()=>(()=>{"use strict";var e={89286:(e,t,o)=>{var n={id:"teambit.compilation/bundler@1.0.185",homepage:"https://bit.cloud/teambit/compilation/bundler",exported:!0};function r(){const e=i(o(41594));return r=function(){return e},e}function i(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Logo=void 0,r.__bit_component=n,i.__bit_component=n;const p=()=>r().default.createElement("div",{style:{height:"100%",display:"flex",justifyContent:"center"}},r().default.createElement("img",{style:{width:70},src:"https://static.bit.dev/extensions-icons/bundler.svg"}));p.__bit_component=n,t.Logo=p},41594:e=>{e.exports=React}},t={};function o(n){var r=t[n];if(void 0!==r)return r.exports;var i=t[n]={exports:{}};return e[n](i,i.exports,o),i.exports}o.d=(e,t)=>{for(var n in t)o.o(t,n)&&!o.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var n={};return(()=>{o.r(n),o.d(n,{compositions:()=>l,compositions_metadata:()=>f,overview:()=>u});var e={};o.r(e),o.d(e,{default:()=>d});var t=o(89286);o(41594);const r=MdxJsReact,i=TeambitMdxUiMdxScopeContext;var p=["components"];function a(){return a=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var o=arguments[t];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(e[n]=o[n])}return e},a.apply(this,arguments)}var c={},s="wrapper";function d(e){var t=e.components,o=function(e,t){if(null==e)return{};var o,n,r=function(e,t){if(null==e)return{};var o,n,r={},i=Object.keys(e);for(n=0;n<i.length;n++)o=i[n],t.indexOf(o)>=0||(r[o]=e[o]);return r}(e,t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e);for(n=0;n<i.length;n++)o=i[n],t.indexOf(o)>=0||Object.prototype.propertyIsEnumerable.call(e,o)&&(r[o]=e[o])}return r}(e,p);return(0,r.mdx)(s,a({},c,o,{components:t,mdxType:"MDXLayout"}),(0,r.mdx)(i.MDXScopeProvider,{components:{},mdxType:"MDXScopeProvider"}))}d.isMDXComponent=!0;const l=[t],u=[e],f={compositions:[{displayName:"Logo",identifier:"Logo"}]}})(),n})()));
1
+ !function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["teambit.compilation/bundler-preview"]=t():e["teambit.compilation/bundler-preview"]=t()}(self,(()=>(()=>{"use strict";var e={25293:(e,t,o)=>{var n={id:"teambit.compilation/bundler@1.0.186",homepage:"https://bit.cloud/teambit/compilation/bundler",exported:!0};function r(){const e=i(o(41594));return r=function(){return e},e}function i(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.Logo=void 0,r.__bit_component=n,i.__bit_component=n;const p=()=>r().default.createElement("div",{style:{height:"100%",display:"flex",justifyContent:"center"}},r().default.createElement("img",{style:{width:70},src:"https://static.bit.dev/extensions-icons/bundler.svg"}));p.__bit_component=n,t.Logo=p},41594:e=>{e.exports=React}},t={};function o(n){var r=t[n];if(void 0!==r)return r.exports;var i=t[n]={exports:{}};return e[n](i,i.exports,o),i.exports}o.d=(e,t)=>{for(var n in t)o.o(t,n)&&!o.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var n={};return(()=>{o.r(n),o.d(n,{compositions:()=>l,compositions_metadata:()=>f,overview:()=>u});var e={};o.r(e),o.d(e,{default:()=>d});var t=o(25293);o(41594);const r=MdxJsReact,i=TeambitMdxUiMdxScopeContext;var p=["components"];function a(){return a=Object.assign?Object.assign.bind():function(e){for(var t=1;t<arguments.length;t++){var o=arguments[t];for(var n in o)Object.prototype.hasOwnProperty.call(o,n)&&(e[n]=o[n])}return e},a.apply(this,arguments)}var c={},s="wrapper";function d(e){var t=e.components,o=function(e,t){if(null==e)return{};var o,n,r=function(e,t){if(null==e)return{};var o,n,r={},i=Object.keys(e);for(n=0;n<i.length;n++)o=i[n],t.indexOf(o)>=0||(r[o]=e[o]);return r}(e,t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e);for(n=0;n<i.length;n++)o=i[n],t.indexOf(o)>=0||Object.prototype.propertyIsEnumerable.call(e,o)&&(r[o]=e[o])}return r}(e,p);return(0,r.mdx)(s,a({},c,o,{components:t,mdxType:"MDXLayout"}),(0,r.mdx)(i.MDXScopeProvider,{components:{},mdxType:"MDXScopeProvider"}))}d.isMDXComponent=!0;const l=[t],u=[e],f={compositions:[{displayName:"Logo",identifier:"Logo"}]}})(),n})()));
package/artifacts/schema.json CHANGED
@@ -687,7 +687,7 @@
687
687
  "_legacy": {
688
688
  "scope": "teambit.compilation",
689
689
  "name": "bundler",
690
- "version": "1.0.185"
690
+ "version": "1.0.186"
691
691
  },
692
692
  "_scope": "teambit.compilation"
693
693
  }
@@ -1083,7 +1083,7 @@
1083
1083
  "_legacy": {
1084
1084
  "scope": "teambit.compilation",
1085
1085
  "name": "bundler",
1086
- "version": "1.0.185"
1086
+ "version": "1.0.186"
1087
1087
  },
1088
1088
  "_scope": "teambit.compilation"
1089
1089
  }
@@ -4599,7 +4599,7 @@
4599
4599
  "_legacy": {
4600
4600
  "scope": "teambit.compilation",
4601
4601
  "name": "bundler",
4602
- "version": "1.0.185"
4602
+ "version": "1.0.186"
4603
4603
  },
4604
4604
  "_scope": "teambit.compilation"
4605
4605
  }
@@ -6842,7 +6842,7 @@
6842
6842
  "_legacy": {
6843
6843
  "scope": "teambit.compilation",
6844
6844
  "name": "bundler",
6845
- "version": "1.0.185"
6845
+ "version": "1.0.186"
6846
6846
  },
6847
6847
  "_scope": "teambit.compilation"
6848
6848
  }
@@ -9489,7 +9489,7 @@
9489
9489
  "_legacy": {
9490
9490
  "scope": "teambit.compilation",
9491
9491
  "name": "bundler",
9492
- "version": "1.0.185"
9492
+ "version": "1.0.186"
9493
9493
  },
9494
9494
  "_scope": "teambit.compilation"
9495
9495
  }
@@ -9659,7 +9659,7 @@
9659
9659
  "componentId": {
9660
9660
  "scope": "teambit.compilation",
9661
9661
  "name": "bundler",
9662
- "version": "1.0.185"
9662
+ "version": "1.0.186"
9663
9663
  },
9664
9664
  "taggedModuleExports": []
9665
9665
  }
package/dist/dev-server.service.d.ts CHANGED
@@ -52,7 +52,7 @@ export declare class DevServerService implements EnvService<ComponentServer, Dev
52
52
  * browser runtime slot
53
53
  */
54
54
  runtimeSlot: BrowserRuntimeSlot, devServerTransformerSlot: DevServerTransformerSlot);
55
- render(env: EnvDefinition, context: ExecutionContext[]): Promise<JSX.Element>;
55
+ render(env: EnvDefinition, context: ExecutionContext[]): Promise<string>;
56
56
  getDescriptor(environment: EnvDefinition, context?: ExecutionContext[]): Promise<DevServerDescriptor | undefined>;
57
57
  transform(env: Env, envContext: EnvContext): DevServiceTransformationMap | undefined;
58
58
  runOnce(contexts: ExecutionContext[], { dedicatedEnvDevServers }: DevServerServiceOptions): Promise<ComponentServer[]>;
package/dist/dev-server.service.js CHANGED
@@ -4,23 +4,16 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.DevServerService = void 0;
7
- function _lodash() {
8
- const data = require("lodash");
9
- _lodash = function () {
10
- return data;
11
- };
12
- return data;
13
- }
14
- function _react() {
15
- const data = _interopRequireDefault(require("react"));
16
- _react = function () {
7
+ function _chalk() {
8
+ const data = _interopRequireDefault(require("chalk"));
9
+ _chalk = function () {
17
10
  return data;
18
11
  };
19
12
  return data;
20
13
  }
21
- function _ink() {
22
- const data = require("ink");
23
- _ink = function () {
14
+ function _lodash() {
15
+ const data = require("lodash");
16
+ _lodash = function () {
24
17
  return data;
25
18
  };
26
19
  return data;
@@ -85,17 +78,13 @@ class DevServerService {
85
78
  }
86
79
  async render(env, context) {
87
80
  const descriptor = await this.getDescriptor(env, context);
88
- return /*#__PURE__*/_react().default.createElement(_ink().Text, {
89
- key: descriptor?.id
90
- }, /*#__PURE__*/_react().default.createElement(_ink().Text, {
91
- color: "cyan"
92
- }, "configured dev server: "), /*#__PURE__*/_react().default.createElement(_ink().Text, null, descriptor?.id, " (", descriptor?.displayName, " @ ", descriptor?.version, ")"), /*#__PURE__*/_react().default.createElement(_ink().Newline, null), /*#__PURE__*/_react().default.createElement(_ink().Text, {
93
- underline: true,
94
- color: "cyan"
95
- }, "dev server config:"), /*#__PURE__*/_react().default.createElement(_ink().Newline, null), /*#__PURE__*/_react().default.createElement(_ink().Text, null, (0, _cliHighlight().default)(descriptor?.config || '', {
81
+ const name = `${_chalk().default.green('configured dev server:')} ${descriptor?.id} (${descriptor?.displayName} @ ${descriptor?.version})`;
82
+ const configLabel = _chalk().default.green('dev server config:');
83
+ const configObj = descriptor?.config ? (0, _cliHighlight().default)(descriptor?.config, {
96
84
  language: 'javascript',
97
85
  ignoreIllegals: true
98
- })), /*#__PURE__*/_react().default.createElement(_ink().Newline, null));
86
+ }) : '';
87
+ return `${name}\n${configLabel}\n${configObj}`;
99
88
  }
100
89
  async getDescriptor(environment, context) {
101
90
  if (!environment.env.getDevServer || !context) return undefined;
package/dist/dev-server.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_lodash","data","require","_react","_interopRequireDefault","_ink","_cliHighlight","_path","_pMapSeries","_componentServer","_dedupEnvs","_getEntry","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","DevServerService","constructor","pubsub","dependencyResolver","runtimeSlot","devServerTransformerSlot","render","env","context","descriptor","getDescriptor","createElement","Text","id","color","displayName","version","Newline","underline","highlight","config","language","ignoreIllegals","environment","getDevServer","undefined","mergedContext","buildContext","devServer","icon","displayConfig","transform","envContext","preview","getDevEnvId","runOnce","contexts","dedicatedEnvDevServers","groupedEnvs","dedupEnvs","servers","pMapSeries","entries","contextList","mainContext","find","envDefinition","additionalContexts","filter","devServerContext","envRuntime","transformedDevServer","transformDevServer","envId","ComponentServer","mergeContext","getComponentsFromContexts","flatten","map","components","relatedContexts","ctx","concat","peers","getPreviewHostDependenciesFromEnv","hostRootDir","envAspectDefinition","aspectPath","assign","entry","getEntry","rootPath","publicPath","sep","hostDependencies","aliasHostDependencies","values","reduce","updatedDevServer","transformFn","exports"],"sources":["dev-server.service.tsx"],"sourcesContent":["import { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';\nimport { PubsubMain } from '@teambit/pubsub';\nimport { flatten } from 'lodash';\nimport React from 'react';\nimport { Text, Newline } from 'ink';\nimport { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport highlight from 'cli-highlight';\nimport { sep } from 'path';\nimport pMapSeries from 'p-map-series';\nimport { BrowserRuntimeSlot, DevServerTransformerSlot } from './bundler.main.runtime';\nimport { ComponentServer } from './component-server';\nimport { dedupEnvs } from './dedup-envs';\nimport { DevServer } from './dev-server';\nimport { DevServerContext } from './dev-server-context';\nimport { getEntry } from './get-entry';\n\nexport type DevServerServiceOptions = { dedicatedEnvDevServers?: string[] };\n\ntype DevServiceTransformationMap = ServiceTransformationMap & {\n /**\n * Required for `bit start`\n */\n getDevEnvId?: (context?: any) => string;\n\n /**\n * Returns and configures the dev server\n * Required for `bit start`\n */\n getDevServer?: (context: DevServerContext) => DevServer | Promise<DevServer>;\n};\n\nexport type DevServerDescriptor = {\n /**\n * id of the dev server (e.g. webpack)\n */\n id: string;\n\n /**\n * display name of the dev server (e.g. Webpack dev server)\n */\n displayName: string;\n\n /**\n * icon of the configured dev server.\n */\n icon: string;\n\n /**\n * string containing the config for display.\n */\n config: string;\n\n version?: string;\n};\n\nexport class DevServerService implements EnvService<ComponentServer, DevServerDescriptor> {\n name = 'dev server';\n\n constructor(\n private pubsub: PubsubMain,\n\n private dependencyResolver: DependencyResolverMain,\n\n /**\n * browser runtime slot\n */\n private runtimeSlot: BrowserRuntimeSlot,\n\n private devServerTransformerSlot: DevServerTransformerSlot\n ) {}\n\n async render(env: EnvDefinition, context: ExecutionContext[]) {\n const descriptor = await this.getDescriptor(env, context);\n return (\n <Text key={descriptor?.id}>\n <Text color=\"cyan\">configured dev server: </Text>\n <Text>\n {descriptor?.id} ({descriptor?.displayName} @ {descriptor?.version})\n </Text>\n <Newline />\n <Text underline color=\"cyan\">\n dev server config:\n </Text>\n <Newline />\n <Text>\n {/* refactor a separate component which highlights for cli */}\n {highlight(descriptor?.config || '', { language: 'javascript', ignoreIllegals: true })}\n </Text>\n <Newline />\n </Text>\n );\n }\n\n async getDescriptor(\n environment: EnvDefinition,\n context?: ExecutionContext[]\n ): Promise<DevServerDescriptor | undefined> {\n if (!environment.env.getDevServer || !context) return undefined;\n const mergedContext = await this.buildContext(context[0], []);\n const devServer: DevServer = environment.env.getDevServer(mergedContext);\n\n return {\n id: devServer.id || '',\n displayName: devServer.displayName || '',\n icon: devServer.icon || '',\n config: devServer.displayConfig ? devServer.displayConfig() : '',\n version: devServer.version ? devServer.version() : '?',\n };\n }\n\n transform(env: Env, envContext: EnvContext): DevServiceTransformationMap | undefined {\n // Old env\n if (!env?.preview) return undefined;\n const preview = env.preview()(envContext);\n\n return {\n getDevEnvId: () => {\n return preview.getDevEnvId();\n },\n getDevServer: (context) => {\n return preview.getDevServer(context)(envContext);\n },\n };\n }\n\n // async run(context: ExecutionContext): Promise<ComponentServer[]> {\n // const devServerContext = await this.buildContext(context);\n // const devServer: DevServer = context.env.getDevServer(devServerContext);\n // const port = await selectPort();\n // // TODO: refactor to replace with a component server instance.\n // return new ComponentServer(this.pubsub, context, port, devServer);\n // }\n\n async runOnce(\n contexts: ExecutionContext[],\n { dedicatedEnvDevServers }: DevServerServiceOptions\n ): Promise<ComponentServer[]> {\n const groupedEnvs = await dedupEnvs(contexts, this.dependencyResolver, dedicatedEnvDevServers);\n\n // TODO: (gilad) - change this back to promise all once we make the preview pre-bundle to run before that loop\n const servers = await pMapSeries(Object.entries(groupedEnvs), async ([id, contextList]) => {\n const mainContext = contextList.find((context) => context.envDefinition.id === id) || contextList[0];\n const additionalContexts = contextList.filter((context) => context.envDefinition.id !== id);\n\n const devServerContext = await this.buildContext(mainContext, additionalContexts);\n const devServer: DevServer = await devServerContext.envRuntime.env.getDevServer(devServerContext);\n const transformedDevServer: DevServer = this.transformDevServer(devServer, { envId: id });\n\n return new ComponentServer(this.pubsub, devServerContext, [3300, 3400], transformedDevServer);\n });\n\n return servers;\n }\n\n mergeContext() {}\n\n private getComponentsFromContexts(contexts: ExecutionContext[]) {\n return flatten(\n contexts.map((context) => {\n return context.components;\n })\n );\n }\n\n /**\n * builds the execution context for the dev server.\n */\n private async buildContext(\n context: ExecutionContext,\n additionalContexts: ExecutionContext[] = []\n ): Promise<DevServerContext> {\n context.relatedContexts = additionalContexts.map((ctx) => ctx.envDefinition.id);\n context.components = context.components.concat(this.getComponentsFromContexts(additionalContexts));\n const peers = await this.dependencyResolver.getPreviewHostDependenciesFromEnv(context.envDefinition.env);\n const hostRootDir = context.envRuntime.envAspectDefinition?.aspectPath;\n\n return Object.assign(context, {\n entry: await getEntry(context, this.runtimeSlot),\n // don't start with a leading \"/\" because it generates errors on Windows\n rootPath: `preview/${context.envRuntime.id}`,\n publicPath: `${sep}public`,\n hostRootDir,\n hostDependencies: peers,\n aliasHostDependencies: true,\n });\n }\n\n private transformDevServer(devServer: DevServer, { envId }: { envId: string }): DevServer {\n return this.devServerTransformerSlot\n .values()\n .reduce((updatedDevServer, transformFn) => transformFn(updatedDevServer, { envId }), devServer);\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"names":["_chalk","data","_interopRequireDefault","require","_lodash","_cliHighlight","_path","_pMapSeries","_componentServer","_dedupEnvs","_getEntry","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","t","i","_toPrimitive","String","r","e","Symbol","toPrimitive","call","TypeError","Number","DevServerService","constructor","pubsub","dependencyResolver","runtimeSlot","devServerTransformerSlot","render","env","context","descriptor","getDescriptor","name","chalk","green","id","displayName","version","configLabel","configObj","config","highlight","language","ignoreIllegals","environment","getDevServer","undefined","mergedContext","buildContext","devServer","icon","displayConfig","transform","envContext","preview","getDevEnvId","runOnce","contexts","dedicatedEnvDevServers","groupedEnvs","dedupEnvs","servers","pMapSeries","entries","contextList","mainContext","find","envDefinition","additionalContexts","filter","devServerContext","envRuntime","transformedDevServer","transformDevServer","envId","ComponentServer","mergeContext","getComponentsFromContexts","flatten","map","components","relatedContexts","ctx","concat","peers","getPreviewHostDependenciesFromEnv","hostRootDir","envAspectDefinition","aspectPath","assign","entry","getEntry","rootPath","publicPath","sep","hostDependencies","aliasHostDependencies","values","reduce","updatedDevServer","transformFn","exports"],"sources":["dev-server.service.ts"],"sourcesContent":["import { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';\nimport { PubsubMain } from '@teambit/pubsub';\nimport chalk from 'chalk';\nimport { flatten } from 'lodash';\nimport { DependencyResolverMain } from '@teambit/dependency-resolver';\nimport highlight from 'cli-highlight';\nimport { sep } from 'path';\nimport pMapSeries from 'p-map-series';\nimport { BrowserRuntimeSlot, DevServerTransformerSlot } from './bundler.main.runtime';\nimport { ComponentServer } from './component-server';\nimport { dedupEnvs } from './dedup-envs';\nimport { DevServer } from './dev-server';\nimport { DevServerContext } from './dev-server-context';\nimport { getEntry } from './get-entry';\n\nexport type DevServerServiceOptions = { dedicatedEnvDevServers?: string[] };\n\ntype DevServiceTransformationMap = ServiceTransformationMap & {\n /**\n * Required for `bit start`\n */\n getDevEnvId?: (context?: any) => string;\n\n /**\n * Returns and configures the dev server\n * Required for `bit start`\n */\n getDevServer?: (context: DevServerContext) => DevServer | Promise<DevServer>;\n};\n\nexport type DevServerDescriptor = {\n /**\n * id of the dev server (e.g. webpack)\n */\n id: string;\n\n /**\n * display name of the dev server (e.g. Webpack dev server)\n */\n displayName: string;\n\n /**\n * icon of the configured dev server.\n */\n icon: string;\n\n /**\n * string containing the config for display.\n */\n config: string;\n\n version?: string;\n};\n\nexport class DevServerService implements EnvService<ComponentServer, DevServerDescriptor> {\n name = 'dev server';\n\n constructor(\n private pubsub: PubsubMain,\n\n private dependencyResolver: DependencyResolverMain,\n\n /**\n * browser runtime slot\n */\n private runtimeSlot: BrowserRuntimeSlot,\n\n private devServerTransformerSlot: DevServerTransformerSlot\n ) {}\n\n async render(env: EnvDefinition, context: ExecutionContext[]) {\n const descriptor = await this.getDescriptor(env, context);\n const name = `${chalk.green('configured dev server:')} ${descriptor?.id} (${descriptor?.displayName} @ ${\n descriptor?.version\n })`;\n const configLabel = chalk.green('dev server config:');\n const configObj = descriptor?.config\n ? highlight(descriptor?.config, { language: 'javascript', ignoreIllegals: true })\n : '';\n return `${name}\\n${configLabel}\\n${configObj}`;\n }\n\n async getDescriptor(\n environment: EnvDefinition,\n context?: ExecutionContext[]\n ): Promise<DevServerDescriptor | undefined> {\n if (!environment.env.getDevServer || !context) return undefined;\n const mergedContext = await this.buildContext(context[0], []);\n const devServer: DevServer = environment.env.getDevServer(mergedContext);\n\n return {\n id: devServer.id || '',\n displayName: devServer.displayName || '',\n icon: devServer.icon || '',\n config: devServer.displayConfig ? devServer.displayConfig() : '',\n version: devServer.version ? devServer.version() : '?',\n };\n }\n\n transform(env: Env, envContext: EnvContext): DevServiceTransformationMap | undefined {\n // Old env\n if (!env?.preview) return undefined;\n const preview = env.preview()(envContext);\n\n return {\n getDevEnvId: () => {\n return preview.getDevEnvId();\n },\n getDevServer: (context) => {\n return preview.getDevServer(context)(envContext);\n },\n };\n }\n\n // async run(context: ExecutionContext): Promise<ComponentServer[]> {\n // const devServerContext = await this.buildContext(context);\n // const devServer: DevServer = context.env.getDevServer(devServerContext);\n // const port = await selectPort();\n // // TODO: refactor to replace with a component server instance.\n // return new ComponentServer(this.pubsub, context, port, devServer);\n // }\n\n async runOnce(\n contexts: ExecutionContext[],\n { dedicatedEnvDevServers }: DevServerServiceOptions\n ): Promise<ComponentServer[]> {\n const groupedEnvs = await dedupEnvs(contexts, this.dependencyResolver, dedicatedEnvDevServers);\n\n // TODO: (gilad) - change this back to promise all once we make the preview pre-bundle to run before that loop\n const servers = await pMapSeries(Object.entries(groupedEnvs), async ([id, contextList]) => {\n const mainContext = contextList.find((context) => context.envDefinition.id === id) || contextList[0];\n const additionalContexts = contextList.filter((context) => context.envDefinition.id !== id);\n\n const devServerContext = await this.buildContext(mainContext, additionalContexts);\n const devServer: DevServer = await devServerContext.envRuntime.env.getDevServer(devServerContext);\n const transformedDevServer: DevServer = this.transformDevServer(devServer, { envId: id });\n\n return new ComponentServer(this.pubsub, devServerContext, [3300, 3400], transformedDevServer);\n });\n\n return servers;\n }\n\n mergeContext() {}\n\n private getComponentsFromContexts(contexts: ExecutionContext[]) {\n return flatten(\n contexts.map((context) => {\n return context.components;\n })\n );\n }\n\n /**\n * builds the execution context for the dev server.\n */\n private async buildContext(\n context: ExecutionContext,\n additionalContexts: ExecutionContext[] = []\n ): Promise<DevServerContext> {\n context.relatedContexts = additionalContexts.map((ctx) => ctx.envDefinition.id);\n context.components = context.components.concat(this.getComponentsFromContexts(additionalContexts));\n const peers = await this.dependencyResolver.getPreviewHostDependenciesFromEnv(context.envDefinition.env);\n const hostRootDir = context.envRuntime.envAspectDefinition?.aspectPath;\n\n return Object.assign(context, {\n entry: await getEntry(context, this.runtimeSlot),\n // don't start with a leading \"/\" because it generates errors on Windows\n rootPath: `preview/${context.envRuntime.id}`,\n publicPath: `${sep}public`,\n hostRootDir,\n hostDependencies: peers,\n aliasHostDependencies: true,\n });\n }\n\n private transformDevServer(devServer: DevServer, { envId }: { envId: string }): DevServer {\n return this.devServerTransformerSlot\n .values()\n .reduce((updatedDevServer, transformFn) => transformFn(updatedDevServer, { envId }), devServer);\n }\n}\n"],"mappings":"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"}
package/dist/{preview-1709695009203.js → preview-1709781440634.js} RENAMED
@@ -1,5 +1,5 @@
1
- import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.compilation_bundler@1.0.185/dist/bundler.composition.js';
2
- import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.compilation_bundler@1.0.185/dist/bundler.docs.mdx';
1
+ import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.compilation_bundler@1.0.186/dist/bundler.composition.js';
2
+ import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.compilation_bundler@1.0.186/dist/bundler.docs.mdx';
3
3
 
4
4
  export const compositions = [compositions_0];
5
5
  export const overview = [overview_0];
package/package.json CHANGED
@@ -1,26 +1,26 @@
1
1
  {
2
2
  "name": "@teambit/bundler",
3
- "version": "1.0.185",
3
+ "version": "1.0.186",
4
4
  "homepage": "https://bit.cloud/teambit/compilation/bundler",
5
5
  "main": "dist/index.js",
6
6
  "componentId": {
7
7
  "scope": "teambit.compilation",
8
8
  "name": "bundler",
9
- "version": "1.0.185"
9
+ "version": "1.0.186"
10
10
  },
11
11
  "dependencies": {
12
+ "chalk": "2.4.2",
12
13
  "cli-highlight": "2.1.9",
13
- "ink": "3.2.0",
14
14
  "lodash": "4.17.21",
15
15
  "p-map-series": "2.1.0",
16
16
  "@teambit/harmony": "0.4.6",
17
- "@teambit/envs": "1.0.185",
18
- "@teambit/builder": "1.0.185",
19
- "@teambit/component": "1.0.185",
20
- "@teambit/cli": "0.0.853",
21
- "@teambit/dependency-resolver": "1.0.185",
22
- "@teambit/graphql": "1.0.185",
23
- "@teambit/pubsub": "1.0.185",
17
+ "@teambit/envs": "1.0.186",
18
+ "@teambit/builder": "1.0.186",
19
+ "@teambit/component": "1.0.186",
20
+ "@teambit/cli": "0.0.854",
21
+ "@teambit/dependency-resolver": "1.0.186",
22
+ "@teambit/graphql": "1.0.186",
23
+ "@teambit/pubsub": "1.0.186",
24
24
  "@teambit/toolbox.network.get-port": "1.0.6"
25
25
  },
26
26
  "devDependencies": {
package/dev-server.service.tsx DELETED
@@ -1,193 +0,0 @@
1
- import { EnvService, ExecutionContext, EnvDefinition, Env, EnvContext, ServiceTransformationMap } from '@teambit/envs';
2
- import { PubsubMain } from '@teambit/pubsub';
3
- import { flatten } from 'lodash';
4
- import React from 'react';
5
- import { Text, Newline } from 'ink';
6
- import { DependencyResolverMain } from '@teambit/dependency-resolver';
7
- import highlight from 'cli-highlight';
8
- import { sep } from 'path';
9
- import pMapSeries from 'p-map-series';
10
- import { BrowserRuntimeSlot, DevServerTransformerSlot } from './bundler.main.runtime';
11
- import { ComponentServer } from './component-server';
12
- import { dedupEnvs } from './dedup-envs';
13
- import { DevServer } from './dev-server';
14
- import { DevServerContext } from './dev-server-context';
15
- import { getEntry } from './get-entry';
16
-
17
- export type DevServerServiceOptions = { dedicatedEnvDevServers?: string[] };
18
-
19
- type DevServiceTransformationMap = ServiceTransformationMap & {
20
- /**
21
- * Required for `bit start`
22
- */
23
- getDevEnvId?: (context?: any) => string;
24
-
25
- /**
26
- * Returns and configures the dev server
27
- * Required for `bit start`
28
- */
29
- getDevServer?: (context: DevServerContext) => DevServer | Promise<DevServer>;
30
- };
31
-
32
- export type DevServerDescriptor = {
33
- /**
34
- * id of the dev server (e.g. webpack)
35
- */
36
- id: string;
37
-
38
- /**
39
- * display name of the dev server (e.g. Webpack dev server)
40
- */
41
- displayName: string;
42
-
43
- /**
44
- * icon of the configured dev server.
45
- */
46
- icon: string;
47
-
48
- /**
49
- * string containing the config for display.
50
- */
51
- config: string;
52
-
53
- version?: string;
54
- };
55
-
56
- export class DevServerService implements EnvService<ComponentServer, DevServerDescriptor> {
57
- name = 'dev server';
58
-
59
- constructor(
60
- private pubsub: PubsubMain,
61
-
62
- private dependencyResolver: DependencyResolverMain,
63
-
64
- /**
65
- * browser runtime slot
66
- */
67
- private runtimeSlot: BrowserRuntimeSlot,
68
-
69
- private devServerTransformerSlot: DevServerTransformerSlot
70
- ) {}
71
-
72
- async render(env: EnvDefinition, context: ExecutionContext[]) {
73
- const descriptor = await this.getDescriptor(env, context);
74
- return (
75
- <Text key={descriptor?.id}>
76
- <Text color="cyan">configured dev server: </Text>
77
- <Text>
78
- {descriptor?.id} ({descriptor?.displayName} @ {descriptor?.version})
79
- </Text>
80
- <Newline />
81
- <Text underline color="cyan">
82
- dev server config:
83
- </Text>
84
- <Newline />
85
- <Text>
86
- {/* refactor a separate component which highlights for cli */}
87
- {highlight(descriptor?.config || '', { language: 'javascript', ignoreIllegals: true })}
88
- </Text>
89
- <Newline />
90
- </Text>
91
- );
92
- }
93
-
94
- async getDescriptor(
95
- environment: EnvDefinition,
96
- context?: ExecutionContext[]
97
- ): Promise<DevServerDescriptor | undefined> {
98
- if (!environment.env.getDevServer || !context) return undefined;
99
- const mergedContext = await this.buildContext(context[0], []);
100
- const devServer: DevServer = environment.env.getDevServer(mergedContext);
101
-
102
- return {
103
- id: devServer.id || '',
104
- displayName: devServer.displayName || '',
105
- icon: devServer.icon || '',
106
- config: devServer.displayConfig ? devServer.displayConfig() : '',
107
- version: devServer.version ? devServer.version() : '?',
108
- };
109
- }
110
-
111
- transform(env: Env, envContext: EnvContext): DevServiceTransformationMap | undefined {
112
- // Old env
113
- if (!env?.preview) return undefined;
114
- const preview = env.preview()(envContext);
115
-
116
- return {
117
- getDevEnvId: () => {
118
- return preview.getDevEnvId();
119
- },
120
- getDevServer: (context) => {
121
- return preview.getDevServer(context)(envContext);
122
- },
123
- };
124
- }
125
-
126
- // async run(context: ExecutionContext): Promise<ComponentServer[]> {
127
- // const devServerContext = await this.buildContext(context);
128
- // const devServer: DevServer = context.env.getDevServer(devServerContext);
129
- // const port = await selectPort();
130
- // // TODO: refactor to replace with a component server instance.
131
- // return new ComponentServer(this.pubsub, context, port, devServer);
132
- // }
133
-
134
- async runOnce(
135
- contexts: ExecutionContext[],
136
- { dedicatedEnvDevServers }: DevServerServiceOptions
137
- ): Promise<ComponentServer[]> {
138
- const groupedEnvs = await dedupEnvs(contexts, this.dependencyResolver, dedicatedEnvDevServers);
139
-
140
- // TODO: (gilad) - change this back to promise all once we make the preview pre-bundle to run before that loop
141
- const servers = await pMapSeries(Object.entries(groupedEnvs), async ([id, contextList]) => {
142
- const mainContext = contextList.find((context) => context.envDefinition.id === id) || contextList[0];
143
- const additionalContexts = contextList.filter((context) => context.envDefinition.id !== id);
144
-
145
- const devServerContext = await this.buildContext(mainContext, additionalContexts);
146
- const devServer: DevServer = await devServerContext.envRuntime.env.getDevServer(devServerContext);
147
- const transformedDevServer: DevServer = this.transformDevServer(devServer, { envId: id });
148
-
149
- return new ComponentServer(this.pubsub, devServerContext, [3300, 3400], transformedDevServer);
150
- });
151
-
152
- return servers;
153
- }
154
-
155
- mergeContext() {}
156
-
157
- private getComponentsFromContexts(contexts: ExecutionContext[]) {
158
- return flatten(
159
- contexts.map((context) => {
160
- return context.components;
161
- })
162
- );
163
- }
164
-
165
- /**
166
- * builds the execution context for the dev server.
167
- */
168
- private async buildContext(
169
- context: ExecutionContext,
170
- additionalContexts: ExecutionContext[] = []
171
- ): Promise<DevServerContext> {
172
- context.relatedContexts = additionalContexts.map((ctx) => ctx.envDefinition.id);
173
- context.components = context.components.concat(this.getComponentsFromContexts(additionalContexts));
174
- const peers = await this.dependencyResolver.getPreviewHostDependenciesFromEnv(context.envDefinition.env);
175
- const hostRootDir = context.envRuntime.envAspectDefinition?.aspectPath;
176
-
177
- return Object.assign(context, {
178
- entry: await getEntry(context, this.runtimeSlot),
179
- // don't start with a leading "/" because it generates errors on Windows
180
- rootPath: `preview/${context.envRuntime.id}`,
181
- publicPath: `${sep}public`,
182
- hostRootDir,
183
- hostDependencies: peers,
184
- aliasHostDependencies: true,
185
- });
186
- }
187
-
188
- private transformDevServer(devServer: DevServer, { envId }: { envId: string }): DevServer {
189
- return this.devServerTransformerSlot
190
- .values()
191
- .reduce((updatedDevServer, transformFn) => transformFn(updatedDevServer, { envId }), devServer);
192
- }
193
- }