Documented the case of a scoped package (#17)

* chore: Added test fixtures

* chore: Added tests

* bugfix: Updated the regular expression for finding old paths

* chore: Updated test fixtures

* bugfix: Listed the locations of the addon and test-app in the workspaces field

* chore: Updated test fixtures

* chore: Standardized test setup (create-options)

---------

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

Author: ijlee2

codemod-test-fixtures.sh

@@ -15,6 +15,7 @@
 ./codemod-test-fixture.sh -a "packages/ember-container-query" -t "demo-app" -T "demo-app-for-ember-container-query" ember-container-query-customizations
 ./codemod-test-fixture.sh ember-container-query-glint
 ./codemod-test-fixture.sh ember-container-query-javascript
+./codemod-test-fixture.sh ember-container-query-scoped
 ./codemod-test-fixture.sh ember-container-query-typescript
 ./codemod-test-fixture.sh -a "packages/new-v1-addon" -t "demo-app" -T "demo-app-for-new-v1-addon" new-v1-addon-customizations
 ./codemod-test-fixture.sh new-v1-addon-javascript

src/blueprints/ember-addon/package.json

@@ -6,8 +6,8 @@
   "license": "MIT",
   "author": "",
   "workspaces": [
-    "<%= options.packages.addon.name %>",
-    "<%= options.packages.testApp.name %>"
+    "<%= options.locations.addon %>",
+    "<%= options.locations.testApp %>"
   ],
   "scripts": {
     "build": "npm run build --workspace <%= options.packages.addon.name %>",
@@ -31,8 +31,8 @@
   "license": "MIT",
   "author": "",
   "workspaces": [
-    "<%= options.packages.addon.name %>",
-    "<%= options.packages.testApp.name %>"
+    "<%= options.locations.addon %>",
+    "<%= options.locations.testApp %>"
   ],
   "scripts": {
     "build": "pnpm --filter <%= options.packages.addon.name %> build",
@@ -56,8 +56,8 @@
   "license": "MIT",
   "author": "",
   "workspaces": [
-    "<%= options.packages.addon.name %>",
-    "<%= options.packages.testApp.name %>"
+    "<%= options.locations.addon %>",
+    "<%= options.locations.testApp %>"
   ],
   "scripts": {
     "build": "yarn workspace <%= options.packages.addon.name %> run build",

src/blueprints/ember-addon/pnpm-workspace.yaml

@@ -1,3 +1,3 @@
 packages:
-  - '<%= options.packages.addon.name %>'
-  - '<%= options.packages.testApp.name %>'
+  - '<%= options.locations.addon %>'
+  - '<%= options.locations.testApp %>'

src/migration/ember-addon/steps/use-relative-paths.js

@@ -12,21 +12,22 @@ function normalizeRelativePath(relativePath) {
 }
 
 function updateFile(oldFile, { filePath, projectName, projectRoot }) {
-  const regex = new RegExp(`\\b${projectName}/(.*/)*(.*)\\b`, 'g');
+  const regex = new RegExp(`(?:'|")(${projectName}/(.*/)*(.*))(?:'|")`, 'g');
   const matchResults = [...oldFile.matchAll(regex)];
 
   let newFile = oldFile;
 
   matchResults.forEach((matchResult) => {
-    const [magicImportPath, remainingDirectories, fileName] = matchResult;
+    // eslint-disable-next-line no-unused-vars
+    const [_, oldPath, remainingDirectories, fileName] = matchResult;
 
     const from = dirname(filePath);
     const to = join(projectRoot, remainingDirectories);
 
     const relativePath = join(relative(from, to), fileName);
-    const trueImportPath = normalizeRelativePath(relativePath);
+    const newPath = normalizeRelativePath(relativePath);
 
-    newFile = newFile.replace(magicImportPath, trueImportPath);
+    newFile = newFile.replace(oldPath, newPath);
   });
 
   return newFile;

tests/fixtures/ember-container-query-customizations/output/package.json

@@ -6,8 +6,8 @@
   "license": "MIT",
   "author": "",
   "workspaces": [
-    "ember-container-query",
-    "demo-app-for-ember-container-query"
+    "packages/ember-container-query",
+    "demo-app"
   ],
   "scripts": {
     "build": "yarn workspace ember-container-query run build",

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/src/helpers/cq-aspect-ratio.ts

@@ -13,7 +13,7 @@ deprecate(
       enabled: '3.2.0',
     },
     until: '4.0.0',
-    url: 'https://github.com/ijlee2/../tree/3.2.0#api',
+    url: 'https://github.com/ijlee2/ember-container-query/tree/3.2.0#api',
   }
 );
 

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/src/helpers/cq-height.ts

@@ -13,7 +13,7 @@ deprecate(
       enabled: '3.2.0',
     },
     until: '4.0.0',
-    url: 'https://github.com/ijlee2/../tree/3.2.0#api',
+    url: 'https://github.com/ijlee2/ember-container-query/tree/3.2.0#api',
   }
 );
 

tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/src/helpers/cq-width.ts

@@ -13,7 +13,7 @@ deprecate(
       enabled: '3.2.0',
     },
     until: '4.0.0',
-    url: 'https://github.com/ijlee2/../tree/3.2.0#api',
+    url: 'https://github.com/ijlee2/ember-container-query/tree/3.2.0#api',
   }
 );
 

tests/fixtures/ember-container-query-glint/output/ember-container-query/src/helpers/cq-aspect-ratio.ts

@@ -13,7 +13,7 @@ deprecate(
       enabled: '3.2.0',
     },
     until: '4.0.0',
-    url: 'https://github.com/ijlee2/../tree/3.2.0#api',
+    url: 'https://github.com/ijlee2/ember-container-query/tree/3.2.0#api',
   }
 );
 

tests/fixtures/ember-container-query-glint/output/ember-container-query/src/helpers/cq-height.ts

@@ -13,7 +13,7 @@ deprecate(
       enabled: '3.2.0',
     },
     until: '4.0.0',
-    url: 'https://github.com/ijlee2/../tree/3.2.0#api',
+    url: 'https://github.com/ijlee2/ember-container-query/tree/3.2.0#api',
   }
 );