Skip to content

Commit fe194dd

Browse files
committed
build: build v2.5.18-beta.0
1 parent 3078352 commit fe194dd

16 files changed

+31255
-31025
lines changed

Diff for: dist/vue.common.js

+492-397
Large diffs are not rendered by default.

Diff for: dist/vue.esm.js

+492-397
Large diffs are not rendered by default.

Diff for: dist/vue.js

+9,826-9,747
Large diffs are not rendered by default.

Diff for: dist/vue.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/vue.runtime.common.js

+403-354
Large diffs are not rendered by default.

Diff for: dist/vue.runtime.esm.js

+403-354
Large diffs are not rendered by default.

Diff for: dist/vue.runtime.js

+6,993-6,954
Large diffs are not rendered by default.

Diff for: dist/vue.runtime.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: packages/vue-server-renderer/basic.js

+7,293-7,328
Large diffs are not rendered by default.

Diff for: packages/vue-server-renderer/build.js

+408-385
Large diffs are not rendered by default.

Diff for: packages/vue-server-renderer/client-plugin.js

+18-10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
var isJS = function (file) { return /\.js(\?[^.]+)?$/.test(file); };
66

7+
var isCSS = function (file) { return /\.css(\?[^.]+)?$/.test(file); };
8+
79
var ref = require('chalk');
810
var red = ref.red;
911
var yellow = ref.yellow;
@@ -12,8 +14,19 @@ var prefix = "[vue-server-renderer-webpack-plugin]";
1214
var warn = exports.warn = function (msg) { return console.error(red((prefix + " " + msg + "\n"))); };
1315
var tip = exports.tip = function (msg) { return console.log(yellow((prefix + " " + msg + "\n"))); };
1416

17+
var onEmit = function (compiler, name, hook) {
18+
if (compiler.hooks) {
19+
// Webpack >= 4.0.0
20+
compiler.hooks.emit.tapAsync(name, hook);
21+
} else {
22+
// Webpack < 4.0.0
23+
compiler.plugin('emit', hook);
24+
}
25+
};
26+
1527
var hash = require('hash-sum');
1628
var uniq = require('lodash.uniq');
29+
1730
var VueSSRClientPlugin = function VueSSRClientPlugin (options) {
1831
if ( options === void 0 ) options = {};
1932

@@ -25,7 +38,7 @@ var VueSSRClientPlugin = function VueSSRClientPlugin (options) {
2538
VueSSRClientPlugin.prototype.apply = function apply (compiler) {
2639
var this$1 = this;
2740

28-
compiler.plugin('emit', function (compilation, cb) {
41+
onEmit(compiler, 'vue-client-plugin', function (compilation, cb) {
2942
var stats = compilation.getStats().toJson();
3043

3144
var allFiles = uniq(stats.assets
@@ -34,10 +47,10 @@ VueSSRClientPlugin.prototype.apply = function apply (compiler) {
3447
var initialFiles = uniq(Object.keys(stats.entrypoints)
3548
.map(function (name) { return stats.entrypoints[name].assets; })
3649
.reduce(function (assets, all) { return all.concat(assets); }, [])
37-
.filter(isJS));
50+
.filter(function (file) { return isJS(file) || isCSS(file); }));
3851

3952
var asyncFiles = allFiles
40-
.filter(isJS)
53+
.filter(function (file) { return isJS(file) || isCSS(file); })
4154
.filter(function (file) { return initialFiles.indexOf(file) < 0; });
4255

4356
var manifest = {
@@ -58,7 +71,8 @@ VueSSRClientPlugin.prototype.apply = function apply (compiler) {
5871
if (!chunk || !chunk.files) {
5972
return
6073
}
61-
var files = manifest.modules[hash(m.identifier)] = chunk.files.map(fileToIndex);
74+
var id = m.identifier.replace(/\s\w+$/, ''); // remove appended hash
75+
var files = manifest.modules[hash(id)] = chunk.files.map(fileToIndex);
6276
// find all asset modules associated with the same chunk
6377
assetModules.forEach(function (m) {
6478
if (m.chunks.some(function (id) { return id === cid; })) {
@@ -68,12 +82,6 @@ VueSSRClientPlugin.prototype.apply = function apply (compiler) {
6882
}
6983
});
7084

71-
// const debug = (file, obj) => {
72-
// require('fs').writeFileSync(__dirname + '/' + file, JSON.stringify(obj, null, 2))
73-
// }
74-
// debug('stats.json', stats)
75-
// debug('client-manifest.json', manifest)
76-
7785
var json = JSON.stringify(manifest, null, 2);
7886
compilation.assets[this$1.options.filename] = {
7987
source: function () { return json; },

Diff for: packages/vue-server-renderer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-server-renderer",
3-
"version": "2.5.17-beta.0",
3+
"version": "2.5.18-beta.0",
44
"description": "server renderer for Vue 2.0",
55
"main": "index.js",
66
"types": "types/index.d.ts",

Diff for: packages/vue-server-renderer/server-plugin.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ var validate = function (compiler) {
2929
}
3030
};
3131

32+
var onEmit = function (compiler, name, hook) {
33+
if (compiler.hooks) {
34+
// Webpack >= 4.0.0
35+
compiler.hooks.emit.tapAsync(name, hook);
36+
} else {
37+
// Webpack < 4.0.0
38+
compiler.plugin('emit', hook);
39+
}
40+
};
41+
3242
var VueSSRServerPlugin = function VueSSRServerPlugin (options) {
3343
if ( options === void 0 ) options = {};
3444

@@ -42,7 +52,7 @@ VueSSRServerPlugin.prototype.apply = function apply (compiler) {
4252

4353
validate(compiler);
4454

45-
compiler.plugin('emit', function (compilation, cb) {
55+
onEmit(compiler, 'vue-server-plugin', function (compilation, cb) {
4656
var stats = compilation.getStats().toJson();
4757
var entryName = Object.keys(stats.entrypoints)[0];
4858
var entryInfo = stats.entrypoints[entryName];
@@ -75,7 +85,7 @@ VueSSRServerPlugin.prototype.apply = function apply (compiler) {
7585
};
7686

7787
stats.assets.forEach(function (asset) {
78-
if (asset.name.match(/\.js$/)) {
88+
if (isJS(asset.name)) {
7989
bundle.files[asset.name] = compilation.assets[asset.name].source();
8090
} else if (asset.name.match(/\.js\.map$/)) {
8191
bundle.maps[asset.name.replace(/\.map$/, '')] = JSON.parse(compilation.assets[asset.name].source());

0 commit comments

Comments
 (0)