Updated latestVersions and refactored code (#15)

ijlee2 · web-flow · commit c05853f2158f · 2023-01-31T23:01:48.000+01:00
* chore: Updated latestVersions

* chore: Updated test fixtures

* refactor: Practiced early exits. Threw an error to catch development mistakes.

---------

Co-authored-by: ijlee2 &lt;ijlee2@users.noreply.github.com&gt;
diff --git a/src/utils/blueprints/decide-version.js b/src/utils/blueprints/decide-version.js
@@ -1,26 +1,37 @@
 const latestVersions = new Map([
   ['@babel/core', '7.20.12'],
   ['@babel/plugin-proposal-class-properties', '7.18.6'],
-  ['@babel/plugin-proposal-decorators', '7.20.7'],
+  ['@babel/plugin-proposal-decorators', '7.20.13'],
   ['@babel/preset-typescript', '7.18.6'],
   ['@embroider/addon-dev', '3.0.0'],
   ['@embroider/addon-shim', '1.8.4'],
   ['@rollup/plugin-babel', '6.0.3'],
   ['concurrently', '7.6.0'],
-  ['ember-auto-import', '2.5.0'],
+  ['ember-auto-import', '2.6.0'],
   ['ember-cli-babel', '7.26.11'],
-  ['ember-cli-htmlbars', '6.1.11'],
+  ['ember-cli-htmlbars', '6.2.0'],
   ['prettier', '2.8.3'],
-  ['rollup', '3.10.0'],
+  ['rollup', '3.12.0'],
   ['rollup-plugin-copy', '3.4.0'],
-  ['rollup-plugin-ts', '3.1.1'],
+  ['rollup-plugin-ts', '3.2.0'],
 ]);
 
 export function decideVersion(packageName, options) {
   const { packages } = options;
 
   const installedVersion = packages.addon.dependencies.get(packageName);
-  const latestVersion = `^${latestVersions.get(packageName)}`;
 
-  return installedVersion ?? latestVersion;
+  if (installedVersion) {
+    return installedVersion;
+  }
+
+  const latestVersion = latestVersions.get(packageName);
+
+  if (!latestVersion) {
+    throw new RangeError(
+      `ERROR: The latest version of \`${packageName}\` is unknown.\n`
+    );
+  }
+
+  return `^${latestVersion}`;
 }
diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json
@@ -65,12 +65,12 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@babel/preset-typescript": "^7.18.6",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.1.1"
+    "rollup-plugin-ts": "^3.2.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"
diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json
@@ -65,12 +65,12 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@babel/preset-typescript": "^7.18.6",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.1.1"
+    "rollup-plugin-ts": "^3.2.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"
diff --git a/tests/fixtures/ember-container-query-javascript/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/package.json
@@ -65,7 +65,7 @@
     "@babel/plugin-proposal-decorators": "^7.20.7",
     "@embroider/addon-dev": "^3.0.0",
     "@rollup/plugin-babel": "^6.0.3",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0"
   },
   "engines": {
diff --git a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/package.json
@@ -65,12 +65,12 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@babel/preset-typescript": "^7.18.6",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.1.1"
+    "rollup-plugin-ts": "^3.2.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"
diff --git a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/package.json
@@ -35,12 +35,12 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@babel/preset-typescript": "^7.18.6",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.1.1"
+    "rollup-plugin-ts": "^3.2.0"
   },
   "peerDependencies": {
     "ember-source": "^3.28.0 || ^4.0.0"
diff --git a/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/package.json
@@ -32,10 +32,10 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@embroider/addon-dev": "^3.0.0",
     "@rollup/plugin-babel": "^6.0.3",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0"
   },
   "peerDependencies": {
diff --git a/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/package.json
@@ -32,10 +32,10 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@embroider/addon-dev": "^3.0.0",
     "@rollup/plugin-babel": "^6.0.3",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0"
   },
   "peerDependencies": {
diff --git a/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/package.json
@@ -32,10 +32,10 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@embroider/addon-dev": "^3.0.0",
     "@rollup/plugin-babel": "^6.0.3",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0"
   },
   "peerDependencies": {
diff --git a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/package.json
@@ -35,12 +35,12 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@babel/preset-typescript": "^7.18.6",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.1.1"
+    "rollup-plugin-ts": "^3.2.0"
   },
   "peerDependencies": {
     "ember-source": "^3.28.0 || ^4.0.0"
diff --git a/tests/fixtures/steps/update-addon-package-json/customizations/output/packages/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/customizations/output/packages/ember-container-query/package.json
@@ -65,12 +65,12 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@babel/preset-typescript": "^7.18.6",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.1.1"
+    "rollup-plugin-ts": "^3.2.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"
diff --git a/tests/fixtures/steps/update-addon-package-json/glint/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/glint/output/ember-container-query/package.json
@@ -65,12 +65,12 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@babel/preset-typescript": "^7.18.6",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.1.1"
+    "rollup-plugin-ts": "^3.2.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"
diff --git a/tests/fixtures/steps/update-addon-package-json/javascript/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/javascript/output/ember-container-query/package.json
@@ -65,7 +65,7 @@
     "@babel/plugin-proposal-decorators": "^7.20.7",
     "@embroider/addon-dev": "^3.0.0",
     "@rollup/plugin-babel": "^6.0.3",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0"
   },
   "engines": {
diff --git a/tests/fixtures/steps/update-addon-package-json/typescript/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/typescript/output/ember-container-query/package.json
@@ -65,12 +65,12 @@
   "devDependencies": {
     "@babel/core": "^7.20.12",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.13",
     "@babel/preset-typescript": "^7.18.6",
     "@embroider/addon-dev": "^3.0.0",
-    "rollup": "^3.10.0",
+    "rollup": "^3.12.0",
     "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.1.1"
+    "rollup-plugin-ts": "^3.2.0"
   },
   "engines": {
     "node": "14.* || 16.* || >= 18"
diff --git a/tests/utils/blueprints/decide-version.test.js b/tests/utils/blueprints/decide-version.test.js
@@ -8,8 +8,24 @@ test('utils | blueprints | decide-version > package is installed', function () {
   assert.strictEqual(version, '^2.8.1');
 });
 
-test('utils | blueprints | decide-version > package is not installed', function () {
+test('utils | blueprints | decide-version > package is not installed and we provide the latest version', function () {
   const version = decideVersion('rollup', options);
 
-  assert.strictEqual(version, '^3.10.0');
+  assert.strictEqual(version, '^3.12.0');
+});
+
+test('utils | blueprints | decide-version > package is not installed and we forgot to provide the latest version', function () {
+  assert.throws(
+    () => {
+      decideVersion('some-package-not-part-of-blueprint', options);
+    },
+    (error) => {
+      assert.strictEqual(
+        error.message,
+        'ERROR: The latest version of `some-package-not-part-of-blueprint` is unknown.\n'
+      );
+
+      return true;
+    }
+  );
 });
