@atlaspack/core 2.16.2-canary.184 → 2.16.2-canary.186

package/lib/Environment.js

@@ -34,7 +34,8 @@ function createEnvironment({
   shouldScopeHoist = false,
   sourceMap,
   unstableSingleFileOutput = false,
-  loc
+  loc,
+  customEnv
 } = {
   /*::...null*/
 }) {
@@ -111,7 +112,8 @@ function createEnvironment({
     shouldScopeHoist,
     sourceMap,
     unstableSingleFileOutput,
-    loc
+    loc,
+    customEnv
   };
   res.id = getEnvironmentHash(res);
   return (0, _EnvironmentManager.toEnvironmentRef)(Object.freeze(res));
@@ -140,7 +142,8 @@ function getEnvironmentHash(env) {
     isLibrary: env.isLibrary,
     shouldOptimize: env.shouldOptimize,
     shouldScopeHoist: env.shouldScopeHoist,
-    sourceMap: env.sourceMap
+    sourceMap: env.sourceMap,
+    customEnv: env.customEnv
   };
   const id = (0, _rust().createEnvironmentId)(data);
   _IdentifierRegistry.identifierRegistry.addIdentifier('environment', id, data);

package/lib/TargetDescriptor.schema.js

@@ -98,6 +98,12 @@ const PACKAGE_DESCRIPTOR_SCHEMA = exports.PACKAGE_DESCRIPTOR_SCHEMA = {
     },
     __unstable_singleFileOutput: {
       type: 'boolean'
+    },
+    env: {
+      type: 'object',
+      additionalProperties: {
+        type: 'string'
+      }
     }
   },
   additionalProperties: false

package/lib/atlaspack-v3/worker/compat/environment.js

@@ -21,6 +21,7 @@ class Environment {
     this.sourceMap = inner.sourceMap;
     this.loc = inner.loc;
     this.unstableSingleFileOutput = false;
+    this.customEnv = inner.customEnv;
   }
   isBrowser() {
     return this.context === 'browser' || this.isWorker() || this.isTesseract() || this.isWorklet() || this.context === 'electron-renderer';

package/lib/public/Environment.js

@@ -178,6 +178,9 @@ class Environment {
   get unstableSingleFileOutput() {
     return this.#environment.unstableSingleFileOutput;
   }
+  get customEnv() {
+    return this.#environment.customEnv;
+  }
   [inspect]() {
     return `Env(${this.#environment.context})`;
   }

package/lib/requests/TargetRequest.js

@@ -256,7 +256,8 @@ class TargetResolver {
               shouldOptimize: this.options.defaultTargetOptions.shouldOptimize && descriptor.optimize !== false,
               shouldScopeHoist: this.options.defaultTargetOptions.shouldScopeHoist && descriptor.scopeHoist !== false,
               sourceMap: normalizeSourceMap(this.options, descriptor.sourceMap),
-              unstableSingleFileOutput: descriptor.__unstable_singleFileOutput
+              unstableSingleFileOutput: descriptor.__unstable_singleFileOutput,
+              customEnv: descriptor.env
             })
           };
           if (descriptor.distEntry != null) {

package/lib/types/Environment.d.ts

@@ -1,10 +1,11 @@
-import type { EnvironmentOptions, Environment as IEnvironment, FilePath } from '@atlaspack/types';
+import type { EnvironmentOptions, Environment as IEnvironment, FilePath, EnvMap } from '@atlaspack/types';
 import type { Environment, InternalSourceLocation } from './types';
 import type { EnvironmentRef } from './EnvironmentManager';
 type EnvironmentOpts = EnvironmentOptions & {
     loc?: InternalSourceLocation | null | undefined;
+    customEnv?: EnvMap | null | undefined;
 };
-export declare function createEnvironment({ context, engines, includeNodeModules, outputFormat, sourceType, shouldOptimize, isLibrary, shouldScopeHoist, sourceMap, unstableSingleFileOutput, loc, }?: EnvironmentOpts): EnvironmentRef;
+export declare function createEnvironment({ context, engines, includeNodeModules, outputFormat, sourceType, shouldOptimize, isLibrary, shouldScopeHoist, sourceMap, unstableSingleFileOutput, loc, customEnv, }?: EnvironmentOpts): EnvironmentRef;
 export declare function mergeEnvironments(projectRoot: FilePath, a: Environment, b?: EnvironmentOptions | IEnvironment | null): EnvironmentRef;
 export declare function getEnvironmentHash(env: Environment): string;
 export {};

package/lib/types/atlaspack-v3/worker/compat/environment.d.ts

@@ -1,5 +1,5 @@
 import type { Environment as NapiEnvironment } from '@atlaspack/rust';
-import type { Environment as IEnvironment, EnvironmentContext, Engines, PackageName, OutputFormat, SourceType, TargetSourceMapOptions, SourceLocation, VersionMap, EnvironmentFeature } from '@atlaspack/types';
+import type { Environment as IEnvironment, EnvironmentContext, Engines, PackageName, OutputFormat, SourceType, TargetSourceMapOptions, SourceLocation, VersionMap, EnvironmentFeature, EnvMap } from '@atlaspack/types';
 export declare class Environment implements IEnvironment {
     id: string;
     includeNodeModules: boolean | Array<PackageName> | Partial<Record<PackageName, boolean>>;
@@ -13,6 +13,7 @@ export declare class Environment implements IEnvironment {
     sourceMap: TargetSourceMapOptions | null | undefined;
     loc: SourceLocation | null | undefined;
     unstableSingleFileOutput: boolean;
+    customEnv: EnvMap | null | undefined;
     constructor(inner: NapiEnvironment);
     isBrowser(): boolean;
     isNode(): boolean;

package/lib/types/public/Environment.d.ts

@@ -1,4 +1,4 @@
-import type { Environment as IEnvironment, EnvironmentContext, EnvironmentFeature, Engines, OutputFormat, PackageName, VersionMap, SourceLocation, SourceType, TargetSourceMapOptions } from '@atlaspack/types';
+import type { Environment as IEnvironment, EnvironmentContext, EnvironmentFeature, Engines, OutputFormat, PackageName, VersionMap, SourceLocation, SourceType, TargetSourceMapOptions, EnvMap } from '@atlaspack/types';
 import type { Environment as InternalEnvironment, AtlaspackOptions } from '../types';
 declare const inspect: unique symbol;
 export declare const BROWSER_ENVS: Set<string>;
@@ -19,6 +19,7 @@ export default class Environment implements IEnvironment {
     get sourceMap(): TargetSourceMapOptions | null | undefined;
     get loc(): SourceLocation | null | undefined;
     get unstableSingleFileOutput(): boolean;
+    get customEnv(): EnvMap | null | undefined;
     [inspect](): string;
     isBrowser(): boolean;
     isNode(): boolean;

package/lib/types/types.d.ts

@@ -46,6 +46,7 @@ export type Environment = {
     sourceMap: TargetSourceMapOptions | null | undefined;
     loc: InternalSourceLocation | null | undefined;
     unstableSingleFileOutput: boolean;
+    customEnv: EnvMap | null | undefined;
 };
 export type InternalSourceLocation = {
     readonly filePath: ProjectPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-canary.184+038e87a78",
+  "version": "2.16.2-canary.186+f6532d7a4",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -23,21 +23,21 @@
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-canary.252+038e87a78",
-    "@atlaspack/cache": "3.1.1-canary.184+038e87a78",
-    "@atlaspack/diagnostic": "2.14.1-canary.252+038e87a78",
-    "@atlaspack/events": "2.14.1-canary.252+038e87a78",
-    "@atlaspack/feature-flags": "2.14.1-canary.252+038e87a78",
-    "@atlaspack/fs": "2.14.5-canary.184+038e87a78",
-    "@atlaspack/graph": "3.4.1-canary.252+038e87a78",
-    "@atlaspack/logger": "2.14.5-canary.184+038e87a78",
-    "@atlaspack/package-manager": "2.14.5-canary.184+038e87a78",
-    "@atlaspack/plugin": "2.14.5-canary.184+038e87a78",
-    "@atlaspack/profiler": "2.14.1-canary.252+038e87a78",
-    "@atlaspack/rust": "3.2.1-canary.184+038e87a78",
-    "@atlaspack/types": "2.14.5-canary.184+038e87a78",
-    "@atlaspack/utils": "2.14.5-canary.184+038e87a78",
-    "@atlaspack/workers": "2.14.5-canary.184+038e87a78",
+    "@atlaspack/build-cache": "2.13.3-canary.254+f6532d7a4",
+    "@atlaspack/cache": "3.1.1-canary.186+f6532d7a4",
+    "@atlaspack/diagnostic": "2.14.1-canary.254+f6532d7a4",
+    "@atlaspack/events": "2.14.1-canary.254+f6532d7a4",
+    "@atlaspack/feature-flags": "2.14.1-canary.254+f6532d7a4",
+    "@atlaspack/fs": "2.14.5-canary.186+f6532d7a4",
+    "@atlaspack/graph": "3.4.1-canary.254+f6532d7a4",
+    "@atlaspack/logger": "2.14.5-canary.186+f6532d7a4",
+    "@atlaspack/package-manager": "2.14.5-canary.186+f6532d7a4",
+    "@atlaspack/plugin": "2.14.5-canary.186+f6532d7a4",
+    "@atlaspack/profiler": "2.14.1-canary.254+f6532d7a4",
+    "@atlaspack/rust": "3.2.1-canary.186+f6532d7a4",
+    "@atlaspack/types": "2.14.5-canary.186+f6532d7a4",
+    "@atlaspack/utils": "2.14.5-canary.186+f6532d7a4",
+    "@atlaspack/workers": "2.14.5-canary.186+f6532d7a4",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -62,5 +62,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "038e87a7858d39556d59d3a2d17db534d45f62c6"
+  "gitHead": "f6532d7a4f7f007bd4e5e36af04dd466f0b9f572"
 }

package/src/Environment.ts

@@ -2,6 +2,7 @@ import type {
   EnvironmentOptions,
   Environment as IEnvironment,
   FilePath,
+  EnvMap,
 } from '@atlaspack/types';
 import type {Environment, InternalSourceLocation} from './types';
 import {createEnvironmentId} from '@atlaspack/rust';
@@ -19,6 +20,7 @@ const DEFAULT_ENGINES = {
 
 type EnvironmentOpts = EnvironmentOptions & {
   loc?: InternalSourceLocation | null | undefined;
+  customEnv?: EnvMap | null | undefined;
 };
 
 export function createEnvironment({
@@ -33,6 +35,7 @@ export function createEnvironment({
   sourceMap,
   unstableSingleFileOutput = false,
   loc,
+  customEnv,
 }: EnvironmentOpts = {
   /*::...null*/
 }): EnvironmentRef {
@@ -113,6 +116,7 @@ export function createEnvironment({
     sourceMap,
     unstableSingleFileOutput,
     loc,
+    customEnv,
   };
 
   res.id = getEnvironmentHash(res);
@@ -152,6 +156,7 @@ export function getEnvironmentHash(env: Environment): string {
     shouldOptimize: env.shouldOptimize,
     shouldScopeHoist: env.shouldScopeHoist,
     sourceMap: env.sourceMap,
+    customEnv: env.customEnv,
   } as const;
   const id = createEnvironmentId(data);
   identifierRegistry.addIdentifier('environment', id, data);

package/src/TargetDescriptor.schema.ts

@@ -115,6 +115,12 @@ export const PACKAGE_DESCRIPTOR_SCHEMA: SchemaObject = {
     __unstable_singleFileOutput: {
       type: 'boolean',
     },
+    env: {
+      type: 'object',
+      additionalProperties: {
+        type: 'string',
+      },
+    },
   },
   additionalProperties: false,
 };

package/src/Transformation.ts

@@ -46,6 +46,7 @@ import UncommittedAsset from './UncommittedAsset';
 import {createAsset} from './assetUtils';
 import summarizeRequest from './summarizeRequest';
 import PluginOptions from './public/PluginOptions';
+import {fromEnvironmentId} from './EnvironmentManager';
 import {optionsProxy} from './utils';
 import {createConfig} from './InternalConfig';
 import {

package/src/atlaspack-v3/worker/compat/environment.ts

@@ -11,6 +11,7 @@ import type {
   SourceLocation,
   VersionMap,
   EnvironmentFeature,
+  EnvMap,
 } from '@atlaspack/types';
 
 export class Environment implements IEnvironment {
@@ -29,6 +30,7 @@ export class Environment implements IEnvironment {
   sourceMap: TargetSourceMapOptions | null | undefined;
   loc: SourceLocation | null | undefined;
   unstableSingleFileOutput: boolean;
+  customEnv: EnvMap | null | undefined;
 
   constructor(inner: NapiEnvironment) {
     // TODO
@@ -44,6 +46,7 @@ export class Environment implements IEnvironment {
     this.sourceMap = inner.sourceMap;
     this.loc = inner.loc;
     this.unstableSingleFileOutput = false;
+    this.customEnv = inner.customEnv;
   }
 
   isBrowser(): boolean {

package/src/public/Environment.ts

@@ -9,6 +9,7 @@ import type {
   SourceLocation,
   SourceType,
   TargetSourceMapOptions,
+  EnvMap,
 } from '@atlaspack/types';
 import type {
   Environment as InternalEnvironment,
@@ -232,6 +233,10 @@ export default class Environment implements IEnvironment {
     return this.#environment.unstableSingleFileOutput;
   }
 
+  get customEnv(): EnvMap | null | undefined {
+    return this.#environment.customEnv;
+  }
+
   [inspect](): string {
     return `Env(${this.#environment.context})`;
   }

package/src/requests/TargetRequest.ts

@@ -354,6 +354,7 @@ export class TargetResolver {
                 ),
                 unstableSingleFileOutput:
                   descriptor.__unstable_singleFileOutput,
+                customEnv: descriptor.env,
               }),
             };
 

package/src/types.ts

@@ -84,6 +84,7 @@ export type Environment = {
   sourceMap: TargetSourceMapOptions | null | undefined;
   loc: InternalSourceLocation | null | undefined;
   unstableSingleFileOutput: boolean;
+  customEnv: EnvMap | null | undefined;
 };
 
 export type InternalSourceLocation = {

package/test/Environment.test.ts

@@ -9,6 +9,7 @@ describe('Environment', () => {
     assert.deepEqual(fromEnvironmentId(createEnvironment()), {
       id: 'd821e85f6b50315e',
       context: 'browser',
+      customEnv: undefined,
       engines: {
         browsers: ['> 0.25%'],
       },
@@ -17,8 +18,8 @@ describe('Environment', () => {
       isLibrary: false,
       shouldOptimize: false,
       shouldScopeHoist: false,
-      sourceMap: null,
-      loc: null,
+      sourceMap: undefined,
+      loc: undefined,
       sourceType: 'module',
       unstableSingleFileOutput: false,
     });
@@ -30,6 +31,7 @@ describe('Environment', () => {
       {
         id: '2320af923a717577',
         context: 'node',
+        customEnv: undefined,
         engines: {
           node: '>= 10.0.0',
         },
@@ -54,6 +56,7 @@ describe('Environment', () => {
       {
         id: '75603271034eff15',
         context: 'browser',
+        customEnv: undefined,
         engines: {
           browsers: ['last 1 version'],
         },
@@ -62,8 +65,8 @@ describe('Environment', () => {
         isLibrary: false,
         shouldOptimize: false,
         shouldScopeHoist: false,
-        sourceMap: null,
-        loc: null,
+        sourceMap: undefined,
+        loc: undefined,
         sourceType: 'module',
         unstableSingleFileOutput: false,
       },
@@ -74,6 +77,7 @@ describe('Environment', () => {
     assert.deepEqual(fromEnvironmentId(createEnvironment({context: 'node'})), {
       id: 'e45cc12216f7857d',
       context: 'node',
+      customEnv: undefined,
       engines: {
         node: '>= 8.0.0',
       },
@@ -95,6 +99,7 @@ describe('Environment', () => {
       {
         id: 'd821e85f6b50315e',
         context: 'browser',
+        customEnv: undefined,
         engines: {
           browsers: ['> 0.25%'],
         },
@@ -103,8 +108,8 @@ describe('Environment', () => {
         isLibrary: false,
         shouldOptimize: false,
         shouldScopeHoist: false,
-        sourceMap: null,
-        loc: null,
+        sourceMap: undefined,
+        loc: undefined,
         sourceType: 'module',
         unstableSingleFileOutput: false,
       },
@@ -117,6 +122,7 @@ describe('Environment', () => {
       {
         id: '9917be65326c5de9',
         context: 'tesseract',
+        customEnv: undefined,
         engines: {
           browsers: ['> 0.25%'],
         },
@@ -125,8 +131,8 @@ describe('Environment', () => {
         isLibrary: false,
         shouldOptimize: false,
         shouldScopeHoist: false,
-        sourceMap: null,
-        loc: null,
+        sourceMap: undefined,
+        loc: undefined,
         sourceType: 'module',
         unstableSingleFileOutput: false,
       },