From 12ac880100c24a10afe86572c834b8c15cdeaec0 Mon Sep 17 00:00:00 2001 From: takeshi-sakurai Date: Tue, 11 Jun 2019 15:07:31 +0900 Subject: [PATCH 1/3] fix issue plugin option can't use relative path. --- .../client/lib/modules/parseArgs.js | 9 +++++++++ .../client/src/modules/parseArgs.ts | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/packages/scene-graph-mediator/client/lib/modules/parseArgs.js b/packages/scene-graph-mediator/client/lib/modules/parseArgs.js index 0a0039b..af58799 100644 --- a/packages/scene-graph-mediator/client/lib/modules/parseArgs.js +++ b/packages/scene-graph-mediator/client/lib/modules/parseArgs.js @@ -26,6 +26,9 @@ function parseArgs() { } return parts; }; + var isRelativePath = function (value) { + return 0 <= value.lastIndexOf("." + path.sep); + }; commander .version(packageJson.version) .option('-c, --config [value]', 'config file path') @@ -118,6 +121,12 @@ function parseArgs() { } } args.assetRoot = args.assetRoot.replace(/\/$/, ''); + for (var i = 0; i < args.plugins.length; i++) { + var plugin = args.plugins[i]; + if (isRelativePath(plugin)) { + args.plugins[i] = path.resolve(process.cwd(), configFilePath, plugin); + } + } return args; } exports.default = parseArgs; diff --git a/packages/scene-graph-mediator/client/src/modules/parseArgs.ts b/packages/scene-graph-mediator/client/src/modules/parseArgs.ts index 1459fa1..dfc240a 100644 --- a/packages/scene-graph-mediator/client/src/modules/parseArgs.ts +++ b/packages/scene-graph-mediator/client/src/modules/parseArgs.ts @@ -30,6 +30,10 @@ export default function parseArgs(): Args { return parts; }; + const isRelativePath = (value: string) => { + return 0 <= value.lastIndexOf(`.${path.sep}`); + }; + commander .version(packageJson.version) .option( @@ -181,5 +185,12 @@ export default function parseArgs(): Args { args.assetRoot = args.assetRoot.replace(/\/$/, ''); + for (let i = 0; i < args.plugins.length; i++) { + const plugin = args.plugins[i]; + if (isRelativePath(plugin)) { + args.plugins[i] = path.resolve(process.cwd(), configFilePath, plugin); + } + } + return args; } From dd1b435d99d0bad9f6c9d2e701c3495ac2b27b41 Mon Sep 17 00:00:00 2001 From: takeshi-sakurai Date: Wed, 12 Jun 2019 09:51:46 +0900 Subject: [PATCH 2/3] fix relative path check logic. --- .../scene-graph-mediator/client/src/modules/parseArgs.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/scene-graph-mediator/client/src/modules/parseArgs.ts b/packages/scene-graph-mediator/client/src/modules/parseArgs.ts index dfc240a..4717c3e 100644 --- a/packages/scene-graph-mediator/client/src/modules/parseArgs.ts +++ b/packages/scene-graph-mediator/client/src/modules/parseArgs.ts @@ -11,6 +11,10 @@ import AssetExporterPlugin from '../interface/AssetExporterPlugin'; export default function parseArgs(): Args { const packageJson = require('../../package.json'); + const isRelativePath = (value: string) => { + return value.startsWith(`.${path.sep}`) || value.startsWith(`..${path.sep}`); + }; + const spaceSeparatedPaths = (value: string): string[] => { const parts = []; const frags = value.split(' '); @@ -30,10 +34,6 @@ export default function parseArgs(): Args { return parts; }; - const isRelativePath = (value: string) => { - return 0 <= value.lastIndexOf(`.${path.sep}`); - }; - commander .version(packageJson.version) .option( From 94bfbba1ec02f68d8d33d1993e01b8503f4bbb5e Mon Sep 17 00:00:00 2001 From: takeshi-sakurai Date: Wed, 12 Jun 2019 09:54:02 +0900 Subject: [PATCH 3/3] fix plugin NODE_PATH. --- .../scene-graph-mediator/client/lib/modules/parseArgs.js | 8 ++++---- .../client/lib/modules/parseArgs.js.map | 2 +- .../scene-graph-mediator/client/src/modules/parseArgs.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/scene-graph-mediator/client/lib/modules/parseArgs.js b/packages/scene-graph-mediator/client/lib/modules/parseArgs.js index af58799..b9dcb78 100644 --- a/packages/scene-graph-mediator/client/lib/modules/parseArgs.js +++ b/packages/scene-graph-mediator/client/lib/modules/parseArgs.js @@ -8,12 +8,15 @@ var commander = require("commander"); */ function parseArgs() { var packageJson = require('../../package.json'); + var isRelativePath = function (value) { + return value.startsWith("." + path.sep) || value.startsWith(".." + path.sep); + }; var spaceSeparatedPaths = function (value) { var parts = []; var frags = value.split(' '); for (var i = 0; i < frags.length; i++) { var frag = frags[i]; - if (fs.existsSync(frag)) { + if ((!path.isAbsolute(frag) && !isRelativePath(frag)) || fs.existsSync(frag)) { parts.push(frag); } else { @@ -26,9 +29,6 @@ function parseArgs() { } return parts; }; - var isRelativePath = function (value) { - return 0 <= value.lastIndexOf("." + path.sep); - }; commander .version(packageJson.version) .option('-c, --config [value]', 'config file path') diff --git a/packages/scene-graph-mediator/client/lib/modules/parseArgs.js.map b/packages/scene-graph-mediator/client/lib/modules/parseArgs.js.map index f3555b8..d6e6680 100644 --- a/packages/scene-graph-mediator/client/lib/modules/parseArgs.js.map +++ b/packages/scene-graph-mediator/client/lib/modules/parseArgs.js.map @@ -1 +1 @@ -{"version":3,"file":"parseArgs.js","sourceRoot":"","sources":["../../src/modules/parseArgs.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"parseArgs.js","sourceRoot":"","sources":["../../src/modules/parseArgs.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/scene-graph-mediator/client/src/modules/parseArgs.ts b/packages/scene-graph-mediator/client/src/modules/parseArgs.ts index 4717c3e..b2e6cb7 100644 --- a/packages/scene-graph-mediator/client/src/modules/parseArgs.ts +++ b/packages/scene-graph-mediator/client/src/modules/parseArgs.ts @@ -20,7 +20,7 @@ export default function parseArgs(): Args { const frags = value.split(' '); for (let i = 0; i < frags.length; i++) { const frag = frags[i]; - if (fs.existsSync(frag)) { + if ((!path.isAbsolute(frag) && !isRelativePath(frag)) || fs.existsSync(frag)) { parts.push(frag); } else { const nextFrag = frags[i + 1];