@atlaspack/core 2.23.2-dev-inline-requires-reuse-bdc9ca9c3.0 → 2.23.3-inline-requires-take-2-2a0c642df.0

package/src/requests/TargetRequest.ts

@@ -237,7 +237,6 @@ export class TargetResolver {
             if (!packageTargets.has(target)) {
               throw new ThrowableDiagnostic({
                 diagnostic: {
-                  // @ts-expect-error TS2345
                   message: md`Could not find target with name "${target}"`,
                   origin: '@atlaspack/core',
                 },
@@ -265,7 +264,6 @@ export class TargetResolver {
               );
               throw new ThrowableDiagnostic({
                 diagnostic: {
-                  // @ts-expect-error TS2345
                   message: md`Missing distDir for target "${name}"`,
                   origin: '@atlaspack/core',
                   codeFrames: [
@@ -437,7 +435,6 @@ export class TargetResolver {
       if (pkgFile == null) {
         throw new ThrowableDiagnostic({
           diagnostic: {
-            // @ts-expect-error TS2345
             message: md`Expected package.json file in ${rootDir}`,
             origin: '@atlaspack/core',
           },
@@ -718,7 +715,6 @@ export class TargetResolver {
           let ext = path.extname(distEntry);
           throw new ThrowableDiagnostic({
             diagnostic: {
-              // @ts-expect-error TS2345
               message: md`Unexpected output file type ${ext} in target "${targetName}"`,
               origin: '@atlaspack/core',
               codeFrames: [
@@ -751,7 +747,6 @@ export class TargetResolver {
               : JSON.stringify(pkgContents, null, '\t');
           throw new ThrowableDiagnostic({
             diagnostic: {
-              // @ts-expect-error TS2345
               message: md`The "global" output format is not supported in the "${targetName}" target.`,
               origin: '@atlaspack/core',
               codeFrames: [
@@ -806,7 +801,6 @@ export class TargetResolver {
           throw new ThrowableDiagnostic({
             diagnostic: {
               // prettier-ignore
-              // @ts-expect-error TS2345
               message: md`Output format "esmodule" cannot be used in the "main" target without a .mjs extension or "type": "module" field.`,
               origin: '@atlaspack/core',
               codeFrames: [
@@ -976,7 +970,6 @@ export class TargetResolver {
               : JSON.stringify(pkgContents, null, '\t');
           throw new ThrowableDiagnostic({
             diagnostic: {
-              // @ts-expect-error TS2345
               message: md`Invalid distPath for target "${targetName}"`,
               origin: '@atlaspack/core',
               codeFrames: [
@@ -1235,7 +1228,6 @@ export class TargetResolver {
       let listFormat = new Intl.ListFormat('en-US', {type: 'disjunction'});
       throw new ThrowableDiagnostic({
         diagnostic: {
-          // @ts-expect-error TS2345
           message: md`Declared output format "${descriptor.outputFormat}" does not match expected output format "${inferredOutputFormat}".`,
           origin: '@atlaspack/core',
           codeFrames: [
@@ -1392,7 +1384,6 @@ function assertNoDuplicateTargets(
   for (let [targetPath, targetNames] of targetsByPath) {
     if (targetNames.length > 1 && pkgContents != null && pkgFilePath != null) {
       diagnostics.push({
-        // @ts-expect-error TS2345
         message: md`Multiple targets have the same destination path "${path.relative(
           path.dirname(pkgFilePath),
           targetPath,
@@ -1581,7 +1572,6 @@ async function debugResolvedTargets(
       }
 
       if (keyInfo.path) {
-        // @ts-expect-error TS2345
         highlight.defined = md`${key} defined here`;
       }
 
@@ -1642,7 +1632,6 @@ async function debugResolvedTargets(
       v.message != null ? md.italic(v.message) : '';
     logger.verbose({
       origin: '@atlaspack/core',
-      // @ts-expect-error TS2345
       message: md`**Target** "${target.name}"
 
                **Entry**: ${path.relative(

package/src/types.ts

@@ -16,7 +16,6 @@ import type {
   ServerOptions,
   SourceType,
   Stats,
-  Symbol,
   TargetSourceMapOptions,
   ConfigResult,
   OutputFormat,
@@ -429,6 +428,7 @@ export type AssetRequestInput = {
   isSource?: boolean;
   canDefer?: boolean;
   sideEffects?: boolean;
+  runtimeAssetRequiringExecutionOnLoad?: boolean;
   code?: string;
   pipeline?: string | null | undefined;
   optionsRef: SharedReference;

package/test/Environment.test.ts

@@ -17,8 +17,8 @@ describe('Environment', () => {
       isLibrary: false,
       shouldOptimize: false,
       shouldScopeHoist: false,
-      sourceMap: undefined,
-      loc: undefined,
+      sourceMap: null,
+      loc: null,
       sourceType: 'module',
       unstableSingleFileOutput: false,
     });
@@ -62,8 +62,8 @@ describe('Environment', () => {
         isLibrary: false,
         shouldOptimize: false,
         shouldScopeHoist: false,
-        sourceMap: undefined,
-        loc: undefined,
+        sourceMap: null,
+        loc: null,
         sourceType: 'module',
         unstableSingleFileOutput: false,
       },
@@ -103,8 +103,8 @@ describe('Environment', () => {
         isLibrary: false,
         shouldOptimize: false,
         shouldScopeHoist: false,
-        sourceMap: undefined,
-        loc: undefined,
+        sourceMap: null,
+        loc: null,
         sourceType: 'module',
         unstableSingleFileOutput: false,
       },
@@ -125,8 +125,8 @@ describe('Environment', () => {
         isLibrary: false,
         shouldOptimize: false,
         shouldScopeHoist: false,
-        sourceMap: undefined,
-        loc: undefined,
+        sourceMap: null,
+        loc: null,
         sourceType: 'module',
         unstableSingleFileOutput: false,
       },

package/test/EnvironmentManager.test.ts

@@ -10,6 +10,7 @@ import {
 } from '../src/EnvironmentManager';
 import {DEFAULT_OPTIONS} from './test-utils';
 import {LMDBLiteCache} from '@atlaspack/cache';
+import {getEnvironmentHash} from '../src/Environment';
 
 const options = {
   ...DEFAULT_OPTIONS,
@@ -17,8 +18,14 @@ const options = {
 } as const;
 
 describe('EnvironmentManager', () => {
-  const env1 = {
-    id: 'd821e85f6b50315e',
+  const envWithId = (env: any) => {
+    return {
+      ...env,
+      id: getEnvironmentHash(env),
+    };
+  };
+
+  const env1 = envWithId({
     context: 'browser',
     engines: {browsers: ['> 0.25%']},
     includeNodeModules: true,
@@ -30,9 +37,8 @@ describe('EnvironmentManager', () => {
     sourceMap: undefined,
     sourceType: 'module',
     unstableSingleFileOutput: false,
-  } as const;
-  const env2 = {
-    id: 'de92f48baa8448d2',
+  } as const);
+  const env2 = envWithId({
     context: 'node',
     engines: {
       browsers: [],
@@ -47,7 +53,7 @@ describe('EnvironmentManager', () => {
     sourceMap: null,
     sourceType: 'module',
     unstableSingleFileOutput: false,
-  } as const;
+  } as const);
 
   beforeEach(async () => {
     await options.cache.ensure();
@@ -78,7 +84,7 @@ describe('EnvironmentManager', () => {
     setAllEnvironments([env1, env2]);
     await writeEnvironmentsToCache(options.cache);
 
-    const cachedEnvIds = await options.cache.get(
+    const cachedEnvIds: string[] | null | undefined = await options.cache.get(
       `EnvironmentManager/${ATLASPACK_VERSION}`,
     );
     const cachedIdsArray = nullthrows(cachedEnvIds);
@@ -104,11 +110,11 @@ describe('EnvironmentManager', () => {
     const cachedEnv2 = await options.cache.get(
       `Environment/${ATLASPACK_VERSION}/${env2.id}`,
     );
-    assert.deepEqual(cachedEnv1, env1, 'Environment 1 should be cached');
-    assert.deepEqual(cachedEnv2, env2, 'Environment 2 should be cached');
+    assert.deepEqual(cachedEnv1, env1);
+    assert.deepEqual(cachedEnv2, env2);
 
     // Verify environment IDs were stored in manager
-    const cachedEnvIds = await options.cache.get(
+    const cachedEnvIds: string[] | null | undefined = await options.cache.get(
       `EnvironmentManager/${ATLASPACK_VERSION}`,
     );
     const cachedIdsArray = nullthrows(cachedEnvIds);
@@ -136,16 +142,8 @@ describe('EnvironmentManager', () => {
     const env1Loaded = loadedEnvironments.find((e: any) => e.id === env1.id);
     const env2Loaded = loadedEnvironments.find((e: any) => e.id === env2.id);
 
-    assert.deepEqual(
-      env1Loaded,
-      env1,
-      'First environment should match cached environment',
-    );
-    assert.deepEqual(
-      env2Loaded,
-      env2,
-      'Second environment should match cached environment',
-    );
+    assert.deepEqual(env1Loaded, env1);
+    assert.deepEqual(env2Loaded, env2);
   });
 
   it('should handle empty cache gracefully without calling setAllEnvironments', async () => {