Merge branch 'master' into cimpl-1241-date-time-format

package.json

@@ -67,7 +67,7 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "antlr4": "~4.8.0",
+    "antlr4": "~4.13.1-patch-1",
     "chalk": "^4.1.0",
     "commander": "^6.0.0",
     "diff": "^5.0.0",

src/optimizer/utils.ts

@@ -88,7 +88,7 @@ export function resolveAliasFromURL(url: string, aliases: ExportableAlias[]): st
     const parsedURL = new URL(url);
     const rawAlias =
       parsedURL.pathname && parsedURL.pathname !== '/'
-        ? parsedURL.pathname?.split('/').slice(-1)[0]
+        ? parsedURL.pathname?.split('/').slice(parsedURL.pathname.endsWith('/') ? -2 : -1)[0]
         : parsedURL.hostname?.replace('www.', '').split('.')[0];
 
     if (rawAlias == null) {

test/optimizer/utils.test.ts

@@ -230,6 +230,16 @@ describe('optimizer', () => {
           url: 'http://example.org/foo-bar_3.1~te$t'
         });
       });
+
+      it('should ensure newly created aliases are not ONLY $', () => {
+        const originalLength = aliases.length;
+        expect(resolveAliasFromURL('http://example.org/foo-bar/', aliases)).toBe('$foo-bar');
+        expect(aliases).toHaveLength(originalLength + 1);
+        expect(aliases[aliases.length - 1]).toEqual({
+          alias: '$foo-bar',
+          url: 'http://example.org/foo-bar/'
+        });
+      });
     });
   });
 });