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

package/lib/applyOptions.js

@@ -11,13 +11,16 @@ function _commander() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// @ts-expect-error TS2305
+
 function applyOptions(cmd, options) {
   for (let opt in options) {
     const option = options[opt];
     if (option instanceof _commander().default.Option) {
       cmd.addOption(option);
     } else if (Array.isArray(option)) {
+      // @ts-expect-error TS2345
       cmd.option(opt, ...option);
     } else if (typeof option === 'string') {
       cmd.option(opt, option);

package/lib/bin.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
-'use strict';
+"use strict";
 
-require('./cli');
+// This file exists for atlaspack-link support
+require('../bin/atlaspack.js');

package/lib/cli.js

@@ -43,7 +43,7 @@ function _chalk() {
   return data;
 }
 function _commander() {
-  const data = _interopRequireDefault(require("commander"));
+  const data = require("commander");
   _commander = function () {
     return data;
   };
@@ -62,8 +62,8 @@ var _makeDebugCommand = require("./makeDebugCommand");
 var _normalizeOptions = require("./normalizeOptions");
 var _handleUncaughtException = require("./handleUncaughtException");
 var _options = require("./options");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const program = new (_commander().default.Command)();
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const program = new (_commander().Command)();
 
 // Exit codes in response to signals are traditionally
 // 128 + signal value
@@ -92,8 +92,8 @@ program.on('--help', function () {
 });
 
 // Override to output option description if argument was missing
-// $FlowFixMe[prop-missing]
-_commander().default.Command.prototype.optionMissingArgument = function (option) {
+// @ts-expect-error optionMissingArgument is not in commander 8 typings but exists at runtime
+_commander().Command.prototype.optionMissingArgument = function (option) {
   _logger().INTERNAL_ORIGINAL_CONSOLE.error("error: option `%s' argument missing", option.flags);
   _logger().INTERNAL_ORIGINAL_CONSOLE.log(program.createHelp().optionDescription(option));
   process.exit(1);
@@ -106,7 +106,10 @@ if (!args[2] || !program.commands.some(c => c.name() === args[2])) {
   args.splice(2, 0, 'serve');
 }
 program.parse(args);
+
+// @ts-expect-error TS7019
 function runCommand(...args) {
+  // @ts-expect-error TS2556
   run(...args).catch(_handleUncaughtException.handleUncaughtException);
 }
 async function run(entries, _opts,
@@ -129,8 +132,10 @@ command) {
   });
   let disposable = new (_events().Disposable)();
   let unsubscribe;
+  // @ts-expect-error TS7034
   let isExiting;
   async function exit(exitCode = 0) {
+    // @ts-expect-error TS7005
     if (isExiting) {
       return;
     }
@@ -141,7 +146,6 @@ command) {
       await atlaspack.stopProfiling();
     }
     if (process.stdin.isTTY && process.stdin.isRaw) {
-      // $FlowFixMe
       process.stdin.setRawMode(false);
     }
     disposable.dispose();
@@ -149,7 +153,6 @@ command) {
   }
   const isWatching = command.name() === 'watch' || command.name() === 'serve';
   if (process.stdin.isTTY) {
-    // $FlowFixMe
     process.stdin.setRawMode(true);
     require('readline').emitKeypressEvents(process.stdin);
     let stream = process.stdin.on('keypress', async (char, key) => {
@@ -185,6 +188,7 @@ command) {
     });
   }
   if (isWatching) {
+    // @ts-expect-error TS7006
     ({
       unsubscribe
     } = await atlaspack.watch(err => {

package/lib/handleUncaughtException.js

@@ -33,7 +33,7 @@ function _chalk() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 async function logUncaughtError(e) {
   if (e instanceof _diagnostic().default) {
     for (let diagnostic of e.diagnostics) {

package/lib/makeDebugCommand.js

@@ -36,7 +36,9 @@ var _normalizeOptions = require("./normalizeOptions");
 var _applyOptions = require("./applyOptions");
 var _options = require("./options");
 var _handleUncaughtException = require("./handleUncaughtException");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// @ts-expect-error TS2305
+
 function makeDebugCommand() {
   const debug = new (_commander().default.Command)('debug').description('Debug commands for atlaspack');
   const getInstance = async (args, opts, command) => {

package/lib/normalizeOptions.js

@@ -32,7 +32,14 @@ function _path() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _os() {
+  const data = _interopRequireDefault(require("os"));
+  _os = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function parsePort(portValue) {
   let parsedPort = Number(portValue);
 
@@ -42,10 +49,6 @@ function parsePort(portValue) {
   }
   return parsedPort;
 }
-
-// $FlowFixMe
-
-// $FlowFixMe
 function shouldUseProductionDefaults(command) {
   return command.name() === 'build' || command.production === true;
 }
@@ -64,6 +67,7 @@ async function normalizeOptions(command, inputFS) {
   process.env.NODE_ENV = nodeEnv;
   let https = !!command.https;
   if (command.cert != null && command.key != null) {
+    // @ts-expect-error TS2322
     https = {
       cert: command.cert,
       key: command.key
@@ -107,6 +111,8 @@ async function normalizeOptions(command, inputFS) {
     let {
       publicUrl
     } = command;
+
+    // @ts-expect-error TS2322
     serveOptions = {
       https,
       port,
@@ -144,9 +150,22 @@ async function normalizeOptions(command, inputFS) {
     if (typeof input !== 'string') return [];
     return input.split(',').map(value => value.trim());
   };
+  let nativeProfiler;
+  if (typeof command.profileNative === 'string') {
+    if (command.profileNative === 'instruments' || command.profileNative === 'samply') {
+      nativeProfiler = command.profileNative;
+    } else {
+      nativeProfiler = undefined;
+    }
+  } else if (command.profileNative) {
+    nativeProfiler = _os().default.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,
@@ -154,17 +173,20 @@ async function normalizeOptions(command, inputFS) {
     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),
     lazyExcludes: normalizeIncludeExcludeList(command.lazyExclude),
     shouldBundleIncrementally: process.env.ATLASPACK_INCREMENTAL_BUNDLING === 'false' ? false : true,
     detailedReport: command.detailedReport != null ? {
+      // @ts-expect-error TS2345
       assetsPerBundle: parseInt(command.detailedReport, 10)
     } : null,
     env: {

package/lib/options.js

@@ -25,7 +25,7 @@ function _featureFlags() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // Only display choices available to callers OS
 let watcherBackendChoices = exports.watcherBackendChoices = ['brute-force'];
 switch (process.platform) {
@@ -44,6 +44,7 @@ switch (process.platform) {
       watcherBackendChoices.push('watchman', 'windows');
       break;
     }
+  // @ts-expect-error TS2367
   case 'freebsd' || 'openbsd':
     {
       watcherBackendChoices.push('watchman');
@@ -59,6 +60,7 @@ const commonOptions = exports.commonOptions = {
   '--no-cache': 'disable the filesystem cache',
   '--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]': [`list of directories watcher should not be tracking for changes. defaults to ['.git', '.hg']`, dirs => dirs.split(',')],
   '--watch-backend': new (_commander().default.Option)('--watch-backend <name>', 'set watcher backend').choices(watcherBackendChoices),
@@ -68,6 +70,7 @@ const commonOptions = exports.commonOptions = {
   '--dist-dir <dir>': '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]': ['print the asset timings and sizes in the build report', parseOptionInt],
@@ -79,6 +82,7 @@ const commonOptions = exports.commonOptions = {
     let [name, val] = value.split('=');
     if (name in _featureFlags().DEFAULT_FEATURE_FLAGS) {
       let featureFlagValue;
+      // @ts-expect-error TS7053
       if (typeof _featureFlags().DEFAULT_FEATURE_FLAGS[name] === 'boolean') {
         if (val !== 'true' && val !== 'false') {
           throw new Error(`Feature flag ${name} must be set to true or false`);

package/lib/types/applyOptions.d.ts

@@ -0,0 +1,5 @@
+import commander from 'commander';
+export interface OptionsDefinition {
+    [key: string]: string | unknown[] | commander.Option;
+}
+export declare function applyOptions(cmd: commander.Command, options: OptionsDefinition): void;

package/lib/types/cli.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/types/handleUncaughtException.d.ts

@@ -0,0 +1,2 @@
+export declare function logUncaughtError(e: unknown): Promise<void>;
+export declare function handleUncaughtException(exception: unknown): Promise<void>;

package/lib/types/makeDebugCommand.d.ts

@@ -0,0 +1,2 @@
+import commander from 'commander';
+export declare function makeDebugCommand(): commander.Command;

package/lib/types/normalizeOptions.d.ts

@@ -0,0 +1,42 @@
+import commander from 'commander';
+import type { FileSystem } from '@atlaspack/fs';
+import type { FeatureFlags } from '@atlaspack/feature-flags';
+import type { InitialAtlaspackOptions, LogLevel } from '@atlaspack/types';
+export interface Options {
+    production?: boolean;
+    autoinstall?: boolean;
+    https?: boolean;
+    cert?: string;
+    key?: string;
+    host: string;
+    port?: string;
+    hmr?: boolean;
+    hmrPort?: string;
+    hmrHost?: string;
+    publicUrl?: string;
+    detailedReport?: boolean | string;
+    reporter: string[];
+    trace?: boolean;
+    cache?: boolean;
+    cacheDir?: string;
+    projectRoot?: string;
+    watchDir?: string;
+    watchBackend?: 'watchman' | 'fs-events' | 'inotify' | 'brute-force' | 'windows';
+    watchIgnore?: string[];
+    config?: string;
+    logLevel?: LogLevel;
+    profile?: boolean;
+    profileNative?: string | boolean;
+    contentHash?: boolean;
+    featureFlag?: Partial<FeatureFlags>;
+    optimize?: boolean;
+    sourceMaps?: boolean;
+    scopeHoist?: boolean;
+    distDir?: string;
+    lazy?: string;
+    lazyExclude?: string;
+    target: string[];
+}
+export interface CommandExt extends commander.Command, Options {
+}
+export declare function normalizeOptions(command: CommandExt, inputFS: FileSystem): Promise<InitialAtlaspackOptions>;

package/lib/types/options.d.ts

@@ -0,0 +1,4 @@
+import type { OptionsDefinition } from './applyOptions';
+export declare let watcherBackendChoices: string[];
+export declare const commonOptions: OptionsDefinition;
+export declare const hmrOptions: OptionsDefinition;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/cli",
-  "version": "2.13.7-canary.47+29c2f106d",
+  "version": "2.13.7-canary.471+9fd756210",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
@@ -14,36 +14,36 @@
   "bin": {
     "atlaspack": "bin/atlaspack.js"
   },
-  "main": "lib/bin.js",
-  "source": "src/bin.js",
+  "main": "./lib/bin.js",
+  "source": "./src/bin.ts",
+  "types": "./lib/types/bin.d.ts",
   "scripts": {
-    "prepack": "./ensure-no-dev-lib.sh",
-    "dev:prepare": "rimraf ./lib/ && mkdir -p lib && cp ./bin/dev-bin.js ./lib/bin.js"
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/config-default": "3.1.5-canary.47+29c2f106d",
-    "@atlaspack/core": "2.16.2-canary.47+29c2f106d",
-    "@atlaspack/diagnostic": "2.14.1-canary.115+29c2f106d",
-    "@atlaspack/events": "2.14.1-canary.115+29c2f106d",
-    "@atlaspack/feature-flags": "2.14.1-canary.115+29c2f106d",
-    "@atlaspack/fs": "2.14.5-canary.47+29c2f106d",
-    "@atlaspack/logger": "2.14.5-canary.47+29c2f106d",
-    "@atlaspack/package-manager": "2.14.5-canary.47+29c2f106d",
-    "@atlaspack/reporter-cli": "2.15.1-canary.47+29c2f106d",
-    "@atlaspack/reporter-dev-server": "2.14.5-canary.47+29c2f106d",
-    "@atlaspack/reporter-tracer": "2.14.5-canary.47+29c2f106d",
-    "@atlaspack/utils": "2.14.5-canary.47+29c2f106d",
+    "@atlaspack/config-default": "3.1.5-canary.471+9fd756210",
+    "@atlaspack/core": "2.16.2-canary.471+9fd756210",
+    "@atlaspack/diagnostic": "2.14.1-canary.539+9fd756210",
+    "@atlaspack/events": "2.14.1-canary.539+9fd756210",
+    "@atlaspack/feature-flags": "2.14.1-canary.539+9fd756210",
+    "@atlaspack/fs": "2.14.5-canary.471+9fd756210",
+    "@atlaspack/logger": "2.14.5-canary.471+9fd756210",
+    "@atlaspack/package-manager": "2.14.5-canary.471+9fd756210",
+    "@atlaspack/reporter-cli": "2.15.1-canary.471+9fd756210",
+    "@atlaspack/reporter-dev-server": "2.14.5-canary.471+9fd756210",
+    "@atlaspack/reporter-tracer": "2.14.5-canary.471+9fd756210",
+    "@atlaspack/utils": "2.14.5-canary.471+9fd756210",
     "chalk": "^4.1.0",
-    "commander": "^7.0.0",
-    "get-port": "^4.2.0"
+    "commander": "^8.3.0",
+    "get-port": "^5.1.1"
   },
   "devDependencies": {
-    "@atlaspack/babel-register": "2.14.1",
+    "@atlaspack/babel-register": "2.14.5",
     "@babel/core": "^7.22.11",
-    "rimraf": "^5.0.5"
+    "rimraf": "^3.0.2"
   },
-  "gitHead": "29c2f106de9679adfb5afa04e1910471dc65a427"
-}
+  "gitHead": "9fd756210b9b1f6db3897fbcf0a6dd3bcfd2c1a3"
+}

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

@@ -1,16 +1,12 @@
-// @flow strict-local
-
-import commander, {
-  type commander$Command,
-  type commander$Option,
-} from 'commander';
+// @ts-expect-error TS2305
+import commander, {commander$Command, commander$Option} from 'commander';
 
 export interface OptionsDefinition {
-  [key: string]: string | mixed[] | commander$Option;
+  [key: string]: string | unknown[] | commander.Option;
 }
 
 export function applyOptions(
-  cmd: commander$Command,
+  cmd: commander.Command,
   options: OptionsDefinition,
 ) {
   for (let opt in options) {
@@ -18,6 +14,7 @@ export function applyOptions(
     if (option instanceof commander.Option) {
       cmd.addOption(option);
     } else if (Array.isArray(option)) {
+      // @ts-expect-error TS2345
       cmd.option(opt, ...option);
     } else if (typeof option === 'string') {
       cmd.option(opt, option);

package/src/bin.js

@@ -1,12 +1,2 @@
-#!/usr/bin/env node
-
-'use strict';
-
-if (
-  process.env.ATLASPACK_BUILD_ENV !== 'production' ||
-  process.env.ATLASPACK_SELF_BUILD
-) {
-  require('@atlaspack/babel-register');
-}
-
-require('./cli');
+// This file exists for atlaspack-link support
+require('../bin/atlaspack.js');

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

@@ -1,12 +1,10 @@
-// @flow
-
 import {BuildError} from '@atlaspack/core';
 import {NodeFS} from '@atlaspack/fs';
 import {openInBrowser} from '@atlaspack/utils';
 import {Disposable} from '@atlaspack/events';
 import {INTERNAL_ORIGINAL_CONSOLE} from '@atlaspack/logger';
 import chalk from 'chalk';
-import commander from 'commander';
+import {Command} from 'commander';
 import path from 'path';
 import {version} from '../package.json';
 import {applyOptions} from './applyOptions';
@@ -18,7 +16,7 @@ import {
 } from './handleUncaughtException';
 import {commonOptions, hmrOptions} from './options';
 
-const program = new commander.Command();
+const program = new Command();
 
 // Exit codes in response to signals are traditionally
 // 128 + signal value
@@ -97,8 +95,8 @@ program.on('--help', function () {
 });
 
 // Override to output option description if argument was missing
-// $FlowFixMe[prop-missing]
-commander.Command.prototype.optionMissingArgument = function (option) {
+// @ts-expect-error optionMissingArgument is not in commander 8 typings but exists at runtime
+Command.prototype.optionMissingArgument = function (option: any) {
   INTERNAL_ORIGINAL_CONSOLE.error(
     "error: option `%s' argument missing",
     option.flags,
@@ -117,7 +115,9 @@ if (!args[2] || !program.commands.some((c) => c.name() === args[2])) {
 
 program.parse(args);
 
+// @ts-expect-error TS7019
 function runCommand(...args) {
+  // @ts-expect-error TS2556
   run(...args).catch(handleUncaughtException);
 }
 
@@ -145,9 +145,11 @@ async function run(
   });
 
   let disposable = new Disposable();
-  let unsubscribe: () => Promise<mixed>;
+  let unsubscribe: () => Promise<unknown>;
+  // @ts-expect-error TS7034
   let isExiting;
   async function exit(exitCode: number = 0) {
+    // @ts-expect-error TS7005
     if (isExiting) {
       return;
     }
@@ -160,7 +162,6 @@ async function run(
     }
 
     if (process.stdin.isTTY && process.stdin.isRaw) {
-      // $FlowFixMe
       process.stdin.setRawMode(false);
     }
 
@@ -170,7 +171,6 @@ async function run(
 
   const isWatching = command.name() === 'watch' || command.name() === 'serve';
   if (process.stdin.isTTY) {
-    // $FlowFixMe
     process.stdin.setRawMode(true);
     require('readline').emitKeypressEvents(process.stdin);
 
@@ -212,6 +212,7 @@ async function run(
   }
 
   if (isWatching) {
+    // @ts-expect-error TS7006
     ({unsubscribe} = await atlaspack.watch((err) => {
       if (err) {
         throw err;
@@ -243,7 +244,7 @@ async function run(
   } else {
     try {
       await atlaspack.run();
-    } catch (err) {
+    } catch (err: any) {
       // If an exception is thrown during Atlaspack.build, it is given to reporters in a
       // buildFailure event, and has been shown to the user.
       if (!(err instanceof BuildError)) {

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

@@ -1,11 +1,9 @@
-// @flow strict-local
-
 import ThrowableDiagnostic from '@atlaspack/diagnostic';
 import {prettyDiagnostic} from '@atlaspack/utils';
 import {INTERNAL_ORIGINAL_CONSOLE} from '@atlaspack/logger';
 import chalk from 'chalk';
 
-export async function logUncaughtError(e: mixed) {
+export async function logUncaughtError(e: unknown) {
   if (e instanceof ThrowableDiagnostic) {
     for (let diagnostic of e.diagnostics) {
       let {message, codeframe, stack, hints, documentation} =
@@ -31,13 +29,16 @@ export async function logUncaughtError(e: mixed) {
   }
 
   // A hack to definitely ensure we logged the uncaught exception
-  await new Promise((resolve) => setTimeout(resolve, 100));
+  await new Promise(
+    (resolve: (result: Promise<undefined> | undefined) => void) =>
+      setTimeout(resolve, 100),
+  );
 }
 
-export async function handleUncaughtException(exception: mixed) {
+export async function handleUncaughtException(exception: unknown) {
   try {
     await logUncaughtError(exception);
-  } catch (err) {
+  } catch (err: any) {
     console.error(exception);
     console.error(err);
   }

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

@@ -1,20 +1,23 @@
-// @flow strict-local
-
 import {NodeFS} from '@atlaspack/fs';
 import logger from '@atlaspack/logger';
-import commander, {type commander$Command} from 'commander';
+// @ts-expect-error TS2305
+import commander, {commander$Command} from 'commander';
 import path from 'path';
-import {normalizeOptions, type Options} from './normalizeOptions';
+import {normalizeOptions, Options} from './normalizeOptions';
 import type {CommandExt} from './normalizeOptions';
 import {applyOptions} from './applyOptions';
 import {commonOptions} from './options';
 import {handleUncaughtException} from './handleUncaughtException';
 
-export function makeDebugCommand(): commander$Command {
+export function makeDebugCommand(): commander.Command {
   const debug = new commander.Command('debug').description(
     'Debug commands for atlaspack',
   );
-  const getInstance = async (args, opts, command) => {
+  const getInstance = async (
+    args: Array<string>,
+    opts: Options,
+    command: CommandExt,
+  ) => {
     let entries = args;
 
     if (entries.length === 0) {
@@ -58,7 +61,7 @@ export function makeDebugCommand(): commander$Command {
           message: 'Done invalidating cache',
           origin: '@atlaspack/cli',
         });
-      } catch (err) {
+      } catch (err: any) {
         handleUncaughtException(err);
       }
     });
@@ -77,7 +80,7 @@ export function makeDebugCommand(): commander$Command {
           origin: '@atlaspack/cli',
         });
         process.exit(0);
-      } catch (err) {
+      } catch (err: any) {
         handleUncaughtException(err);
       }
     });
@@ -95,7 +98,7 @@ export function makeDebugCommand(): commander$Command {
           origin: '@atlaspack/cli',
         });
         process.exit(0);
-      } catch (err) {
+      } catch (err: any) {
         handleUncaughtException(err);
       }
     });