Consolidate: Pass baseDir & includeDir as options #1225

Kompwu · 2018-04-26T12:21:38Z

Fix issue #1114

troynt · 2018-04-26T12:32:25Z

src/plugins/ConsolidatePlugin.ts

    this.engine = options.engine;
    this.extension = options.extension || `.${options.engine}`;
    this.useDefault = (options.useDefault !== undefined) ? options.useDefault : true;
+    this.basedir = (options.basedir !== undefined) ? options.basedir : file.context.homeDir;


file variable does not exist

@nchanged said that it was...
so idk.

You can't initialize it in the constructor. It has to be done on each file

nchanged · 2018-04-26T12:36:36Z

src/plugins/ConsolidatePlugin.ts

    this.engine = options.engine;
    this.extension = options.extension || `.${options.engine}`;
    this.useDefault = (options.useDefault !== undefined) ? options.useDefault : true;
+    this.basedir = (options.basedir !== undefined) ? options.basedir : file.context.homeDir;


You can't initialize it in the constructor. It has to be done on each file

nchanged · 2018-04-26T12:36:54Z

src/plugins/ConsolidatePlugin.ts

-        filename: 'base',
-        basedir: file.context.homeDir,
-        includeDir: file.context.homeDir
+        filename: 'base'


where did the rest of the options go?

I thought it was just like useDefault

troynt · 2018-04-26T12:50:36Z

src/plugins/ConsolidatePlugin.ts

      file.contents = await consolidate[this.engine].render(file.contents, {
        cache: false,
-        filename: 'base'
+        filename: 'base',; basedir;


can remove ; basedir;

troynt · 2018-04-26T12:52:12Z

src/plugins/ConsolidatePlugin.ts

    this.engine = options.engine;
    this.extension = options.extension || `.${options.engine}`;
    this.useDefault = (options.useDefault !== undefined) ? options.useDefault : true;
-    this.basedir = (options.basedir !== undefined) ? options.basedir : file.context.homeDir;


this is needed if you plan on referencing it in transform

troynt · 2018-04-26T12:52:24Z

src/plugins/ConsolidatePlugin.ts

    this.extension = options.extension || `.${options.engine}`;
    this.useDefault = (options.useDefault !== undefined) ? options.useDefault : true;
-    this.basedir = (options.basedir !== undefined) ? options.basedir : file.context.homeDir;
-    this.includeDir = (options.includeDir !== undefined) ? options.includeDir : file.context.homeDir;


this is needed if you plan on referencing it in transform

troynt · 2018-04-26T12:53:05Z

src/plugins/ConsolidatePlugin.ts

-        filename: 'base'
+        filename: 'base',; basedir;
+        basedir: (options.basedir !== undefined) ? options.basedir : file.context.homeDir;
+        includeDir: (options.includeDir !== undefined) ? options.includeDir : file.context.homeDir;


options should be this

basedir: (this.basedir !== undefined) ? this.basedir : file.context.homeDir;

same for include

Sorry I'm tired I didn't sleep I code wrong..

nchanged · 2018-04-26T13:13:29Z

src/plugins/ConsolidatePlugin.ts

        filename: 'base',
-        basedir: file.context.homeDir,
-        includeDir: file.context.homeDir
+        basedir: this.basedir || file.context.homeDir,


where do you assign basedir? it's not in the constructor

Looks like its optional so should be fine. I am fussy, could we capitalise the D in basedir as well for consistency 😁

Let's capitlise it ! 😄

nchanged · 2018-04-27T07:08:59Z

src/plugins/ConsolidatePlugin.ts

        filename: 'base',
-        basedir: file.context.homeDir,
-        includeDir: file.context.homeDir
+        basedir: (this.basedir !== undefined) ? this.basedir : file.context.homeDir,


this.baseDir is never defined

eh? it is ...

Nope, it's not

nchanged · 2018-04-27T09:45:21Z

src/plugins/ConsolidatePlugin.ts

        filename: 'base',
-        basedir: file.context.homeDir,
-        includeDir: file.context.homeDir
+        basedir: (this.basedir !== undefined) ? this.basedir : file.context.homeDir,


Nope, it's not

nchanged · 2018-04-27T17:03:24Z

src/plugins/ConsolidatePlugin.ts

    this.engine = options.engine;
    this.extension = options.extension || `.${options.engine}`;
    this.useDefault = (options.useDefault !== undefined) ? options.useDefault : true;
+    this.basedir = options.basedir || file.context.homeDir;


file is undefined

you reviewed an old commit...

and it's defined.
see here:

fuse-box/src/plugins/ConsolidatePlugin.ts

Line 57 in fc3017e

basedir: file.context.homeDir,

I've added tests and everything's fine.
Can you merge it ?

Fix issue fuse-box#1114

Camelcase is everywhere... right ? 🎨

To make sure everything's okay.

nchanged · 2018-04-28T14:36:33Z

Looking good!

Can you update the doc please? After that, I will merge it

Kompwu · 2018-04-28T15:36:46Z

@nchanged Docs added :)

troynt suggested changes Apr 26, 2018

View reviewed changes

nchanged suggested changes Apr 26, 2018

View reviewed changes

troynt suggested changes Apr 26, 2018

View reviewed changes

nchanged approved these changes Apr 26, 2018

View reviewed changes

nchanged reviewed Apr 26, 2018

View reviewed changes

nchanged reviewed Apr 27, 2018

View reviewed changes

nchanged suggested changes Apr 27, 2018

View reviewed changes

Consolidate: Pass baseDir & includeDir as options

fcf0c24

Fix issue fuse-box#1114

Kompwu force-pushed the patch-1 branch from f34b218 to fcf0c24 Compare April 27, 2018 17:10

Capitalize the D in basedir to maintain consistency

e7f5a97

Camelcase is everywhere... right ? 🎨

Kompwu force-pushed the patch-1 branch from 8fef9d5 to e7f5a97 Compare April 28, 2018 07:08

Add tests for baseDir & includeDir

6fa4ea9

To make sure everything's okay.

nchanged approved these changes Apr 28, 2018

View reviewed changes

Add docs for baseDir & includeDir

76a8642

Kompwu force-pushed the patch-1 branch from b1d5589 to 76a8642 Compare April 28, 2018 15:38

Capitalize the D in basedir to maintain consistency (yeah again)

a503a65

nchanged merged commit 26e7ebe into fuse-box:master Apr 28, 2018

Kompwu deleted the patch-1 branch April 28, 2018 15:52

Uh oh!

Consolidate: Pass baseDir & includeDir as options #1225

Consolidate: Pass baseDir & includeDir as options #1225

Uh oh!

Conversation

Kompwu commented Apr 26, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nchanged commented Apr 28, 2018

Uh oh!

Kompwu commented Apr 28, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants