@pnp/cli-microsoft365 6.9.0-beta.f6054b4 → 6.10.0-beta.05cab2f

package/.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:7.1.0-ubuntu-focal
+FROM mcr.microsoft.com/powershell:alpine-3.17
 
 LABEL name="CLI for Microsoft 365 Development" \
   description="Development container for contributing to CLI for Microsoft 365" \
@@ -17,22 +17,15 @@ LABEL name="CLI for Microsoft 365 Development" \
 ENV NPM_CONFIG_PREFIX=/home/cli-microsoft365-dev/.npm-global \
   PATH=$PATH:/home/cli-microsoft365-dev/.npm-global/bin
 
-RUN apt-get update && apt-get install -y \
+RUN apk add --no-cache \
   git \
   curl \
   sudo \
+  shadow \
   zsh \
   jq \
-  vim \
-  python3.8 \
-  python3-pip \
-  && curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash - \
-  && apt-get install nodejs -y \
-  && rm -rf /var/lib/apt/lists/*
-
-COPY ../docs/pip_requirements.txt .
-
-RUN pip install -r pip_requirements.txt
+  nodejs \
+  npm
 
 RUN useradd \
   --user-group \
@@ -45,15 +38,15 @@ USER cli-microsoft365-dev
 
 WORKDIR /home/cli-microsoft365
 
-RUN zsh -c "$(curl https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" --unattended \
- && git clone https://github.com/denysdovhan/spaceship-prompt.git "$HOME/.oh-my-zsh/custom/themes/spaceship-prompt" --depth=1 \
- && ln -s "$HOME/.oh-my-zsh/custom/themes/spaceship-prompt/spaceship.zsh-theme" "$HOME/.oh-my-zsh/custom/themes/spaceship.zsh-theme" \
- && cp "$HOME/.oh-my-zsh/templates/zshrc.zsh-template" $HOME/.zshrc \
- && git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting \
- && git clone https://github.com/zsh-users/zsh-autosuggestions $HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions \
+RUN git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh \
+ && cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc \
+ && git clone https://github.com/denysdovhan/spaceship-prompt.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/spaceship-prompt --depth=1 \
+ && ln -s ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/spaceship-prompt/spaceship.zsh-theme ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/spaceship.zsh-theme \
  && sed -i "11s/ZSH_THEME=\"robbyrussell\"/ZSH_THEME=\"spaceship\"/" ~/.zshrc \
- && sed -i "27s/# DISABLE_AUTO_UPDATE=\"true\"/DISABLE_AUTO_UPDATE=\"true\"/" ~/.zshrc \
+ && git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting \
+ && git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions \
  && sed -i "73s/plugins=(git)/plugins=(git zsh-autosuggestions zsh-syntax-highlighting)/" ~/.zshrc \
+ && sed -i "27s/# DISABLE_AUTO_UPDATE=\"true\"/DISABLE_AUTO_UPDATE=\"true\"/" ~/.zshrc \
  && sed -i "50s/# COMPLETION_WAITING_DOTS/COMPLETION_WAITING_DOTS/" ~/.zshrc
 
 CMD [ "/bin/zsh", "-l" ]

package/.devcontainer/devcontainer.json

@@ -2,22 +2,29 @@
   "name": "CLI for Microsoft 365",
   "dockerFile": "Dockerfile",
   "context": "..",
-  "settings": {
-    "terminal.integrated.profiles.linux": {
-      "zsh": {
-        "path": "/bin/zsh",
-        "args": [
-          "-l"
-        ]
-      }
-    },
-    "terminal.integrated.defaultProfile.linux": "zsh"
+  "postCreateCommand": {
+    "cli": "npm i && npm run clean && npm run build && npm link",
+    "docs": "cd docs && npm i"
   },
-  "postCreateCommand": "npm i && npm run clean && npm run build && npm link",
-  "extensions": [
-    "dbaeumer.vscode-eslint",
-    "hbenl.vscode-test-explorer",
-    "hbenl.vscode-mocha-test-adapter",
-    "eamodio.gitlens"
-  ]
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "hbenl.vscode-test-explorer",
+        "hbenl.vscode-mocha-test-adapter",
+        "eamodio.gitlens"
+      ],
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "zsh": {
+            "path": "/bin/zsh",
+            "args": [
+              "-l"
+            ]
+          }
+        },
+        "terminal.integrated.defaultProfile.linux": "zsh"
+      }
+    }
+  }
 }

package/Dockerfile

@@ -43,10 +43,12 @@ RUN bash -c 'echo "export PATH=$PATH:/home/cli-microsoft365/.npm-global/bin:/hom
   && bash -c 'echo "export CLIMICROSOFT365_ENV=\"docker\"" >> ~/.bash_profile' \
   && bash -c 'npm i -g @pnp/cli-microsoft365@${CLI_VERSION} --production --quiet --no-progress' \ 
   && bash -c 'echo "source /etc/profile.d/bash_completion.sh" >> ~/.bash_profile' \
+  && bash -c 'echo "alias \"m365?\"=\"m365_chili\"" >> ~/.bash_profile' \
   && bash -c 'echo ". .bashrc" >> ~/.bash_profile' \
   && bash -c 'npm cache clean --force' \
   && bash -c 'm365 cli completion sh setup' \
-  && pwsh -c 'm365 cli completion pwsh setup --profile $profile'
+  && pwsh -c 'm365 cli completion pwsh setup --profile $profile' \
+  && pwsh -c 'Add-Content -Path $PROFILE -Value "`r`Set-Alias -Name m365? -Value m365_chili"'
 
 RUN pip install setuptools==58
 RUN pip install jmespath-terminal

package/README.md

@@ -49,11 +49,13 @@
   <a href="#contribute">Contribute</a>
 </p>
 <p align="center">
-  <a href="#sharing-is-caring">Sharing is Caring</a> |
-  <a href="#code-of-conduct">Code of Conduct</a> |
+  <a href="https://github.com/pnp/cli-microsoft365/blob/main/CODE_OF_CONDUCT.md">Code of Conduct</a> | 
+  <a href="#need-help">Need help?</a> |
   <a href="#disclaimer">Disclaimer</a>
 </p>
-
+<p align="center">
+  <a href="#microsoft-365--power-platform-community">Microsoft 365 & Power Platform Community</a>
+</p>
 <p align="center">
   <img alt="CLI for Microsoft 365" src="./docs/docs/images/cli-microsoft365.gif" height="500" />
 </p>
@@ -229,9 +231,9 @@ Checkout our [Wiki](https://github.com/pnp/cli-microsoft365/wiki) for guides on
   </a>
 </p>
 
-## Microsoft 365 Platform Community
+## Microsoft 365 & Power Platform Community
 
-CLI for Microsoft 365 is a [Microsoft 365 Platform Community](https://pnp.github.io) (PnP) project. Microsoft 365 Platform Community is a virtual team consisting of Microsoft employees and community members focused on helping the community make the best use of Microsoft products. CLI for Microsoft 365 is an open-source project not affiliated with Microsoft and not covered by Microsoft support. If you experience any issues using the CLI, please submit an issue in the [issues list](https://github.com/pnp/cli-microsoft365/issues).
+CLI for Microsoft 365 is a [Microsoft 365 & Power Platform Community](https://pnp.github.io) (PnP) project. Microsoft 365 & Power Platform Community is a virtual team consisting of Microsoft employees and community members focused on helping the community make the best use of Microsoft products. CLI for Microsoft 365 is an open-source project not affiliated with Microsoft and not covered by Microsoft support. If you experience any issues using the CLI, please submit an issue in the [issues list](https://github.com/pnp/cli-microsoft365/issues).
 
 ## Disclaimer
 

package/dist/Auth.js

@@ -18,6 +18,7 @@ const Command_1 = require("./Command");
 const config_1 = require("./config");
 const request_1 = require("./request");
 const settingsNames_1 = require("./settingsNames");
+const browserUtil_1 = require("./utils/browserUtil");
 var CloudType;
 (function (CloudType) {
     CloudType[CloudType["Public"] = 0] = "Public";
@@ -361,14 +362,7 @@ class Auth {
         }
         logger.log(response.message);
         if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false)) {
-            // _open is never set before hitting this line, but this check
-            // is implemented so that we can support lazy loading
-            // but also stub it for testing
-            /* c8 ignore next 3 */
-            if (!this._open) {
-                this._open = require('open');
-            }
-            this._open(response.verificationUri);
+            browserUtil_1.browserUtil.open(response.verificationUri);
         }
         if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.copyDeviceCodeToClipboard, false)) {
             // _clipboardy is never set before hitting this line, but this check

package/dist/AuthServer.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthServer = void 0;
 const http = require("http");
-const open = require("open");
 const url = require("url");
 const Auth_1 = require("./Auth");
+const browserUtil_1 = require("./utils/browserUtil");
 class AuthServer {
     constructor() {
-        this.open = open;
         this.debug = false;
         this.resource = "";
         this.generatedServerUrl = "";
@@ -85,8 +84,7 @@ class AuthServer {
         return this.httpServer;
     }
     openUrl(url) {
-        this
-            .open(url)
+        browserUtil_1.browserUtil.open(url)
             .then(_ => {
             this.logger.logToStderr("To sign in, use the web browser that just has been opened. Please sign-in there.");
         })

package/dist/Command.js

@@ -40,7 +40,7 @@ class CommandErrorWithOutput {
 exports.CommandErrorWithOutput = CommandErrorWithOutput;
 class Command {
     get allowedOutputs() {
-        return ['csv', 'json', 'md', 'text'];
+        return ['csv', 'json', 'md', 'text', 'none'];
     }
     constructor() {
         // These functions must be defined with # so that they're truly private

package/dist/cli/Cli.js

@@ -107,7 +107,9 @@ class Cli {
                 showHelp ||
                 parsedArgs.h ||
                 parsedArgs.help) {
-                this.printHelp(this.getHelpMode(parsedArgs));
+                if (parsedArgs.output !== 'none') {
+                    this.printHelp(this.getHelpMode(parsedArgs));
+                }
                 return Promise.resolve();
             }
             const optionsWithoutShorts = Cli.removeShortOptions(this.optionsFromArgs);
@@ -144,11 +146,21 @@ class Cli {
         return __awaiter(this, void 0, void 0, function* () {
             const logger = {
                 log: (message) => {
-                    const output = Cli.formatOutput(command, message, args.options);
-                    Cli.log(output);
+                    if (args.options.output !== 'none') {
+                        const output = Cli.formatOutput(command, message, args.options);
+                        Cli.log(output);
+                    }
+                },
+                logRaw: (message) => {
+                    if (args.options.output !== 'none') {
+                        Cli.log(message);
+                    }
                 },
-                logRaw: (message) => Cli.log(message),
-                logToStderr: (message) => Cli.error(message)
+                logToStderr: (message) => {
+                    if (args.options.output !== 'none') {
+                        Cli.error(message);
+                    }
+                }
             };
             if (args.options.debug) {
                 logger.logToStderr(`Executing command ${command.name} with options ${JSON.stringify(args)}`);
@@ -158,7 +170,7 @@ class Cli {
             const cli = Cli.getInstance();
             const parentCommandName = cli.currentCommandName;
             cli.currentCommandName = command.getCommandName(cli.currentCommandName);
-            const showSpinner = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.showSpinner, true);
+            const showSpinner = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.showSpinner, true) && args.options.output !== 'none';
             // don't show spinner if running tests
             /* c8 ignore next 3 */
             if (showSpinner && typeof global.it === 'undefined') {
@@ -207,7 +219,7 @@ class Cli {
                     logErr.push(message);
                 }
             };
-            if (args.options.debug) {
+            if (args.options.debug && args.options.output !== 'none') {
                 const message = `Executing command ${command.name} with options ${JSON.stringify(args)}`;
                 if (listener && listener.stderr) {
                     listener.stderr(message);
@@ -730,8 +742,11 @@ class Cli {
         Cli.log();
     }
     closeWithError(error, args, showHelpIfEnabled = false) {
-        const chalk = require('chalk');
         let exitCode = 1;
+        if (args.options.output === 'none') {
+            return process.exit(exitCode);
+        }
+        const chalk = require('chalk');
         let errorMessage = error instanceof Command_1.CommandError ? error.message : error;
         if ((!args.options.output || args.options.output === 'json') &&
             !this.getSettingWithDefaultValue(settingsNames_1.settingsNames.printErrorsAsPlainText, true)) {
@@ -803,8 +818,8 @@ class Cli {
     }
     static handleMultipleResultsFound(promptMessage, errorMessage, values) {
         return __awaiter(this, void 0, void 0, function* () {
-            const interactive = Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.interactive, false);
-            if (!interactive) {
+            const prompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.prompt, false);
+            if (!prompt) {
                 throw errorMessage;
             }
             const response = yield Cli.prompt({