Updated blueprints for workspace root (#28)

* chore: Set ecmaVersion to latest

* refactor: Removed util dependency in test setup

* refactor: Generalized blueprintsRoot

* chore: Updated latestVersions

* refactor: Created temporary variable

* refactor: Removed prettier from workspace root (not necessary)

* chore: Updated test fixtures

* chore: Checked that the shared test setups are correct

---------

Co-authored-by: ijlee2 <[email protected]>

Author: ijlee2

.eslintrc.cjs

@@ -4,7 +4,7 @@ module.exports = {
   root: true,
   parser: '@babel/eslint-parser',
   parserOptions: {
-    ecmaVersion: 2018,
+    ecmaVersion: 'latest',
     requireConfigFile: false,
     sourceType: 'module',
   },

src/blueprints/ember-addon/.prettierignore

@@ -1,25 +1,24 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
-
 # compiled output
-dist/
+/dist/
 
 # dependencies
-node_modules/
+/node_modules/
 
 # misc
 /.env*
 /.pnp*
-/.pnpm-debug.log
-/.sass-cache
-.eslintcache
-/connect.lock
+/.eslintcache
 /coverage/
-/libpeerconnection.log
 /npm-debug.log*
 /testem.log
 /yarn-error.log
 
 # ember-try
 /.node_modules.ember-try/
+/npm-shrinkwrap.json.ember-try
 /package.json.ember-try
+/package-lock.json.ember-try
 /yarn.lock.ember-try
+
+# broccoli-debug
+/DEBUG/

src/blueprints/ember-addon/.prettierrc.js

@@ -20,8 +20,7 @@
     "test": "npm run test --workspaces --if-present"
   },
   "devDependencies": {
-    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>",
-    "prettier": "<%= context.projectRoot.devDependencies['prettier'] %>"
+    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
 }<% } else if (options.packageManager.isPnpm) { %>{
   "name": "<%= options.packages.addon.name %>",
@@ -41,8 +40,7 @@
     "test": "pnpm --filter '*' test"
   },
   "devDependencies": {
-    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>",
-    "prettier": "<%= context.projectRoot.devDependencies['prettier'] %>"
+    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
 }<% } else if (options.packageManager.isYarn) { %>{
   "name": "<%= options.packages.addon.name %>",
@@ -66,7 +64,6 @@
     "test": "yarn workspaces run test"
   },
   "devDependencies": {
-    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>",
-    "prettier": "<%= context.projectRoot.devDependencies['prettier'] %>"
+    "concurrently": "<%= context.projectRoot.devDependencies['concurrently'] %>"
   }
 }<% } %>

src/blueprints/ember-addon/__gitignore__

@@ -21,7 +21,6 @@ function getAppReexports(options) {
 function getProjectRootDevDependencies(options) {
   return {
     concurrently: decideVersion('concurrently', options),
-    prettier: decideVersion('prettier', options),
   };
 }
 

src/blueprints/ember-addon/package.json

@@ -1,7 +1,7 @@
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 
-import { blueprintRoot, processTemplate } from '../../../utils/blueprints.js';
+import { blueprintsRoot, processTemplate } from '../../../utils/blueprints.js';
 import { createFiles, findFiles } from '../../../utils/files.js';
 
 function getFilePath(blueprintFilePath, options) {
@@ -32,9 +32,10 @@ function getFilesToSkip(options) {
 
 export function createFilesFromBlueprint(context, options) {
   const filesToSkip = getFilesToSkip(options);
+  const emberAddonBlueprintsRoot = join(blueprintsRoot, 'ember-addon');
 
   const blueprintFilePaths = findFiles('**/*', {
-    cwd: blueprintRoot,
+    cwd: emberAddonBlueprintsRoot,
     ignoreList: filesToSkip,
   });
 
@@ -43,7 +44,7 @@ export function createFilesFromBlueprint(context, options) {
       const filePath = getFilePath(blueprintFilePath, options);
 
       const blueprintFile = readFileSync(
-        join(blueprintRoot, blueprintFilePath),
+        join(emberAddonBlueprintsRoot, blueprintFilePath),
         'utf8',
       );
 

src/migration/ember-addon/steps/analyze-addon.js

@@ -96,8 +96,9 @@ function analyzePackageManager(codemodOptions) {
 }
 
 function deriveAddonLocation(addonPackage) {
-  // Package is not scoped
-  if (!addonPackage.name.includes('/')) {
+  const hasScope = addonPackage.name.includes('/');
+
+  if (!hasScope) {
     return addonPackage.name;
   }
 

src/migration/ember-addon/steps/create-files-from-blueprint.js

@@ -1,3 +1,3 @@
-export * from './blueprints/blueprint-root.js';
+export * from './blueprints/blueprints-root.js';
 export * from './blueprints/decide-version.js';
 export * from './blueprints/process-template.js';

src/migration/ember-addon/steps/create-options.js

@@ -4,10 +4,10 @@ import { fileURLToPath } from 'node:url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-function getBlueprintRoot() {
+function getBlueprintsRoot() {
   const srcDirectory = join(__dirname, '../..');
 
-  return join(srcDirectory, 'blueprints/ember-addon');
+  return join(srcDirectory, 'blueprints');
 }
 
-export const blueprintRoot = getBlueprintRoot();
+export const blueprintsRoot = getBlueprintsRoot();