This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit adb67b4

Vasil Chimevvchimev

Vasil Chimev

authored and

committed

fix: resolve xml namespaces absolute paths on Windows

1 parent 13081a5 commit adb67b4Copy full SHA for adb67b4

File tree

-4

lines changed

-4

lines changed

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`const { parse, relative, join, basename, extname } = require("path");`
	`2`	`+const { convertSlashesInPath } = require("./projectHelpers");`
`2`	`3`
`3`		`-module.exports = function(source) {`
	`4`	`+module.exports = function(source) {`
`4`	`5`	`this.value = source;`
`5`	`6`
`6`	`7`	`const { XmlParser } = require("tns-core-modules/xml");`
`@@ -47,7 +48,7 @@ module.exports = function(source) {`
`47`	`48`	`namespaces.push({ name: namespace, path: resolvedPath });`
`48`	`49`	`namespaces.push({ name: moduleName, path: resolvedPath });`
`49`	`50`
`50`		`- const { dir, name } = parse(resolvedPath);`
	`51`	`+ const { dir, name } = parse(resolvedPath);`
`51`	`52`	`const noExtFilename = join(dir, name);`
`52`	`53`
`53`	`54`	const xml = tryResolve(`${noExtFilename}.xml`);
`@@ -67,6 +68,11 @@ module.exports = function(source) {`
`67`	`68`	`parser.parse(source);`
`68`	`69`
`69`	`70`	`const moduleRegisters = namespaces`
	`71`	`+ .map(function (n) {`
	`72`	`+ let obj = n;`
	`73`	`+ obj.path = convertSlashesInPath(n.path);`
	`74`	`+ return obj;`
	`75`	`+ })`
`70`	`76`	`.map(n =>`
`71`	`77`	`global.registerModule("${n.name}", function() { return require("${n.path}"); });`
`72`	`78`	`)`
`@@ -86,9 +92,8 @@ module.exports = function(source) {`
`86`	`92`	`function tryResolve(path) {`
`87`	`93`	`try {`
`88`	`94`	`return require.resolve(path);`
`89`		`- } catch(e) {`
	`95`	`+ } catch(e) {`
`90`	`96`	`// The path couldn't be resolved`
`91`	`97`	`return;`
`92`	`98`	`}`
`93`	`99`	`}`
`94`		`-`

Comments

(0)