ember-try 2.0.0 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # Changelog
 
+
+
+## v3.0.0 (2023-08-16)
+
+#### :boom: Breaking Change
+* [#920](https://github.com/ember-cli/ember-try/pull/920) Drop Node.js 14 support ([@SergeAstapov](https://github.com/SergeAstapov))
+
+#### :rocket: Enhancement
+* [#960](https://github.com/ember-cli/ember-try/pull/960) Use pnpm's --no-lockfile ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+* [#956](https://github.com/ember-cli/ember-try/pull/956) Remove warning about pnpm ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+* [#850](https://github.com/ember-cli/ember-try/pull/850) Add support for npm overrides ([@mansona](https://github.com/mansona))
+
+#### :memo: Documentation
+* [#957](https://github.com/ember-cli/ember-try/pull/957) Document pnpm options and behavior ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
+
+#### :house: Internal
+* [#934](https://github.com/ember-cli/ember-try/pull/934) Update github CI yaml ([@mansona](https://github.com/mansona))
+* [#933](https://github.com/ember-cli/ember-try/pull/933) Update smoke test to fix CI ([@mansona](https://github.com/mansona))
+* [#893](https://github.com/ember-cli/ember-try/pull/893) update smoke-test-app to fix CI ([@mansona](https://github.com/mansona))
+
+#### Committers: 3
+- Chris Manson ([@mansona](https://github.com/mansona))
+- Sergey Astapov ([@SergeAstapov](https://github.com/SergeAstapov))
+- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
+
+## v3.0.0-beta.1 (2023-03-01)
+
+#### :boom: Breaking Change
+* [#913](https://github.com/ember-cli/ember-try/pull/913) Bump node to supported versions ([@hjdivad](https://github.com/hjdivad))
+
+#### :bug: Bug Fix
+* [#912](https://github.com/ember-cli/ember-try/pull/912) Downgraded fs-extra version to 6.x to fix a fs.copy related issue. ([@larry-x-yu](https://github.com/larry-x-yu))
+
+#### :memo: Documentation
+* [#798](https://github.com/ember-cli/ember-try/pull/798) Fix a link in CHANGELOG.md ([@lolmaus](https://github.com/lolmaus))
+
+#### :house: Internal
+* [#788](https://github.com/ember-cli/ember-try/pull/788) tests/npm-adapter: Use async/await instead of promise chains ([@Turbo87](https://github.com/Turbo87))
+
+#### Committers: 4
+- Andrey Mikhaylov (lolmaus) ([@lolmaus](https://github.com/lolmaus))
+- David J. Hamilton ([@hjdivad](https://github.com/hjdivad))
+- Tobias Bieniek ([@Turbo87](https://github.com/Turbo87))
+- [@larry-x-yu](https://github.com/larry-x-yu)
+
 ## v2.0.0 (2021-11-04)
 
 #### :boom: Breaking Change
@@ -36,8 +81,7 @@
 
 **Implemented enhancements:**
 
-- Add support for merging/clobbering `ember` in `package.json`. [\#429](https://github.com/ember-c
-li/ember-try/pull/429) ([rwjblue](https://github.com/rwjblue))
+- Add support for merging/clobbering `ember` in `package.json`. [\#429](https://github.com/ember-cli/ember-try/pull/429) ([rwjblue](https://github.com/rwjblue))
 
 ## [v1.3.0](https://github.com/ember-cli/ember-try/tree/v1.3.0)
 

package/README.md

@@ -120,6 +120,11 @@ module.exports = async function() {
       dependencies will be restored to their prior state.
     */
     useYarn: true,
+    /*
+      If set to true, all npm scenarios will use `pnpm` for install with the `--no-lockfile` options. At cleanup, your
+      dependencies will be restored to their prior state.
+    */
+    usePnpm: true,
 
     /*
       buildManagerOptions allows you to opt-out of the default options such as `--ignore-engines --no-lockfile`.
@@ -143,6 +148,14 @@ module.exports = async function() {
           devDependencies: {
             'ember-source': '2.11.0'
           },
+          /*
+            You can optionally define npm or pnpm overrides to enforce a  specific dependency version
+            to be installed. This is useful if other libraries you depend on include different
+            versions of a package. This does nothing if `useYarn` is true;
+          */
+          overrides: {
+            'lodash': '5.0.0'
+          }
           /*
             When `useYarn` is true, you can optionally define yarn resolutions to enforce a
             specific dependency version to be installed. This is useful if other libraries
@@ -198,9 +211,14 @@ The `name` can be used to try just one scenario using the `ember try:one` comman
 
 If you include `useYarn: true` in your `ember-try` config, all npm scenarios will use `yarn` for install with the `--no-lockfile` option. At cleanup, your dependencies will be restored to their prior state.
 
+##### Pnpm
+
+If you include `usePnpm: true` in your `ember-try` config, all npm scenarios will use `pnpm` for install with the `--no-lockfile` options. At cleanup, your dependencies will be restored to their prior state.
+
+
 ##### A note on npm scenarios with lockfiles
 
-Lockfiles are ignored by `ember-try`. (`yarn` will run with `--no-lockfile` and `npm` will be run with `--no-shrinkwrap`).
+Lockfiles are ignored by `ember-try`. (`yarn` will run with `--no-lockfile` and `npm` will be run with `--no-shrinkwrap` and `pnpm` will be run with `--no-lockfile`).
 When testing various scenarios, it's important to "float" dependencies so that the scenarios are run with the latest satisfying versions of dependencies a user of the project would get.
 
 ##### Workspaces

package/lib/dependency-manager-adapters/npm.js

@@ -8,6 +8,7 @@ const path = require('path');
 const debug = require('debug')('ember-try:dependency-manager-adapter:npm');
 const rimraf = util.promisify(require('rimraf'));
 const chalk = require('chalk');
+const semver = require('semver');
 
 module.exports = CoreObject.extend({
   init() {
@@ -178,6 +179,8 @@ module.exports = CoreObject.extend({
 
     if (this.useYarnCommand) {
       this._overridePackageJSONDependencies(packageJSON, depSet, 'resolutions');
+    } else {
+      this._overridePackageJSONDependencies(packageJSON, depSet, 'overrides');
     }
 
     return packageJSON;
@@ -200,6 +203,18 @@ module.exports = CoreObject.extend({
         delete packageJSON[kindOfDependency][packageName];
       } else {
         packageJSON[kindOfDependency][packageName] = version;
+
+        // in npm we need to always add an override if the version is a pre-release
+        if (
+          !this.useYarnCommand &&
+          (semver.prerelease(version) || /^https*:\/\/.*\.tg*z/.test(version))
+        ) {
+          if (!packageJSON.overrides) {
+            packageJSON.overrides = {};
+          }
+
+          packageJSON.overrides[packageName] = `$${packageName}`;
+        }
       }
     });
   },

package/lib/dependency-manager-adapters/pnpm.js

@@ -97,8 +97,10 @@ module.exports = CoreObject.extend({
       if (!Array.isArray(mgrOptions)) {
         throw new Error('buildManagerOptions must return an array of options');
       }
-    } else if (!mgrOptions.includes('--frozen-lockfile=false')) {
-      mgrOptions.push('--frozen-lockfile=false');
+    } else {
+      if (!mgrOptions.includes('--no-lockfile')) {
+        mgrOptions.push('--no-lockfile');
+      }
     }
 
     // Note: We are explicitly *not* using `--no-lockfile` here, so that we

package/lib/utils/dependency-manager-adapter-factory.js

@@ -36,10 +36,6 @@ module.exports = {
         })
       );
     } else if (config.usePnpm) {
-      console.warn(
-        'pnpm support is experimental for now. if you notice any problems please open an issue.'
-      );
-
       adapters.push(
         new PnpmAdapter({
           cwd: root,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-try",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "An ember-cli addon to test against multiple dependencies, such as ember and ember-data.",
   "keywords": [
     "ember-addon",
@@ -35,9 +35,10 @@
     "debug": "^4.3.2",
     "ember-try-config": "^4.0.0",
     "execa": "^4.1.0",
-    "fs-extra": "^9.0.1",
+    "fs-extra": "^6.0.1",
     "resolve": "^1.20.0",
     "rimraf": "^3.0.2",
+    "semver": "^7.5.4",
     "walk-sync": "^2.2.0"
   },
   "devDependencies": {
@@ -60,7 +61,7 @@
     "tmp-sync": "^1.1.0"
   },
   "engines": {
-    "node": "10.* || 12.* || >= 14.*"
+    "node": "16.* || >= 18.*"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"