@teambit/aspect 0.0.627 → 0.0.632

package/dist/aspect.main.runtime.d.ts

@@ -1,6 +1,6 @@
 import { AspectLoaderMain } from '@teambit/aspect-loader';
 import { BuilderMain } from '@teambit/builder';
-import { EnvsMain, EnvTransformer } from '@teambit/envs';
+import { Environment, EnvsMain, EnvTransformer } from '@teambit/envs';
 import { ReactMain } from '@teambit/react';
 import { GeneratorMain } from '@teambit/generator';
 import { BabelMain } from '@teambit/babel';
@@ -13,7 +13,7 @@ export declare class AspectMain {
     /**
      * compose your own aspect environment.
      */
-    compose(transformers?: EnvTransformer[]): import("@teambit/envs").Environment;
+    compose(transformers?: EnvTransformer[], targetEnv?: Environment): Environment;
     static runtime: import("@teambit/harmony").RuntimeDefinition;
     static dependencies: import("@teambit/harmony").Aspect[];
     static provider([react, envs, builder, aspectLoader, compiler, babel, generator]: [

package/dist/aspect.main.runtime.js

@@ -163,8 +163,8 @@ class AspectMain {
    */
 
 
-  compose(transformers = []) {
-    return this.envs.compose(this.aspectEnv, transformers);
+  compose(transformers = [], targetEnv = {}) {
+    return this.envs.compose(this.envs.merge(targetEnv, this.aspectEnv), transformers);
   }
 
   static async provider([react, envs, builder, aspectLoader, compiler, babel, generator]) {
@@ -186,7 +186,7 @@ class AspectMain {
 
     const tsCompiler = react.env.getCompiler([transformer]);
     const compilerTasksOverride = react.overrideCompilerTasks([compiler.createTask('BabelCompiler', babelCompiler), compiler.createTask('TypescriptCompiler', tsCompiler)]);
-    const aspectEnv = react.compose([compilerOverride, compilerTasksOverride], new (_aspect2().AspectEnv)(react.reactEnv));
+    const aspectEnv = react.compose([compilerOverride, compilerTasksOverride], new (_aspect2().AspectEnv)(react.reactEnv, aspectLoader));
     const coreExporterTask = new (_coreExporter().CoreExporterTask)(aspectEnv, aspectLoader);
 
     if (!__dirname.includes('@teambit/bit')) {

package/dist/aspect.main.runtime.js.map

@@ -1 +1 @@
-{"version":3,"sources":["aspect.main.runtime.ts"],"names":["tsconfig","require","AspectMain","constructor","aspectEnv","envs","compose","transformers","provider","react","builder","aspectLoader","compiler","babel","generator","babelCompiler","createCompiler","babelTransformOptions","babelConfig","distDir","distGlobPatterns","compilerOverride","override","getCompiler","transformer","config","mergeTsConfig","setArtifactName","setDistGlobPatterns","setShouldCopyNonSupportedFiles","tsCompiler","env","compilerTasksOverride","overrideCompilerTasks","createTask","AspectEnv","reactEnv","coreExporterTask","CoreExporterTask","__dirname","includes","registerBuildTasks","registerEnv","registerComponentTemplate","aspectTemplate","MainRuntime","ReactAspect","EnvsAspect","BuilderAspect","AspectLoaderAspect","CompilerAspect","BabelAspect","GeneratorAspect","AspectAspect","addRuntime"],"mappings":"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","sourcesContent":["import { AspectLoaderAspect, AspectLoaderMain } from '@teambit/aspect-loader';\nimport { BuilderAspect, BuilderMain } from '@teambit/builder';\nimport { MainRuntime } from '@teambit/cli';\nimport { EnvsAspect, EnvsMain, EnvTransformer } from '@teambit/envs';\nimport { ReactAspect, ReactMain } from '@teambit/react';\nimport { GeneratorAspect, GeneratorMain } from '@teambit/generator';\nimport { BabelAspect, BabelMain } from '@teambit/babel';\nimport { CompilerAspect, CompilerMain } from '@teambit/compiler';\nimport { AspectAspect } from './aspect.aspect';\nimport { AspectEnv } from './aspect.env';\nimport { CoreExporterTask } from './core-exporter.task';\nimport { aspectTemplate } from './templates/aspect';\nimport { babelConfig } from './babel/babel-config';\n\nconst tsconfig = require('./typescript/tsconfig.json');\n\nexport class AspectMain {\n  constructor(readonly aspectEnv: AspectEnv, private envs: EnvsMain) {}\n\n  /**\n   * compose your own aspect environment.\n   */\n  compose(transformers: EnvTransformer[] = []) {\n    return this.envs.compose(this.aspectEnv, transformers);\n  }\n\n  static runtime = MainRuntime;\n  static dependencies = [\n    ReactAspect,\n    EnvsAspect,\n    BuilderAspect,\n    AspectLoaderAspect,\n    CompilerAspect,\n    BabelAspect,\n    GeneratorAspect,\n  ];\n\n  static async provider([react, envs, builder, aspectLoader, compiler, babel, generator]: [\n    ReactMain,\n    EnvsMain,\n    BuilderMain,\n    AspectLoaderMain,\n    CompilerMain,\n    BabelMain,\n    GeneratorMain\n  ]) {\n    const babelCompiler = babel.createCompiler({\n      babelTransformOptions: babelConfig,\n      distDir: 'dist',\n      distGlobPatterns: [`dist/**`, `!dist/**/*.d.ts`, `!dist/tsconfig.tsbuildinfo`],\n    });\n    const compilerOverride = envs.override({\n      getCompiler: () => {\n        return babelCompiler;\n      },\n    });\n\n    const transformer = (config) => {\n      config\n        .mergeTsConfig(tsconfig)\n        .setArtifactName('declaration')\n        .setDistGlobPatterns([`dist/**/*.d.ts`])\n        .setShouldCopyNonSupportedFiles(false);\n      return config;\n    };\n    const tsCompiler = react.env.getCompiler([transformer]);\n\n    const compilerTasksOverride = react.overrideCompilerTasks([\n      compiler.createTask('BabelCompiler', babelCompiler),\n      compiler.createTask('TypescriptCompiler', tsCompiler),\n    ]);\n\n    const aspectEnv = react.compose([compilerOverride, compilerTasksOverride], new AspectEnv(react.reactEnv));\n\n    const coreExporterTask = new CoreExporterTask(aspectEnv, aspectLoader);\n    if (!__dirname.includes('@teambit/bit')) {\n      builder.registerBuildTasks([coreExporterTask]);\n    }\n\n    envs.registerEnv(aspectEnv);\n    generator.registerComponentTemplate([aspectTemplate]);\n    return new AspectMain(aspectEnv as AspectEnv, envs);\n  }\n}\n\nAspectAspect.addRuntime(AspectMain);\n"]}
+{"version":3,"sources":["aspect.main.runtime.ts"],"names":["tsconfig","require","AspectMain","constructor","aspectEnv","envs","compose","transformers","targetEnv","merge","provider","react","builder","aspectLoader","compiler","babel","generator","babelCompiler","createCompiler","babelTransformOptions","babelConfig","distDir","distGlobPatterns","compilerOverride","override","getCompiler","transformer","config","mergeTsConfig","setArtifactName","setDistGlobPatterns","setShouldCopyNonSupportedFiles","tsCompiler","env","compilerTasksOverride","overrideCompilerTasks","createTask","AspectEnv","reactEnv","coreExporterTask","CoreExporterTask","__dirname","includes","registerBuildTasks","registerEnv","registerComponentTemplate","aspectTemplate","MainRuntime","ReactAspect","EnvsAspect","BuilderAspect","AspectLoaderAspect","CompilerAspect","BabelAspect","GeneratorAspect","AspectAspect","addRuntime"],"mappings":"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","sourcesContent":["import { AspectLoaderAspect, AspectLoaderMain } from '@teambit/aspect-loader';\nimport { BuilderAspect, BuilderMain } from '@teambit/builder';\nimport { MainRuntime } from '@teambit/cli';\nimport { Environment, EnvsAspect, EnvsMain, EnvTransformer } from '@teambit/envs';\nimport { ReactAspect, ReactMain } from '@teambit/react';\nimport { GeneratorAspect, GeneratorMain } from '@teambit/generator';\nimport { BabelAspect, BabelMain } from '@teambit/babel';\nimport { CompilerAspect, CompilerMain } from '@teambit/compiler';\nimport { AspectAspect } from './aspect.aspect';\nimport { AspectEnv } from './aspect.env';\nimport { CoreExporterTask } from './core-exporter.task';\nimport { aspectTemplate } from './templates/aspect';\nimport { babelConfig } from './babel/babel-config';\n\nconst tsconfig = require('./typescript/tsconfig.json');\n\nexport class AspectMain {\n  constructor(readonly aspectEnv: AspectEnv, private envs: EnvsMain) {}\n\n  /**\n   * compose your own aspect environment.\n   */\n  compose(transformers: EnvTransformer[] = [], targetEnv: Environment = {}) {\n    return this.envs.compose(this.envs.merge(targetEnv, this.aspectEnv), transformers);\n  }\n\n  static runtime = MainRuntime;\n  static dependencies = [\n    ReactAspect,\n    EnvsAspect,\n    BuilderAspect,\n    AspectLoaderAspect,\n    CompilerAspect,\n    BabelAspect,\n    GeneratorAspect,\n  ];\n\n  static async provider([react, envs, builder, aspectLoader, compiler, babel, generator]: [\n    ReactMain,\n    EnvsMain,\n    BuilderMain,\n    AspectLoaderMain,\n    CompilerMain,\n    BabelMain,\n    GeneratorMain\n  ]) {\n    const babelCompiler = babel.createCompiler({\n      babelTransformOptions: babelConfig,\n      distDir: 'dist',\n      distGlobPatterns: [`dist/**`, `!dist/**/*.d.ts`, `!dist/tsconfig.tsbuildinfo`],\n    });\n    const compilerOverride = envs.override({\n      getCompiler: () => {\n        return babelCompiler;\n      },\n    });\n\n    const transformer = (config) => {\n      config\n        .mergeTsConfig(tsconfig)\n        .setArtifactName('declaration')\n        .setDistGlobPatterns([`dist/**/*.d.ts`])\n        .setShouldCopyNonSupportedFiles(false);\n      return config;\n    };\n    const tsCompiler = react.env.getCompiler([transformer]);\n\n    const compilerTasksOverride = react.overrideCompilerTasks([\n      compiler.createTask('BabelCompiler', babelCompiler),\n      compiler.createTask('TypescriptCompiler', tsCompiler),\n    ]);\n\n    const aspectEnv = react.compose(\n      [compilerOverride, compilerTasksOverride],\n      new AspectEnv(react.reactEnv, aspectLoader)\n    );\n\n    const coreExporterTask = new CoreExporterTask(aspectEnv, aspectLoader);\n    if (!__dirname.includes('@teambit/bit')) {\n      builder.registerBuildTasks([coreExporterTask]);\n    }\n\n    envs.registerEnv(aspectEnv);\n    generator.registerComponentTemplate([aspectTemplate]);\n    return new AspectMain(aspectEnv as AspectEnv, envs);\n  }\n}\n\nAspectAspect.addRuntime(AspectMain);\n"]}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/aspect",
-  "version": "0.0.627",
+  "version": "0.0.632",
   "homepage": "https://bit.dev/teambit/harmony/aspect",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.harmony",
     "name": "aspect",
-    "version": "0.0.627"
+    "version": "0.0.632"
   },
   "dependencies": {
     "@teambit/harmony": "0.2.11",
@@ -24,19 +24,19 @@
     "@babel/plugin-proposal-class-properties": "7.12.13",
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
-    "@teambit/compiler": "0.0.627",
-    "@teambit/envs": "0.0.627",
-    "@teambit/react": "0.0.627",
-    "@teambit/aspect-loader": "0.0.627",
-    "@teambit/babel": "0.0.627",
-    "@teambit/builder": "0.0.627",
-    "@teambit/cli": "0.0.431",
-    "@teambit/generator": "0.0.627",
-    "@teambit/compositions": "0.0.627",
+    "@teambit/aspect-loader": "0.0.632",
+    "@teambit/builder": "0.0.632",
+    "@teambit/compiler": "0.0.632",
+    "@teambit/envs": "0.0.632",
+    "@teambit/react": "0.0.632",
+    "@teambit/babel": "0.0.632",
+    "@teambit/cli": "0.0.434",
+    "@teambit/generator": "0.0.632",
+    "@teambit/compositions": "0.0.632",
     "@teambit/design.ui.empty-box": "0.0.353",
-    "@teambit/tester": "0.0.627",
-    "@teambit/ui": "0.0.627",
-    "@teambit/isolator": "0.0.627"
+    "@teambit/tester": "0.0.632",
+    "@teambit/ui": "0.0.632",
+    "@teambit/isolator": "0.0.632"
   },
   "devDependencies": {
     "@types/react": "^17.0.8",