From e9498f25f75690566d18d6de627acffbb220222c Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 31 Jul 2019 01:29:39 -0400 Subject: [PATCH] 2.0.0-beta.7 --- CHANGELOG.md | 6 ++++- lib/install/bin.js | 9 ++++--- lib/install/bin.js.map | 2 +- lib/map/common.d.ts | 1 - lib/map/common.js | 20 +++++++++------- lib/map/common.js.map | 2 +- lib/map/index.js | 34 ++++++-------------------- lib/map/index.js.map | 2 +- lib/map/utils.js | 54 ++++++++++++++++-------------------------- lib/map/utils.js.map | 2 +- package.json | 2 +- 11 files changed, 53 insertions(+), 81 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63d716e9e..14d859510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +jspm 2.0.0-beta.7 (31/07/2019) +- Breaking change to scope normalization resolving base-relative not scope-relative (https://github.com/jspm/jspm-cli/pull/2493) +- Ensure mkdirp is an explicit dependency (https://github.com/jspm/jspm-cli/pull/2492, @vcuhar) +- Fixup Windows bin path escaping (https://github.com/jspm/jspm-cli/commit/34c329d40541) + jspm 2.0.0-beta.6 (26/06/2019) - Fixup isArray check in build (https://github.com/jspm/jspm-cli/pull/2482) @@ -14,7 +19,6 @@ jspm 2.0.0-beta.4 (20/05/2019) - Fix --deps to only list dependencies (https://github.com/jspm/jspm-cli/pull/2472, @jbanety) - Fix builds of multiple entry points by fixing Rollup output matching (https://github.com/jspm/jspm-cli/issues/2468, @jbanety) - Support for global CLI options like `--offline` etc through `JSPM_OFFLINE` etc environment variables (https://github.com/jspm/jspm-cli/commit/c3f2fe585c82d56af96c95bfb4580f77feaece52) -- jspm 2.0 changelogs started as of 2.0.0-beta.4. diff --git a/lib/install/bin.js b/lib/install/bin.js index 7c36e242d..85f2fc01f 100644 --- a/lib/install/bin.js +++ b/lib/install/bin.js @@ -59,7 +59,7 @@ const winBin = (binModulePath) => `@setlocal @echo jspm not found in path, make sure it is installed globally. @exit /B 1 ) -@set NODE_OPTIONS=--experimental-modules --no-warnings --loader /%JSPM_PATH%node_modules\\jspm\\node_modules\\@jspm\\resolve\\loader.mjs +@set NODE_OPTIONS=--experimental-modules --no-warnings --loader "//%JSPM_PATH%node_modules\\jspm\\node_modules\\@jspm\\resolve\\loader.mjs" @node "%~dp0\\..\\${binModulePath}" %* `; let _isCygwin; @@ -76,11 +76,10 @@ function isCygwin() { function getBin() { let loader = require.resolve('@jspm/resolve/loader.mjs'); if (common_1.isWindows) { - loader = '/' + loader; - if (isCygwin()) - return `set NODE_OPTIONS=--experimental-modules --loader ${loader} && node`; + loader = '//' + loader; + return `set NODE_OPTIONS=--experimental-modules --no-warnings --loader ${loader} && node`; } - return `NODE_OPTIONS="--experimental-modules --no-warnings --loader ${loader}" node`; + return `NODE_OPTIONS=--experimental-modules --no-warnings --loader ${loader} node`; } exports.getBin = getBin; //# sourceMappingURL=bin.js.map \ No newline at end of file diff --git a/lib/install/bin.js.map b/lib/install/bin.js.map index d438d0198..ec4a2d9d9 100644 --- a/lib/install/bin.js.map +++ b/lib/install/bin.js.map @@ -1 +1 @@ -{"version":3,"file":"bin.js","sourceRoot":"","sources":["../../src/install/bin.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;GAcG;AACH,yBAA0B;AAC1B,6BAA8B;AAC9B,4CAA4C;AAErC,KAAK,UAAU,eAAe,CAAE,MAAc,EAAE,IAAY,EAAE,aAAqB;IACxF,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACrC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE;YAC/D,IAAI,EAAE,KAAK;SACZ,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CACzC,EAAE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACjC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,GAAG,MAAM,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE;YACvE,IAAI,EAAE,KAAK;SACZ,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CACzC,CAAC,CAAC;AACL,CAAC;AAVD,0CAUC;AAED,MAAM,OAAO,GAAG,CAAC,aAAqB,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;4FAuBiD,aAAa;;;CAGxG,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,aAAqB,EAAE,EAAE,CAAC;;;;;;;oBAOtB,aAAa;CAChC,CAAC;AAEF,IAAI,SAAS,CAAC;AACd,SAAS,QAAQ;IACf,IAAI,OAAO,SAAS,KAAK,SAAS;QAChC,OAAO,SAAS,CAAC;IACnB,IAAI;QACF,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC;YAChH,OAAO,SAAS,GAAG,IAAI,CAAC;KAC3B;IACD,OAAO,CAAC,EAAE,GAAE;IACZ,OAAO,SAAS,GAAG,KAAK,CAAC;AAC3B,CAAC;AAED,SAAgB,MAAM;IACpB,IAAI,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;IACzD,IAAI,kBAAS,EAAE;QACb,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC;QACtB,IAAI,QAAQ,EAAE;YACZ,OAAO,oDAAoD,MAAM,UAAU,CAAC;KAC/E;IACD,OAAO,+DAA+D,MAAM,QAAQ,CAAC;AACvF,CAAC;AARD,wBAQC"} \ No newline at end of file +{"version":3,"file":"bin.js","sourceRoot":"","sources":["../../src/install/bin.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;GAcG;AACH,yBAA0B;AAC1B,6BAA8B;AAC9B,4CAA4C;AAErC,KAAK,UAAU,eAAe,CAAE,MAAc,EAAE,IAAY,EAAE,aAAqB;IACxF,MAAM,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACrC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE;YAC/D,IAAI,EAAE,KAAK;SACZ,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CACzC,EAAE,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACjC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,GAAG,MAAM,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE;YACvE,IAAI,EAAE,KAAK;SACZ,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CACzC,CAAC,CAAC;AACL,CAAC;AAVD,0CAUC;AAED,MAAM,OAAO,GAAG,CAAC,aAAqB,EAAE,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;4FAuBiD,aAAa;;;CAGxG,CAAC;AAEF,MAAM,MAAM,GAAG,CAAC,aAAqB,EAAE,EAAE,CAAC;;;;;;;oBAOtB,aAAa;CAChC,CAAC;AAEF,IAAI,SAAS,CAAC;AACd,SAAS,QAAQ;IACf,IAAI,OAAO,SAAS,KAAK,SAAS;QAChC,OAAO,SAAS,CAAC;IACnB,IAAI;QACF,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC;YAChH,OAAO,SAAS,GAAG,IAAI,CAAC;KAC3B;IACD,OAAO,CAAC,EAAE,GAAE;IACZ,OAAO,SAAS,GAAG,KAAK,CAAC;AAC3B,CAAC;AAED,SAAgB,MAAM;IACpB,IAAI,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;IACzD,IAAI,kBAAS,EAAE;QACb,MAAM,GAAG,IAAI,GAAG,MAAM,CAAC;QACvB,OAAO,kEAAkE,MAAM,UAAU,CAAC;KAC3F;IACD,OAAO,8DAA8D,MAAM,OAAO,CAAC;AACrF,CAAC;AAPD,wBAOC"} \ No newline at end of file diff --git a/lib/map/common.d.ts b/lib/map/common.d.ts index 4202c8ea5..4750c066b 100644 --- a/lib/map/common.d.ts +++ b/lib/map/common.d.ts @@ -7,7 +7,6 @@ export declare function resolveIfNotPlainOrUrl(relUrl: any, parentUrl: any): any export declare function parseImportMap(json: any, baseUrl: any): { imports: {}; scopes: {}; - baseUrl: any; }; export declare function resolveImportMap(id: any, parentUrl: any, importMap: any): any; export declare function throwBare(id: any, parentUrl: any): void; diff --git a/lib/map/common.js b/lib/map/common.js index 44f15c42f..2396ef037 100644 --- a/lib/map/common.js +++ b/lib/map/common.js @@ -120,7 +120,7 @@ function resolvePackages(pkgs, baseUrl) { // TODO package fallback support if (typeof value !== 'string') continue; - outPkgs[resolveIfNotPlainOrUrl(p, baseUrl) || p] = value; + outPkgs[resolveIfNotPlainOrUrl(p, baseUrl) || p] = resolveUrl(value, baseUrl); } return outPkgs; } @@ -133,10 +133,10 @@ function parseImportMap(json, baseUrl) { let resolvedScopeName = resolveUrl(scopeName, baseUrl); if (resolvedScopeName[resolvedScopeName.length - 1] !== '/') resolvedScopeName += '/'; - scopes[resolvedScopeName] = resolvePackages(scope, resolvedScopeName) || {}; + scopes[resolvedScopeName] = resolvePackages(scope, baseUrl) || {}; } } - return { imports: imports, scopes: scopes, baseUrl: baseUrl }; + return { imports: imports, scopes: scopes }; } exports.parseImportMap = parseImportMap; function getMatch(path, matchObj) { @@ -149,14 +149,16 @@ function getMatch(path, matchObj) { return segment; } while ((sepIndex = path.lastIndexOf('/', sepIndex - 1)) !== -1); } -function applyPackages(id, packages, baseUrl) { +function applyPackages(id, packages) { const pkgName = getMatch(id, packages); if (pkgName) { const pkg = packages[pkgName]; if (pkg === null) - if (id.length > pkgName.length && pkg[pkg.length - 1] !== '/') - console.warn("Invalid package target " + pkg + " for '" + pkgName + "' should have a trailing '/'."); - return resolveUrl(pkg + id.slice(pkgName.length), baseUrl); + return; + if (id.length > pkgName.length && pkg[pkg.length - 1] !== '/') + console.warn("Invalid package target " + pkg + " for '" + pkgName + "' should have a trailing '/'."); + const subpath = id.slice(pkgName.length); + return subpath ? resolveUrl(subpath, pkg) : pkg; } } function resolveImportMap(id, parentUrl, importMap) { @@ -166,11 +168,11 @@ function resolveImportMap(id, parentUrl, importMap) { const scopeName = getMatch(parentUrl, importMap.scopes); if (scopeName) { const scopePackages = importMap.scopes[scopeName]; - const packageResolution = applyPackages(id, scopePackages, scopeName); + const packageResolution = applyPackages(id, scopePackages); if (packageResolution) return packageResolution; } - return applyPackages(id, importMap.imports, importMap.baseUrl) || urlResolved || throwBare(id, parentUrl); + return applyPackages(id, importMap.imports) || urlResolved || throwBare(id, parentUrl); } exports.resolveImportMap = resolveImportMap; function throwBare(id, parentUrl) { diff --git a/lib/map/common.js.map b/lib/map/common.js.map index bbf38f387..1dbc5851c 100644 --- a/lib/map/common.js.map +++ b/lib/map/common.js.map @@ -1 +1 @@ -{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/map/common.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/map/common.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;;;;GAcG;AACU,QAAA,OAAO,GAAG,OAAO,IAAI,KAAK,WAAW,CAAC;AAEnD,MAAM,SAAS,GAAG,eAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;AACpB,2BAAM;AAG5B,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;IACnC,eAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,eAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,YAAY,KAAK,CAAC,CAAC;QACrB,eAAO,GAAG,eAAO,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;CAChD;AAED,MAAM,cAAc,GAAG,KAAK,CAAC;AAC7B,SAAgB,sBAAsB,CAAE,MAAM,EAAE,SAAS;IACvD,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IAC/C,oBAAoB;IACpB,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QAC1C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC;KAChE;IACD,eAAe;SACV,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;QAClI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAK,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;QACxC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QACrB,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,iFAAiF;QACjF,+CAA+C;QAC/C,sCAAsC;QACtC,gCAAgC;QAChC,8CAA8C;QAC9C,IAAI,QAAQ,CAAC;QACb,IAAI,SAAS,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;YAChD,8DAA8D;YAC9D,IAAI,cAAc,KAAK,OAAO,EAAE;gBAC9B,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACtD,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;aACtD;iBACI;gBACH,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAC/B;SACF;aACI;YACH,+CAA+C;YAC/C,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACvD;QAED,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG;YACnB,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC;QAE7E,2DAA2D;QAC3D,gEAAgE;QAChE,mDAAmD;QACnD,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC;QAE5E,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,YAAY,GAAG,CAAC,CAAC,CAAC;QACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACzC,iDAAiD;YACjD,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE;gBACvB,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;oBACxB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;oBAClD,YAAY,GAAG,CAAC,CAAC,CAAC;iBACnB;aACF;YAED,wCAAwC;iBACnC,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;gBAC7B,cAAc;gBACd,IAAI,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,MAAM,CAAC,EAAE;oBACxF,MAAM,CAAC,GAAG,EAAE,CAAC;oBACb,CAAC,IAAI,CAAC,CAAC;iBACR;gBACD,aAAa;qBACR,IAAI,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,MAAM,EAAE;oBAC/D,CAAC,IAAI,CAAC,CAAC;iBACR;qBACI;oBACH,sCAAsC;oBACtC,YAAY,GAAG,CAAC,CAAC;iBAClB;aACF;YACD,mCAAmC;iBAC9B;gBACH,YAAY,GAAG,CAAC,CAAC;aAClB;SACF;QACD,sCAAsC;QACtC,IAAI,YAAY,KAAK,CAAC,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAC7C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACjF;AACH,CAAC;AA9ED,wDA8EC;AAED;;;;;;GAMG;AAEH,SAAS,UAAU,CAAE,MAAM,EAAE,SAAS;IACpC,OAAO,sBAAsB,CAAC,MAAM,EAAE,SAAS,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,MAAM;QACpC,sBAAsB,CAAC,IAAI,GAAG,MAAM,EAAE,SAAS,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,eAAe,CAAC,IAAI,EAAE,OAAO;IACpC,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;QAClB,IAAI,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,gCAAgC;QAChC,IAAI,OAAO,KAAK,KAAK,QAAQ;YAC3B,SAAS;QACX,OAAO,CAAC,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;KAC/E;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAgB,cAAc,CAAE,IAAI,EAAE,OAAO;IAC3C,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;IAC7D,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,KAAK,IAAI,SAAS,IAAI,IAAI,CAAC,MAAM,EAAE;YACjC,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACrC,IAAI,iBAAiB,GAAG,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACvD,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;gBACzD,iBAAiB,IAAI,GAAG,CAAC;YAC3B,MAAM,CAAC,iBAAiB,CAAC,GAAG,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;SACnE;KACF;IAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC9C,CAAC;AAdD,wCAcC;AAED,SAAS,QAAQ,CAAE,IAAI,EAAE,QAAQ;IAC/B,IAAI,QAAQ,CAAC,IAAI,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,IAAI,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,GAAG;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC;QAC5C,IAAI,OAAO,IAAI,QAAQ;YACrB,OAAO,OAAO,CAAC;KAClB,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,QAAQ,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAC;AACnE,CAAC;AAED,SAAS,aAAa,CAAE,EAAE,EAAE,QAAQ;IAClC,MAAM,OAAO,GAAG,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACvC,IAAI,OAAO,EAAE;QACX,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC9B,IAAI,GAAG,KAAK,IAAI;YACd,OAAO;QACT,IAAI,EAAE,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;YAC3D,OAAO,CAAC,IAAI,CAAC,yBAAyB,GAAG,GAAG,GAAG,QAAQ,GAAG,OAAO,GAAG,+BAA+B,CAAC,CAAC;QACvG,MAAM,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACzC,OAAO,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;KACjD;AACH,CAAC;AAED,SAAgB,gBAAgB,CAAE,EAAE,EAAE,SAAS,EAAE,SAAS;IACxD,MAAM,WAAW,GAAG,sBAAsB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAC1D,IAAI,WAAW;QACb,EAAE,GAAG,WAAW,CAAC;IACnB,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACxD,IAAI,SAAS,EAAE;QACb,MAAM,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,iBAAiB,GAAG,aAAa,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC;QAC3D,IAAI,iBAAiB;YACnB,OAAO,iBAAiB,CAAC;KAC5B;IACD,OAAO,aAAa,CAAC,EAAE,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,WAAW,IAAI,SAAS,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;AACzF,CAAC;AAZD,4CAYC;AAED,SAAgB,SAAS,CAAE,EAAE,EAAE,SAAS;IACtC,MAAM,IAAI,KAAK,CAAC,oCAAoC,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AACzG,CAAC;AAFD,8BAEC"} \ No newline at end of file diff --git a/lib/map/index.js b/lib/map/index.js index 215d90707..e3702c529 100644 --- a/lib/map/index.js +++ b/lib/map/index.js @@ -65,32 +65,21 @@ class Mapper { return; const pkgPath = `jspm_packages/${pkgName.replace(':', '/')}`; const packages = scopeParent ? (packageMap.scopes[scopeParent] = (packageMap.scopes[scopeParent] || {})) : packageMap.imports; - let pkgRelative = (scopeParent ? path.relative(scopeParent, pkgPath).replace(/\\/g, '/') : pkgPath); - if (!pkgRelative.startsWith('../')) - pkgRelative = './' + pkgRelative; - const curPkg = packages[depName + '/'] = pkgRelative + '/'; + const curPkg = packages[depName + '/'] = './' + pkgPath + '/'; const pkg = this.project.config.jspm.installed.dependencies[pkgName]; const pathsPromise = (async () => { const { name, main, paths, map } = await this.getPackageConfig(pkgName); if (main) packages[depName] = curPkg + main; - for (const subpath of Object.keys(paths)) { - let relPath = scopeParent ? path.relative(scopeParent, pkgPath).replace(/\\/g, '/') : pkgPath; - if (!relPath.startsWith('../')) - relPath = './' + relPath; - packages[depName + '/' + subpath] = relPath + '/' + paths[subpath]; - } + for (const subpath of Object.keys(paths)) + packages[depName + '/' + subpath] = './' + pkgPath + '/' + paths[subpath]; if (seen[pkgName + '|map']) return; seen[pkgName + '|map'] = true; const scopedPackages = (packageMap.scopes[pkgPath + '/'] = (packageMap.scopes[pkgPath + '/'] || {})); // scopedPackages[name + '/'] - for (const subpath of Object.keys(paths)) { - let target = path.relative(name, name + '/' + paths[subpath]).replace(/\\/g, '/'); - if (!target.startsWith('../')) - target = './' + target; - scopedPackages[name + '/' + subpath] = target; - } + for (const subpath of Object.keys(paths)) + scopedPackages[name + '/' + subpath] = './' + name + '/' + paths[subpath]; for (const target of Object.keys(map)) { let mapped = map[target]; if (mapped.startsWith('./')) { @@ -105,10 +94,7 @@ class Mapper { mapped = `${this.nodeBuiltinsPkg}/${mapped}.js`; } } - let output = path.relative(pkgPath + '/', mapped).replace(/\\/g, '/'); - if (!output.startsWith('../')) - output = './' + output; - scopedPackages[target] = output; + scopedPackages[target] = './' + mapped; } })(); if (seen[pkgName]) @@ -188,14 +174,8 @@ function renormalizeMap(map, jspmPackagesURL, cdn) { const newScope = Object.create(null); let scopeRegistry = scopeName.substr(14); scopeRegistry = scopeRegistry.substr(0, scopeRegistry.indexOf('/')); - const isScopedPackage = scopeName.indexOf('/', scopeName.indexOf('/', 14) + 1) !== scopeName.length - 1; for (const pkgName of Object.keys(scope)) { - let pkg = scope[pkgName]; - if (cdn && pkg.startsWith('../')) { - // exception is within-scope backtracking - if (!(isScopedPackage && pkg.startsWith('../') && !pkg.startsWith('../../'))) - pkg = pkg.replace(/^((\.\.\/)+)(.+)$/, `$1${scopeRegistry}:$3`); - } + const pkg = scope[pkgName]; newScope[pkgName] = (cdn ? cdnReplace(pkg) : pkg).replace(/^(\.\/)+jspm_packages/, jspmPackagesURL); } newMap.scopes[jspmPackagesURL + (cdn ? cdnReplace(scopeName) : scopeName).substr(13)] = newScope; diff --git a/lib/map/index.js.map b/lib/map/index.js.map index 7eaf3964c..d0c1f272c 100644 --- a/lib/map/index.js.map +++ b/lib/map/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/map/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/map/index.ts"],"names":[],"mappings":";;AAgBA,6BAA8B;AAC9B,gDAAmE;AACnE,4CAA6F;AAC7F,mCAAgI;AAChI,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AACxD,6BAA0B;AAC1B,qCAAkD;AAClD,kCAAmC;AACnC,2CAAkD;AAElD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;AAErE,MAAM,4BAA4B,GAAG;IACnC,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI;CACrI,CAAC;AAID,CAAC;AAGD,CAAC;AAMF,MAAM,MAAM;IAOV,YAAa,OAAgB,EAAE,MAAW,EAAE,OAAO,EAAE,IAAI,EAAE;QACzD,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK;YACpC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;YACpE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACrD,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAO,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,GAAG,KAAK,KAAK,CAAC;gBAC9E,SAAS;YACX,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,8BAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;SAC3F;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;YACjC,IAAI,CAAC,gBAAgB,GAAG,kBAAkB,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,WAAW,CAAC;QAE/G,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED,IAAI,eAAe;QACjB,IAAI,IAAI,CAAC,gBAAgB;YACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC;QAC/B,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;IACnG,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAW,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAc;YAC5B,OAAO;YACP,MAAM;SACP,CAAC;QAEF,MAAM,kBAAkB,GAAoB,EAAE,CAAC;QAC/C,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;YACpD,IAAI,OAAO,KAAK,YAAY;gBAC1B,SAAS;YACX,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;SAC3G;QAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;YAC5C,IAAI,IAAI,IAAI,OAAO;gBACjB,SAAS;YACX,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,GAAG,GAAG,GAAG,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;SAC7G;QAED,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAEtC,aAAK,CAAC,UAAU,CAAC,CAAC;QAElB,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,eAAe,CAAE,OAAe,EAAE,OAAe,EAAE,WAAmB,EAAE,UAAqB,EAAE,OAAgC,EAAE;QACrI,+CAA+C;QAC/C,IAAI,WAAW,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,OAAO;YACvD,OAAO;QAET,MAAM,OAAO,GAAG,iBAAiB,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC;QAC9H,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,OAAO,GAAG,GAAG,CAAC;QAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAErE,MAAM,YAAY,GAAG,CAAC,KAAK,IAAI,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAExE,IAAI,IAAI;gBACN,QAAQ,CAAC,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC;YACpC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;gBACtC,QAAQ,CAAC,OAAO,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,GAAG,OAAO,GAAG,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;YAE5E,IAAI,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;gBACxB,OAAO;YACT,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC;YAE9B,MAAM,cAAc,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAErG,6BAA6B;YAC7B,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;gBACtC,cAAc,CAAC,IAAI,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,GAAG,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;YAE5E,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACrC,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;gBAEzB,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBAC3B,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;iBACrC;qBACI;oBACH,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;oBACvF,IAAI,SAAS,EAAE;wBACb,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;qBACzD;yBACI,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE;wBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe,IAAI,MAAM,KAAK,CAAC;qBACjD;iBACF;gBACD,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,GAAG,MAAM,CAAC;aACxC;QACH,CAAC,CAAC,EAAE,CAAC;QAEL,IAAI,IAAI,CAAC,OAAO,CAAC;YACf,OAAO;QACT,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;QAErB,MAAM,kBAAkB,GAAoB,CAAC,YAAY,CAAC,CAAC;QAC3D,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC9C,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,8BAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,GAAG,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;SACrI;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAE,OAAe;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,MAAM;YACR,OAAO,MAAM,MAAM,CAAC;QAEtB,OAAO,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAC3D,MAAM,KAAK,GAAG,MAAM,iBAAQ,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,kBAAkB,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;YAEpH,IAAI,CAAC,KAAK;gBACR,MAAM,IAAI,sBAAa,CAAC,WAAW,kBAAS,CAAC,OAAO,CAAC,gDAAgD,CAAC,CAAC;YAEzG,MAAM,IAAI,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YAErE,IAAI,IAAI,GAAG,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACnE,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,MAAM,GAAG,GAAG,EAAE,CAAC;YACf,mBAAmB;YACnB,IAAI,KAAK,CAAC,GAAG,EAAE;gBACb,IAAI,IAAI;oBACN,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC;gBACzB,IAAI,IAAI,EAAE;oBACR,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,GAAG,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;oBAC1D,IAAI,MAAM;wBACR,IAAI,GAAG,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC;oBAC5E,IAAI,IAAI;wBACL,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;iBAC5B;gBAED,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;oBAC3C,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;wBAC3B,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;wBACrD,IAAI,MAAM,EAAE;4BACV,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC;4BAC7F,IAAI,IAAI;gCACN,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,YAAY,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC;yBAClH;qBACF;yBACI;wBACH,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;wBACrD,IAAI,MAAM;4BACR,GAAG,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;qBACxB;iBACF;aACF;YAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QACpC,CAAC,CAAC,EAAE,CAAC,CAAC;IACR,CAAC;CACF;AAED,0CAA0C;AAC1C,SAAS,UAAU,CAAE,IAAI;IACvB,OAAO,IAAI,CAAC,OAAO,CAAC,wBAAwB,EAAE,mBAAmB,CAAC,CAAC;AACrE,CAAC;AAED,SAAgB,cAAc,CAAE,GAAc,EAAE,eAAuB,EAAE,GAAY;IACnF,8BAA8B;IAC9B,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC/B,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,IAAI,GAAG,CAAC,OAAO,EAAE;QACf,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC;QAC1B,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC9C,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACjC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;SAC3G;KACF;IACD,IAAI,GAAG,CAAC,MAAM,EAAE;QACd,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC/C,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACpC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,aAAa,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACzC,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAEpE,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACxC,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC3B,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAC;aACrG;YACD,MAAM,CAAC,MAAM,CAAC,eAAe,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC;SAClG;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AA9BD,wCA8BC;AAEM,KAAK,UAAU,GAAG,CAAE,OAAgB,EAAE,GAAQ;IACnD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACxC,OAAO,MAAM,MAAM,CAAC,YAAY,EAAE,CAAC;AACrC,CAAC;AAHD,kBAGC;AAED,MAAM,WAAW;IAYf,YAAa,OAAgB,EAAE,GAAc;QAC3C,IAAI,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAE3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;YACrC,OAAO,IAAI,GAAG,CAAC;QACjB,MAAM,OAAO,GAAG,IAAI,SAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC;QAEhD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YAC5B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC/C,IAAI,iBAAiB,GAAG,+BAAsB,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,SAAS,IAAI,+BAAsB,CAAC,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;gBACtK,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;oBACzD,iBAAiB,IAAI,GAAG,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG;oBAC/B,YAAY,EAAE,SAAS;oBACvB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE;iBACrC,CAAC;aACH;SACF;QACD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAC3C,MAAM,MAAM,GAAG,sBAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,wBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,UAAU,CAAE,EAAU,EAAE,SAAiB,EAAE,WAAW,GAAG,KAAK,EAAE,IAA8B;QAClG,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,QAAQ,GAAG,IAAI,CAAC;YAChB,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC5B;QAED,IAAI,QAAQ,CAAC;QACb,IAAI;YACF,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;SAClD;QACD,OAAO,CAAC,EAAE;YACR,IAAI,WAAW,IAAI,CAAC,cAAK,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC7E,OAAO,WAAW,CAAC;YACrB,MAAM,CAAC,CAAC;SACT;QAED,IAAI,WAAW,IAAI,CAAC,QAAQ,EAAE;YAC5B,MAAM,cAAc,GAAG,sBAAc,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC3E,MAAM,gBAAgB,GAAG,sBAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC5E,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,KAAK,cAAc;gBAC1D,OAAO,QAAQ,CAAC;SACnB;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC;YAChB,OAAO,QAAQ,CAAC;QAClB,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC;QAEtB,IAAI,IAAI,CAAC;QACT,IAAI;YACF,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;SACzC;QACD,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,sBAAa,CAAC,WAAW,kBAAS,CAAC,EAAE,CAAC,SAAS,aAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,kBAAS,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;SACvJ;QAED,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAE3G,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE;gBAClC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;SACpC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,CAAE,EAAU,EAAE,SAAiB,EAAE,QAAQ,GAAG,KAAK;QACtD,IAAI,QAAQ,GAAG,+BAAsB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,QAAQ;YACV,OAAO,QAAQ,CAAC;QAElB,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC1C,IAAI,QAAQ,EAAE;YACZ,MAAM,UAAU,GAAG,qBAAa,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,UAAU,EAAE;gBACd,MAAM,KAAK,GAAG,sBAAc,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC;gBAClE,IAAI,KAAK,EAAE;oBACT,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC;oBACvD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;oBACpF,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBACtD,OAAO,QAAQ,CAAC;iBACjB;aACF;YACD,MAAM,KAAK,GAAG,sBAAc,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,KAAK,EAAE;gBACT,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAClD,OAAO,QAAQ,CAAC;aACjB;YACD,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;SACnC;QAED,IAAI,QAAQ;YACV,OAAO,+BAAsB,CAAC,IAAI,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;QAEtD,MAAM,IAAI,KAAK,CAAC,qBAAqB,EAAE,OAAO,SAAS,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,WAAW,CAAE,GAAW;QAC5B,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;YAC1B,OAAO,EAAE,CAAC;QACZ,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,kBAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAChF,IAAI,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC;QACzB,MAAM,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAChJ,CAAC,OAAO,EAAC,EAAE,GAAG,CAAC,GAAG,+BAAmB,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,GAAG;YACL,MAAM,IAAI,sBAAa,CAAC,0BAA0B,aAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;QACxF,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,WAAW,GAAG,kCAAkC,CAAC;QACvD,KAAK,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,OAAO,EAAE;YACjC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACV,SAAS;YACX,iBAAiB;YACjB,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;gBACZ,IAAI,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC1C,qDAAqD;gBACrD,IAAI,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;oBACvC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;iBAClE;aACF;iBACI;gBACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aAC/B;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAEM,KAAK,UAAU,SAAS,CAAE,OAAgB,EAAE,GAAc,EAAE,OAAiB,EAAE,SAAS,GAAG,KAAK;IACrG,MAAM,UAAU,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACjD,IAAI,OAAO,GAAG,IAAI,SAAG,CAAC,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;IAC1D,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;QACrC,OAAO,IAAI,GAAG,CAAC;IAEjB,KAAK,MAAM,MAAM,IAAI,OAAO;QAC1B,MAAM,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAE/C,aAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE1B,IAAI,SAAS;QACX,qBAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAEpC,OAAO,UAAU,CAAC,OAAO,CAAC;AAC5B,CAAC;AAfD,8BAeC;AAEM,KAAK,UAAU,KAAK,CAAE,OAAgB,EAAE,GAAc,EAAE,OAAe,EAAE,OAAiB,EAAE,WAAW,GAAG,KAAK;IACpH,MAAM,UAAU,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACjD,IAAI,OAAO,GAAG,IAAI,SAAG,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC;IAC9C,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG;QACrC,OAAO,IAAI,GAAG,CAAC;IAEjB,KAAK,MAAM,MAAM,IAAI,OAAO;QAC1B,MAAM,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAE5D,OAAO,UAAU,CAAC,KAAK,CAAC;AAC1B,CAAC;AAVD,sBAUC;AAWA,CAAC"} \ No newline at end of file diff --git a/lib/map/utils.js b/lib/map/utils.js index 040303735..a3100fcad 100644 --- a/lib/map/utils.js +++ b/lib/map/utils.js @@ -86,28 +86,28 @@ function rebaseMap(map, fromPath, toPath, absolute = false) { for (const scopeName of Object.keys(map.scopes)) { const scope = map.scopes[scopeName]; const newScope = Object.create(null); - if (common_1.isURL(scopeName, true)) { - newMap.scopes[scopeName] = Object.assign(newScope, scope); - } - else { + let rebasedScope = scopeName; + if (!common_1.isURL(scopeName, true)) { const resolvedScope = path.resolve(fromPath, scopeName); - let rebasedScope = path.relative(toPath, resolvedScope).replace(/\\/g, '/') + '/'; - for (const pkgName of Object.keys(scope)) { - const pkg = scope[pkgName]; - let rebased = common_1.isURL(pkg, true) ? pkg : path.relative(resolvedScope, path.resolve(resolvedScope, pkg)).replace(/\\/g, '/'); - if (!rebased.startsWith('../')) - rebased = './' + rebased; - if (pkg.endsWith('/')) - rebased += '/'; - newScope[pkgName] = rebased; - } + rebasedScope = path.relative(toPath, resolvedScope).replace(/\\/g, '/') + '/'; if (absolute) { if (rebasedScope.startsWith('../')) - throw new common_1.JspmUserError(`Unable to reference scope ${scopeName} at ${newScope}. The base for the import map must a higher path than its mappings.`); + throw new common_1.JspmUserError(`Unable to reference scope ${scopeName} at ${resolvedScope}. The base for the import map must a higher path than its mappings.`); rebasedScope = prefix + rebasedScope; } - newMap.scopes[rebasedScope] = newScope; } + for (const pkgName of Object.keys(scope)) { + const pkg = scope[pkgName]; + let rebased = common_1.isURL(pkg, true) ? pkg : path.relative(toPath, path.resolve(fromPath, pkg)).replace(/\\/g, '/'); + if (pkg.endsWith('/')) + rebased += '/'; + if (!rebased.startsWith('../')) + rebased = prefix + rebased; + else if (absolute) + throw new common_1.JspmUserError(`Unable to reference mapping ${pkgName} at ${rebased} in scope ${scopeName}. The base for the import map must a higher path than its mappings.`); + newScope[pkgName] = rebased; + } + newMap.scopes[rebasedScope] = newScope; } } return newMap; @@ -121,15 +121,9 @@ function flattenScopes(importMap) { for (const pkgName of Object.keys(imports)) { const existing = importMap.imports[pkgName]; const newTarget = imports[pkgName]; - const trailingSlash = newTarget.endsWith('/'); - let newTargetResolved = path.relative('.', path.resolve(scope, newTarget)).replace(/\\/g, '/'); - if (!newTargetResolved.startsWith('../')) - newTargetResolved = './' + newTargetResolved; - if (trailingSlash) - newTargetResolved += '/'; - if (existing && existing !== newTargetResolved) - throw new common_1.JspmUserError(`Cannot flatten scopes due to conflict for ${common_1.bold(pkgName)} between ${existing} and ${newTargetResolved}.`); - importMap.imports[pkgName] = newTargetResolved; + if (existing && existing !== newTarget) + throw new common_1.JspmUserError(`Cannot flatten scopes due to conflict for ${common_1.bold(pkgName)} between ${existing} and ${newTarget}.`); + importMap.imports[pkgName] = newTarget; } } delete importMap.scopes; @@ -142,14 +136,8 @@ function clean(importMap) { for (const scope of Object.keys(importMap.scopes)) { const imports = importMap.scopes[scope]; for (const pkgName of Object.keys(imports)) { - if (pkgName.startsWith('./') || pkgName.startsWith('../')) - continue; - let baseMap = importMap.imports[pkgName]; - if (!baseMap) - continue; - let map = imports[pkgName]; - // TODO: handle URL-like - if (path.join(pkgName, baseMap) === path.join(scope, pkgName, map)) + // renormalization in check? + if (importMap.imports[pkgName] === imports[pkgName]) delete imports[pkgName]; } } diff --git a/lib/map/utils.js.map b/lib/map/utils.js.map index 7a967d731..87e0ebaf8 100644 --- a/lib/map/utils.js.map +++ b/lib/map/utils.js.map @@ -1 +1 @@ -{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/map/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/map/utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index 3f8e87537..d97258b86 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "jspm", "description": "Universal ES Module Package Manager", - "version": "2.0.0-beta.6", + "version": "2.0.0-beta.7", "main": "lib/api.js", "types": "lib/api.d.ts", "dependencies": {