Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for webpack2 #50 #57

Merged
merged 2 commits into from Dec 13, 2016
Merged

Conversation

nstojiljkovic
Copy link
Contributor

Please review :)

@scala-jenkins
Copy link
Collaborator

Can one of the admins verify this patch?

@julienrf
Copy link
Contributor

test this please

@scala-jenkins
Copy link
Collaborator

Refer to this link for build results (access rights to CI server needed):
https://scala-webapps.epfl.ch/jenkins//job/scalajs-bundler/60/
Test FAILed.

@julienrf
Copy link
Contributor

Checking out Revision f8fad48 (origin/yarn-appveyor)

I don’t understand why has Jenkins checked out the wrong branch…

Copy link
Contributor

@julienrf julienrf left a comment

Choose a reason for hiding this comment

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

Let me know if you can apply the requested changes, otherwise I will do it :)

case e: Exception => None
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you could rewrite this as follows:

version match {
  case r(v, _) => Try(v.toInt).toOption
  case _ => None
}

Some(json.fromJSON[NpmPackage](json.readJSON(new FileReader(webpackPackageJsonFilePath))))
} catch {
case e : Exception => None
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I prefer Try(…).toOption

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do it, min

@nstojiljkovic
Copy link
Contributor Author

We've again got the error: "Error: Cannot find module 'C:\Users\appveyor\AppData\Local\Temp\1\sbt_492497ae\static2\target\scala-2.11\node_modules\webpack\bin\webpack'". @julienrf how did you fix it the first time?

@julienrf
Copy link
Contributor

I didn’t fix this issue yet :(

@julienrf julienrf force-pushed the webpack2 branch 2 times, most recently from fe7742e to b966319 Compare December 13, 2016 12:08
@julienrf
Copy link
Contributor

The PR is great but, I don’t know why, there is an issue in AppVeyor: some files are not correctly removed by the sbt clean tasks… I will put the PR in stand by as long as I can not resolve this problem.

@julienrf julienrf changed the base branch from master to webpack2 December 13, 2016 12:14
@julienrf
Copy link
Contributor

So, I’m going to merge the PR to an internal webpack2 branch instead of master.

@julienrf julienrf merged commit 12ca4fe into scalacenter:webpack2 Dec 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants