Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vuejs-templates/webpack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: vuejs-templates/webpack
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 10 commits
  • 1 file changed
  • 3 contributors

Commits on Nov 21, 2017

  1. Simplify elementCount custom assertions (#898)

    * Improve custom Nightwatch assertion comment readability
    
    Standardize capitalization, punctuation
    Use common language
    Reduce word count
    
    * Clarify elementCount arguments
    
    Before this commit the term `selector` was used for two separate arguments in
    two separate scopes. Rename the function passed to the browser so the developer
    understands that these are two arguments/two scopes/not the same value.
    robwierzbowski authored and yyx990803 committed Nov 21, 2017
    Copy the full SHA
    5b138f3 View commit details
  2. Merge branch 'develop'

    * develop:
      bump v1.2.4
      revert #996 chunk names to minify prodution JS (#1086)
      fix missing comma
      Batman!
      add missing cacheBusting option
      make jest ignore the e2e test folder because its likely to contain files matching the jest's filename pattern
      Improved Jest config (#1074)
      Fix # 1070 When index.html has a positional variable, the error can be printed correctly (#1071)
      [enhancement]Remove useless files and performance enhancement in dev server. (#1072)
    LinusBorg committed Nov 21, 2017
    Copy the full SHA
    3c15450 View commit details

Commits on Dec 2, 2017

  1. Merge branch 'develop'

    * develop:
      bump version 1.2.5
      some small updates to the docs
      Adds support for the video poster attribute (#1123)
      babel-register use only for e2e tests (#1120)
      Update project creation: sort dependencies in package.json (#1118)
      Fix bug from PR #1082
      FIX: convert env variable PORT to a number.
      Minor refactoring of build scripts (#1082)
      ESLint config clean up (#1093)
      Switch to uglifyjs-webpack-plugin (#1119)
      change bad spaces into normal spaces and removing trailing space (#1132)
      prevent empty line when unit = y & e2e = n
      Update meta.js (#1091)
      docs(README): Update usage to init from develop branch (#1092)
      Use actual host for notification (#1101). (#1103)
      prevent webpack from injecting useless mocks
    LinusBorg committed Dec 2, 2017
    Copy the full SHA
    c4943a1 View commit details

Commits on Dec 11, 2017

  1. Merge branch 'develop'

    * develop:
      remove unnecessary exceptions
      bump version to 1.2.6
      Add JX support (close #1146)
      Automatically install Dependencies and fix lint errors (#1133)
      Set `allChunks: true` by default (close #1110) (#1149)
      airbnb eslint config compatibility with vuex (#1003)
      Document babel target env configuration (#1144)
      Revert "remove uneccessary target.browsers (#1004)" (#1083)
      fix filename of `.eslintignore` (#1136)
      webpack.conf.js is not needed in jest and e2e (#1135)
    
    # Conflicts:
    #	template/test/e2e/custom-assertions/elementCount.js
    LinusBorg committed Dec 11, 2017
    Copy the full SHA
    b2fd0de View commit details

Commits on Dec 14, 2017

  1. Merge branch 'develop'

    * develop:
      correct wording for #1155
      bump version to 1.2.7
      remove eventsource-polyfill (#1169)
      Remove useless code when lint is not chosen (#1165)
      Set spawn opt shell as true to avoid ENOENT (#1170)
      restore gitignore
      [WIP] Accurate CompleteMsg when not using autoInstall (fix #1157) (#1158)
      close #1155
    LinusBorg committed Dec 14, 2017
    Copy the full SHA
    f93e45b View commit details

Commits on Dec 27, 2017

  1. Fix TypeScript typo (#1187)

    Signed-off-by: Mulia Arifandi Nasution <[email protected]>
    mul14 authored and LinusBorg committed Dec 27, 2017
    Copy the full SHA
    2b90ae2 View commit details

Commits on Dec 31, 2017

  1. Merge branch 'develop'

    * develop:
      bump template version
      fix bug with #1202
      Make CSS sourcemaps on by default
      Ensure page reloads in history mode serve index.html
      use old sourcemap option
      Add postcss-url to match postcss-import (#1115)
      Change engine>node{4 => 6} for template (#1206)
      Fix static file serving for publicPath != `/` (fix#1176) (#1180)
      Load, render template version using helper (#1202)
      fix typo in a comment (#1183)
      fix #1140
    LinusBorg committed Dec 31, 2017
    Copy the full SHA
    e7005e1 View commit details

Commits on Jan 6, 2018

  1. Copy the full SHA
    4731a34 View commit details

Commits on Jan 13, 2018

  1. Merge branch 'develop'

    * develop:
      bump template version (1.3.0)
      chore: remove extra comma (#1240)
      Improve template CI tests (close #1218)
      Revert "fix bad alias (fix #1239)"
      Typo, whitespace and Style Guide fixes (#1231)
      Update runner.js (#1235)
      remove unnecessary option.
      bumping eslint dependencies
      fix bad alias (fix #1239)
      remove duplicate lines in gitignore (#1214)
      fix historyFallback rewrite for Windows systems
      improved comments in eslintrc
      updated linting docs.
      respect eslint rule for order of options.
      switch to essential ruleset.
      add eslint-plugin-vue
    
    # Conflicts:
    #	template/build/build.js
    LinusBorg committed Jan 13, 2018
    1
    Copy the full SHA
    8343cae View commit details
  2. Merge branch 'develop'

    * develop:
      Bump template version (1.3.1)
      change circleci node image to 6.12.3 to ensure node 6 compat.
      replace object rest spread with Object.assign for node6 compat. (fix #1245)
    LinusBorg committed Jan 13, 2018
    Copy the full SHA
    c29ab6a View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 template/build/build.js
2 changes: 1 addition & 1 deletion template/build/build.js
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
process.stdout.write(stats.toString({
colors: true,
modules: false,
children: false, // if you are using ts-loader, setting this to true will make typescript errors show up during build
children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
chunks: false,
chunkModules: false
}) + '\n\n')