Skip to content

issue/2363 drop src/course pathway in grunt#2644

Merged
oliverfoster merged 6 commits intorelease/v6from
issue/2363
Mar 16, 2020
Merged

issue/2363 drop src/course pathway in grunt#2644
oliverfoster merged 6 commits intorelease/v6from
issue/2363

Conversation

@oliverfoster
Copy link
Member

@oliverfoster oliverfoster commented Feb 10, 2020

fixes #2363 build/course or supplied outputdir folder only, no src/course

  • Changed to 2 spaces for json output
  • Added json-prettify task for dev to compliment json-minify for build
  • Reorganised main grunt tasks around server-build
  • Allowed build:diff and dev:diff as options during refactor
  • Deleted src/course folder, removed pathways for processing
  • Added build/course folder, .gitignore and copy task directives
  • Ensure grunt clean works correctly

build/course - course content
src - plugins only
src/course - deleted

IMPORTANT:
This will break AAT import and export as they expect src/course.
It will not break the framework but is a sufficiently large change to warrant a major version number.

QUESTION:
Process - Do we need a separate branch for v6 (as with v5) or merge straight into master? Yes.

@oliverfoster oliverfoster self-assigned this Feb 10, 2020
@oliverfoster oliverfoster changed the title issue/2363 drop src/course pathway issue/2363 drop src/course pathway in grunt Feb 10, 2020
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀

@oliverfoster oliverfoster added this to the Adapt v6 milestone Feb 11, 2020
@oliverfoster oliverfoster requested a review from moloko February 11, 2020 20:24
@brian-learningpool
Copy link
Member

Is there any knock-on effect on the Adapt CLI with this change?

@oliverfoster
Copy link
Member Author

Is there any knock-on effect on the Adapt CLI with this change?

There shouldn't be. I will check.

@oliverfoster oliverfoster changed the base branch from master to release/v6 February 17, 2020 15:09
@chucklorenz
Copy link
Member

Do we need a separate branch for v6 (as with v5) or merge straight into master?

Thinking abt those who come new to the project, or who just simply don't take the time to deliberately choose btwn the master and a release: can you avoid some questions/problems/explanations by using a v6 branch? (no strong opinion myself)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👀

Copy link

@lc-alexanderbenesch lc-alexanderbenesch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, works even better 👌

@oliverfoster oliverfoster linked an issue Mar 9, 2020 that may be closed by this pull request
@oliverfoster oliverfoster merged commit 163e034 into release/v6 Mar 16, 2020
@oliverfoster oliverfoster deleted the issue/2363 branch March 16, 2020 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Drop 'src/course' folder in favour of 'build/course'

5 participants