fix(ts): update ts lib default local module path

ionic-team · Aug 15, 2020 · 16f30bc · 16f30bc
1 parent 76bbac4
commit 16f30bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/compiler/sys/typescript/tests/typescript-sys.spec.ts b/src/compiler/sys/typescript/tests/typescript-sys.spec.ts
@@ -9,23 +9,23 @@ describe('getTypescriptPathFromUrl', () => {
   };
 
   it('not typescript, return url', () => {
-    const tsExecutingUrl = 'https://cdn.jsdelivr.net/npm/[email protected]/lib/typescript.js';
+    const tsExecutingUrl = 'https://cdn.jsdelivr.net/npm/@stencil/[email protected]/compiler/stencil.js';
     const url = 'https://cdn.jsdelivr.net/npm/something/index.js';
     const r = getTypescriptPathFromUrl(config, tsExecutingUrl, url);
     expect(r).toBe('https://cdn.jsdelivr.net/npm/something/index.js');
   });
 
   it('ts path from url, version', () => {
-    const tsExecutingUrl = 'https://cdn.jsdelivr.net/npm/[email protected]/lib/typescript.js';
-    const url = 'https://cdn.jsdelivr.net/npm/[email protected]/lib/lib.es2015.proxy.d.ts';
+    const tsExecutingUrl = 'https://cdn.jsdelivr.net/npm/@stencil/[email protected]/compiler/stencil.js';
+    const url = 'https://cdn.jsdelivr.net/npm/@stencil/[email protected]/compiler/lib.es2015.proxy.d.ts';
     const r = getTypescriptPathFromUrl(config, tsExecutingUrl, url);
-    expect(r).toBe('/some/path/node_modules/typescript/lib/lib.es2015.proxy.d.ts');
+    expect(r).toBe('/some/path/node_modules/@stencil/core/compiler/lib.es2015.proxy.d.ts');
   });
 
   it('ts path from url, no version', () => {
-    const tsExecutingUrl = 'https://cdn.jsdelivr.net/npm/typescript/lib/typescript.js';
-    const url = 'https://cdn.jsdelivr.net/npm/typescript/lib/lib.es2015.proxy.d.ts';
+    const tsExecutingUrl = 'https://cdn.jsdelivr.net/npm/@stencil/core/compiler/stencil.js';
+    const url = 'https://cdn.jsdelivr.net/npm/@stencil/core/compiler/lib.es2015.proxy.d.ts';
     const r = getTypescriptPathFromUrl(config, tsExecutingUrl, url);
-    expect(r).toBe('/some/path/node_modules/typescript/lib/lib.es2015.proxy.d.ts');
+    expect(r).toBe('/some/path/node_modules/@stencil/core/compiler/lib.es2015.proxy.d.ts');
   });
 });
diff --git a/src/compiler/sys/typescript/typescript-sys.ts b/src/compiler/sys/typescript/typescript-sys.ts
@@ -186,7 +186,7 @@ export const getTypescriptPathFromUrl = (config: d.Config, tsExecutingUrl: strin
   const tsBaseUrl = new URL('..', tsExecutingUrl).href;
   if (url.startsWith(tsBaseUrl)) {
     const tsFilePath = url.replace(tsBaseUrl, '/');
-    const tsNodePath = config.sys.getLocalModulePath({ rootDir: config.rootDir, moduleId: 'typescript', path: tsFilePath });
+    const tsNodePath = config.sys.getLocalModulePath({ rootDir: config.rootDir, moduleId: '@stencil/core', path: tsFilePath });
     return normalizePath(tsNodePath);
   }
   return url;