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

Merge some small fixes #900

Merged
merged 2 commits into from
Sep 5, 2017
Merged

Merge some small fixes #900

merged 2 commits into from
Sep 5, 2017

Conversation

LinusBorg
Copy link
Contributor

No description provided.

@LinusBorg LinusBorg merged commit 313c5ad into master Sep 5, 2017
c0defre4k pushed a commit to neonblack-at/webpack that referenced this pull request Sep 13, 2017
* vuejs-templates/master:
  Merge some small fixes (vuejs-templates#900)
  Update vue-loader link (vuejs-templates#886)
  match vue-template-compiler version
  revert: vuejs-templates#759
  Revert vuejs-templates#688, fix vuejs-templates#879
  fix vuejs-templates#877
  chore(package): rm unused lolex dependency(dev) (vuejs-templates#803)
  Add support for linked modules (vuejs-templates#688)
  add HashedModuleIdsPlugin when build (vuejs-templates#870)
  Specify the address to listen on (vuejs-templates#759)
  bump vue & vue-router dependencies
  fixed vue-router dependency(need vue-loader@^13.0.0) (vuejs-templates#876)
  Removing Vue.config.debug usage from documentation (vuejs-templates#871)
  fix ci build faild (vuejs-templates#857)
  fix standard eslint config link (vuejs-templates#834)
  Return exit code 1 when npm run build fails (vuejs-templates#854)
  load webpack.prod.conf when NODE_ENV=production (vuejs-templates#864)
  Remove unnecessary space and comma (vuejs-templates#866)
  Move Chat: Gitter -> Discord (vuejs-templates#869)

# Conflicts:
#	template/package.json
LinusBorg pushed a commit that referenced this pull request Sep 30, 2017
* Update vue-loader link (#886)

* Merge some small fixes (#900)

* Remove unused fs require from webpack.base.conf.js (#893)

* cleanup some leftover from reverting #688

* update URL of ESLint to https

* fix missing comma from conflict resolution
frandiox pushed a commit to OnsenUI/vue-cordova-webpack that referenced this pull request Oct 13, 2017
* Update vue-loader link (vuejs-templates#886)

* Merge some small fixes (vuejs-templates#900)

* Remove unused fs require from webpack.base.conf.js (vuejs-templates#893)

* cleanup some leftover from reverting vuejs-templates#688

* update URL of ESLint to https

* fix missing comma from conflict resolution
LinusBorg pushed a commit that referenced this pull request Nov 8, 2017
* Update vue-loader link (#886)

* Merge some small fixes (#900)

* Remove unused fs require from webpack.base.conf.js (#893)

* cleanup some leftover from reverting #688

* fix postcss config

* userPostCSS config
frandiox pushed a commit to OnsenUI/vue-cordova-webpack that referenced this pull request Dec 25, 2017
* Update vue-loader link (vuejs-templates#886)

* Merge some small fixes (vuejs-templates#900)

* Remove unused fs require from webpack.base.conf.js (vuejs-templates#893)

* cleanup some leftover from reverting vuejs-templates#688

* fix postcss config

* userPostCSS config
shenron pushed a commit to shenron/webpack that referenced this pull request Mar 20, 2018
* Update vue-loader link (vuejs-templates#886)

* Merge some small fixes (vuejs-templates#900)

* Remove unused fs require from webpack.base.conf.js (vuejs-templates#893)

* cleanup some leftover from reverting vuejs-templates#688

* fix postcss config

* userPostCSS config
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.

2 participants