ember-cli 3.28.1 → 4.0.0-beta.2

package/docs/build/files/lib_models_package-info-cache_package-info.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_models_per-bundle-addon-cache_addon-proxy.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_models_per-bundle-addon-cache_index.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_models_per-bundle-addon-cache_target-instance.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_models_project.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_models_task.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_tasks_build-watch.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_tasks_npm-task.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>
@@ -86,6 +86,7 @@
 
 const chalk = require(&#x27;chalk&#x27;);
 const execa = require(&#x27;../utilities/execa&#x27;);
+const findUp = require(&#x27;find-up&#x27;);
 const semver = require(&#x27;semver&#x27;);
 const SilentError = require(&#x27;silent-error&#x27;);
 const isYarnProject = require(&#x27;../utilities/is-yarn-project&#x27;);
@@ -110,6 +111,10 @@ class NpmTask extends Task {
     this.versionConstraints = &#x27;3 || 4 || 5 || 6&#x27;;
   }
 
+  get packageManagerOutputName() {
+    return this.packageManager.name;
+  }
+
   npm(args) {
     logger.info(&#x27;npm: %j&#x27;, args);
     return execa(&#x27;npm&#x27;, args, { preferLocal: false });
@@ -120,10 +125,19 @@ class NpmTask extends Task {
     return execa(&#x27;yarn&#x27;, args, { preferLocal: false });
   }
 
+  pnpm(args) {
+    logger.info(&#x27;pnpm: %j&#x27;, args);
+    return execa(&#x27;pnpm&#x27;, args, { preferLocal: false });
+  }
+
   hasYarnLock() {
     return isYarnProject(this.project.root);
   }
 
+  async hasPNPMLock() {
+    return Boolean(await findUp(&#x27;pnpm-lock.yaml&#x27;, { cwd: this.project.root }));
+  }
+
   async checkYarn() {
     try {
       let result = await this.yarn([&#x27;--version&#x27;]);
@@ -136,9 +150,7 @@ class NpmTask extends Task {
         logger.info(&#x27;yarn --version: %s&#x27;, version);
       }
 
-      this.useYarn = true;
-
-      return { yarnVersion: version };
+      return { name: &#x27;yarn&#x27;, version };
     } catch (error) {
       logger.error(&#x27;yarn --version failed: %s&#x27;, error);
 
@@ -153,6 +165,28 @@ class NpmTask extends Task {
     }
   }
 
+  async checkPNPM() {
+    try {
+      let result = await this.pnpm([&#x27;--version&#x27;]);
+      let version = result.stdout;
+
+      logger.info(&#x27;pnpm --version: %s&#x27;, version);
+
+      return { name: &#x27;pnpm&#x27;, version };
+    } catch (error) {
+      logger.error(&#x27;pnpm --version failed: %s&#x27;, error);
+
+      if (error.code === &#x27;ENOENT&#x27;) {
+        throw new SilentError(
+          &#x27;Ember CLI is now using pnpm, but was not able to find it.\n&#x27; +
+            &#x27;Please install pnpm using the instructions at https://pnpm.io/installation&#x27;
+        );
+      }
+
+      throw error;
+    }
+  }
+
   async checkNpmVersion() {
     try {
       let result = await this.npm([&#x27;--version&#x27;]);
@@ -177,7 +211,7 @@ class NpmTask extends Task {
         );
       }
 
-      return { npmVersion: version };
+      return { name: &#x27;npm&#x27;, version };
     } catch (error) {
       logger.error(&#x27;npm --version failed: %s&#x27;, error);
 
@@ -206,37 +240,55 @@ class NpmTask extends Task {
    * @method findPackageManager
    * @return {Promise}
    */
-  async findPackageManager() {
-    if (this.useYarn === true) {
+  async findPackageManager(packageManager = null) {
+    if (packageManager === &#x27;yarn&#x27;) {
       logger.info(&#x27;yarn requested -&gt; trying yarn&#x27;);
       return this.checkYarn();
     }
 
-    if (this.useYarn === false) {
+    if (packageManager === &#x27;npm&#x27;) {
       logger.info(&#x27;npm requested -&gt; using npm&#x27;);
       return this.checkNpmVersion();
     }
 
-    if (!this.hasYarnLock()) {
-      logger.info(&#x27;yarn.lock not found -&gt; using npm&#x27;);
-      return this.checkNpmVersion();
+    if (packageManager === &#x27;pnpm&#x27;) {
+      logger.info(&#x27;pnpm requested -&gt; using pnpm&#x27;);
+      return this.checkPNPM();
     }
 
-    logger.info(&#x27;yarn.lock found -&gt; trying yarn&#x27;);
-    try {
-      const yarnResult = await this.checkYarn();
-      logger.info(&#x27;yarn found -&gt; using yarn&#x27;);
-      return yarnResult;
-    } catch (_err) {
-      logger.info(&#x27;yarn not found -&gt; using npm&#x27;);
-      return this.checkNpmVersion();
+    if (this.hasYarnLock()) {
+      logger.info(&#x27;yarn.lock found -&gt; trying yarn&#x27;);
+      try {
+        const yarnResult = await this.checkYarn();
+        logger.info(&#x27;yarn found -&gt; using yarn&#x27;);
+        return yarnResult;
+      } catch (_err) {
+        logger.info(&#x27;yarn not found&#x27;);
+      }
+    } else {
+      logger.info(&#x27;yarn.lock not found&#x27;);
+    }
+
+    if (this.hasPNPMLock()) {
+      logger.info(&#x27;pnpm-lock.yaml found -&gt; trying pnpm&#x27;);
+      try {
+        let result = await this.checkPNPM();
+        logger.info(&#x27;pnpm found -&gt; using pnpm&#x27;);
+        return result;
+      } catch (_err) {
+        logger.info(&#x27;pnpm not found&#x27;);
+      }
+    } else {
+      logger.info(&#x27;pnpm-lock.yaml not found&#x27;);
     }
+
+    logger.info(&#x27;using npm&#x27;);
+    return this.checkNpmVersion();
   }
 
   async run(options) {
-    this.useYarn = options.useYarn;
+    this.packageManager = await this.findPackageManager(options.packageManager);
 
-    let result = await this.findPackageManager();
     let ui = this.ui;
     let startMessage = this.formatStartMessage(options.packages);
     let completeMessage = this.formatCompleteMessage(options.packages);
@@ -247,31 +299,37 @@ class NpmTask extends Task {
     ui.writeLine(prependEmoji(&#x27;🚧&#x27;, &#x27;Installing packages... This might take a couple of minutes.&#x27;));
     ui.startProgress(chalk.green(startMessage));
 
-    let promise;
-    if (this.useYarn) {
-      this.yarnVersion = result.yarnVersion;
-      let args = this.toYarnArgs(this.command, options);
-      promise = this.yarn(args);
-    } else {
-      let args = this.toNpmArgs(this.command, options);
-      promise = this.npm(args);
-
-      // as of 2018-10-09 npm 5 and 6 _break_ the hierarchy of &#x60;node_modules&#x60;
-      // after a &#x60;npm install foo&#x60; (deletes files/folders other than
-      // what was directly installed) in some circumstances, see:
-      //
-      // * https://github.com/npm/npm/issues/16853
-      // * https://github.com/npm/npm/issues/17379
-      //
-      // this ensures that we run a full &#x60;npm install&#x60; **after** any &#x60;npm
-      // install foo&#x60; runs to ensure that we have a fully functional
-      // node_modules hierarchy
-      if (result.npmVersion &amp;&amp; semver.lt(result.npmVersion, &#x27;5.7.1&#x27;)) {
-        promise = promise.then(() =&gt; this.npm([&#x27;install&#x27;]));
+    try {
+      if (this.packageManager.name === &#x27;yarn&#x27;) {
+        let args = this.toYarnArgs(this.command, options);
+        await this.yarn(args);
+      } else if (this.packageManager.name === &#x27;pnpm&#x27;) {
+        let args = this.toPNPMArgs(this.command, options);
+        await this.pnpm(args);
+      } else {
+        let args = this.toNpmArgs(this.command, options);
+        await this.npm(args);
+
+        // as of 2018-10-09 npm 5 and 6 _break_ the hierarchy of &#x60;node_modules&#x60;
+        // after a &#x60;npm install foo&#x60; (deletes files/folders other than
+        // what was directly installed) in some circumstances, see:
+        //
+        // * https://github.com/npm/npm/issues/16853
+        // * https://github.com/npm/npm/issues/17379
+        //
+        // this ensures that we run a full &#x60;npm install&#x60; **after** any &#x60;npm
+        // install foo&#x60; runs to ensure that we have a fully functional
+        // node_modules hierarchy
+        let npmVersion = this.packageManager.version;
+        if (npmVersion &amp;&amp; semver.lt(npmVersion, &#x27;5.7.1&#x27;)) {
+          await this.npm([&#x27;install&#x27;]);
+        }
       }
+    } finally {
+      ui.stopProgress();
     }
 
-    return promise.finally(() =&gt; ui.stopProgress()).then(() =&gt; ui.writeLine(chalk.green(completeMessage)));
+    ui.writeLine(chalk.green(completeMessage));
   }
 
   toNpmArgs(command, options) {
@@ -294,9 +352,9 @@ class NpmTask extends Task {
     }
 
     if (options.verbose) {
-      args.push(&#x27;--loglevel verbose&#x27;);
+      args.push(&#x27;--loglevel&#x27;, &#x27;verbose&#x27;);
     } else {
-      args.push(&#x27;--loglevel error&#x27;);
+      args.push(&#x27;--loglevel&#x27;, &#x27;error&#x27;);
     }
 
     if (options.packages) {
@@ -344,13 +402,43 @@ class NpmTask extends Task {
     // Yarn v2 defaults to non-interactive
     // with an optional -i flag
 
-    if (semver.lt(this.yarnVersion, &#x27;2.0.0&#x27;)) {
+    if (semver.lt(this.packageManager.version, &#x27;2.0.0&#x27;)) {
       args.push(&#x27;--non-interactive&#x27;);
     }
 
     return args;
   }
 
+  toPNPMArgs(command, options) {
+    let args = [];
+
+    if (command === &#x27;install&#x27;) {
+      if (options.save) {
+        args.push(&#x27;add&#x27;);
+      } else if (options[&#x27;save-dev&#x27;]) {
+        args.push(&#x27;add&#x27;, &#x27;--save-dev&#x27;);
+      } else if (options.packages) {
+        throw new Error(&#x60;npm command &quot;${command} ${options.packages.join(&#x27; &#x27;)}&quot; can not be translated to pnpm command&#x60;);
+      } else {
+        args.push(&#x27;install&#x27;);
+      }
+
+      if (options[&#x27;save-exact&#x27;]) {
+        args.push(&#x27;--save-exact&#x27;);
+      }
+    } else if (command === &#x27;uninstall&#x27;) {
+      args.push(&#x27;remove&#x27;);
+    } else {
+      throw new Error(&#x60;npm command &quot;${command}&quot; can not be translated to pnpm command&#x60;);
+    }
+
+    if (options.packages) {
+      args = args.concat(options.packages);
+    }
+
+    return args;
+  }
+
   formatStartMessage(/* packages */) {
     return &#x27;&#x27;;
   }

package/docs/build/files/lib_tasks_serve.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_tasks_server_middleware_broccoli-serve-files_index.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_tasks_server_middleware_broccoli-watcher_index.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_tasks_server_middleware_history-support_index.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_tasks_server_middleware_tests-server_index.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_tasks_test-server.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_tasks_transforms_amd_index.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_utilities_ember-app-utils.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_utilities_insert-into-file.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_utilities_is-lazy-engine.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_utilities_is-yarn-project.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_utilities_valid-project-name.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_utilities_will-interrupt-process.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/files/lib_utilities_windows-admin.js.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/build/index.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>
@@ -107,7 +107,7 @@ the in-depth documentation.</p>
 <p>Please see the <a href="https://github.com/ember-cli/ember-cli/blob/master/CONTRIBUTING.md">contributing guidelines</a></p>
 <h2>Community</h2>
 <ul>
-<li>Discord: <a href="https://discordapp.com/invite/zT3asNS">Get your invite</a></li>
+<li>Discord: <a href="https://discord.gg/emberjs">Get your invite</a></li>
 <li>Issues: <a href="https://github.com/ember-cli/ember-cli/issues">ember-cli/issues</a></li>
 <li>Documentation: <a href="https://cli.emberjs.com/release/">ember-cli.com</a></li>
 </ul>

package/docs/build/modules/ember-cli.html

@@ -96,14 +96,14 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>
 
         <div id="main" class="yui3-u">
             <div class="content"><div class="title">
-  <span class="source-link"><a href="../files/lib_tasks_npm-task.js.html#l16"><code>lib&#x2F;tasks&#x2F;npm-task.js:16</code></a></span>
+  <span class="source-link"><a href="../files/lib_tasks_npm-task.js.html#l17"><code>lib&#x2F;tasks&#x2F;npm-task.js:17</code></a></span>
   <h1 class="module-name">ember-cli</h1>
 </div>
 

package/docs/build/modules/is-lazy-engine.html

@@ -69,7 +69,7 @@
             
             
             <div class="version-info">
-              Version: 3.28.1-release-15b9b49441
+              Version: 4.0.0-beta.2-beta-6d064ff49f
             </div>
             
         </div>

package/docs/perf-guide.md

@@ -238,6 +238,8 @@ To generate visualization:
 
 
 Each build will generate an additional graph, `instrumentation.build.<build-number>.json`
+  
+Alternatively, you can upload the JSON file to https://heimdalljs.github.io/heimdalljs-visualizer/
 
 #### in-depth look