@atlaspack/cli 2.13.7-canary.47 → 2.13.7-canary.470

package/src/{normalizeOptions.js → normalizeOptions.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import ThrowableDiagnostic from '@atlaspack/diagnostic';
 import commander from 'commander';
 import getPort from 'get-port';
@@ -8,6 +6,7 @@ import type {FeatureFlags} from '@atlaspack/feature-flags';
 import type {InitialAtlaspackOptions, LogLevel} from '@atlaspack/types';
 import {INTERNAL_ORIGINAL_CONSOLE} from '@atlaspack/logger';
 import path from 'path';
+import os from 'os';
 
 function parsePort(portValue: string): number {
   let parsedPort = Number(portValue);
@@ -37,6 +36,7 @@ export interface Options {
   trace?: boolean;
   cache?: boolean;
   cacheDir?: string;
+  projectRoot?: string;
   watchDir?: string;
   watchBackend?:
     | 'watchman'
@@ -48,8 +48,9 @@ export interface Options {
   config?: string;
   logLevel?: LogLevel;
   profile?: boolean;
+  profileNative?: string | boolean;
   contentHash?: boolean;
-  featureFlag?: $Partial<FeatureFlags>;
+  featureFlag?: Partial<FeatureFlags>;
   optimize?: boolean;
   sourceMaps?: boolean;
   scopeHoist?: boolean;
@@ -59,10 +60,8 @@ export interface Options {
   target: string[];
 }
 
-// $FlowFixMe
 export interface CommandExt extends commander.Command, Options {}
 
-// $FlowFixMe
 function shouldUseProductionDefaults(command: CommandExt) {
   return command.name() === 'build' || command.production === true;
 }
@@ -86,6 +85,7 @@ export async function normalizeOptions(
 
   let https = !!command.https;
   if (command.cert != null && command.key != null) {
+    // @ts-expect-error TS2322
     https = {
       cert: command.cert,
       key: command.key,
@@ -104,7 +104,7 @@ export async function normalizeOptions(
   ) {
     try {
       port = await getPort({port, host});
-    } catch (err) {
+    } catch (err: any) {
       throw new ThrowableDiagnostic({
         diagnostic: {
           message: `Could not get available port: ${err.message}`,
@@ -129,6 +129,7 @@ export async function normalizeOptions(
   if (command.name() === 'serve') {
     let {publicUrl} = command;
 
+    // @ts-expect-error TS2322
     serveOptions = {
       https,
       port,
@@ -154,7 +155,7 @@ export async function normalizeOptions(
 
   let additionalReporters = [
     {packageName: '@atlaspack/reporter-cli', resolveFrom: __filename},
-    ...(command.reporter: Array<string>).map((packageName) => ({
+    ...(command.reporter as Array<string>).map((packageName) => ({
       packageName,
       resolveFrom: path.join(inputFS.cwd(), 'index'),
     })),
@@ -176,9 +177,26 @@ export async function normalizeOptions(
     return input.split(',').map((value) => value.trim());
   };
 
+  let nativeProfiler: 'instruments' | 'samply' | undefined;
+  if (typeof command.profileNative === 'string') {
+    if (
+      command.profileNative === 'instruments' ||
+      command.profileNative === 'samply'
+    ) {
+      nativeProfiler = command.profileNative as 'instruments' | 'samply';
+    } else {
+      nativeProfiler = undefined;
+    }
+  } else if (command.profileNative) {
+    nativeProfiler = os.platform() === 'darwin' ? 'instruments' : 'samply';
+  } else {
+    nativeProfiler = undefined;
+  }
+
   return {
     shouldDisableCache: command.cache === false,
     cacheDir: command.cacheDir,
+    projectRoot: command.projectRoot,
     watchDir: command.watchDir,
     watchBackend: command.watchBackend,
     watchIgnore: command.watchIgnore,
@@ -186,11 +204,13 @@ export async function normalizeOptions(
     mode,
     hmrOptions,
     shouldContentHash: hmrOptions ? false : command.contentHash,
+    // @ts-expect-error TS2322
     serveOptions,
     targets: command.target.length > 0 ? command.target : null,
     shouldAutoInstall: command.autoinstall ?? true,
     logLevel: command.logLevel,
     shouldProfile: command.profile,
+    nativeProfiler,
     shouldTrace: command.trace,
     shouldBuildLazily: typeof command.lazy !== 'undefined',
     lazyIncludes: normalizeIncludeExcludeList(command.lazy),
@@ -200,6 +220,7 @@ export async function normalizeOptions(
     detailedReport:
       command.detailedReport != null
         ? {
+            // @ts-expect-error TS2345
             assetsPerBundle: parseInt(command.detailedReport, 10),
           }
         : null,

package/src/{options.js → options.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import {INTERNAL_ORIGINAL_CONSOLE} from '@atlaspack/logger';
 import commander from 'commander';
 import {DEFAULT_FEATURE_FLAGS} from '@atlaspack/feature-flags';
@@ -20,6 +18,7 @@ switch (process.platform) {
     watcherBackendChoices.push('watchman', 'windows');
     break;
   }
+  // @ts-expect-error TS2367
   case 'freebsd' || 'openbsd': {
     watcherBackendChoices.push('watchman');
     break;
@@ -35,6 +34,8 @@ export const commonOptions: OptionsDefinition = {
   '--config <path>':
     'specify which config to use. can be a path or a package name',
   '--cache-dir <path>': 'set the cache directory. defaults to ".parcel-cache"',
+  '--project-root <path>':
+    'set the project root directory. defaults to nearest directory with lockfiles or version control, falls back to cwd',
   '--watch-dir <path>':
     'set the root watch directory. defaults to nearest lockfile or source control dir.',
   '--watch-ignore [path]': [
@@ -48,7 +49,7 @@ export const commonOptions: OptionsDefinition = {
   '--no-source-maps': 'disable sourcemaps',
   '--target [name]': [
     'only build given target(s)',
-    (val, list) => list.concat([val]),
+    (val: any, list: any) => list.concat([val]),
     [],
   ],
   '--log-level <level>': new commander.Option(
@@ -59,6 +60,8 @@ export const commonOptions: OptionsDefinition = {
     'output directory to write to when unspecified by targets',
   '--no-autoinstall': 'disable autoinstall',
   '--profile': 'enable sampling build profiling',
+  '--profile-native [instruments|samply]':
+    'enable native build profiling (defaults to instruments on macOS, samply otherwise)',
   '--trace': 'enable build tracing',
   '-V, --version': 'output the version number',
   '--detailed-report [count]': [
@@ -67,7 +70,7 @@ export const commonOptions: OptionsDefinition = {
   ],
   '--reporter <name>': [
     'additional reporters to run',
-    (val, acc) => {
+    (val: any, acc: any) => {
       acc.push(val);
       return acc;
     },
@@ -75,10 +78,11 @@ export const commonOptions: OptionsDefinition = {
   ],
   '--feature-flag <name=value>': [
     'sets the value of a feature flag',
-    (value, previousValue) => {
+    (value: any, previousValue: any) => {
       let [name, val] = value.split('=');
       if (name in DEFAULT_FEATURE_FLAGS) {
         let featureFlagValue;
+        // @ts-expect-error TS7053
         if (typeof DEFAULT_FEATURE_FLAGS[name] === 'boolean') {
           if (val !== 'true' && val !== 'false') {
             throw new Error(

package/tsconfig.json

@@ -0,0 +1,45 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["./src/", "./package.json"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../dev/babel-register/tsconfig.json"
+    },
+    {
+      "path": "../../reporters/cli/tsconfig.json"
+    },
+    {
+      "path": "../../reporters/dev-server/tsconfig.json"
+    },
+    {
+      "path": "../../reporters/tracer/tsconfig.json"
+    },
+    {
+      "path": "../../utils/events/tsconfig.json"
+    },
+    {
+      "path": "../core/tsconfig.json"
+    },
+    {
+      "path": "../diagnostic/tsconfig.json"
+    },
+    {
+      "path": "../feature-flags/tsconfig.json"
+    },
+    {
+      "path": "../fs/tsconfig.json"
+    },
+    {
+      "path": "../logger/tsconfig.json"
+    },
+    {
+      "path": "../package-manager/tsconfig.json"
+    },
+    {
+      "path": "../utils/tsconfig.json"
+    }
+  ]
+}