Skip to content

implement lazy-loading of components; fixes dynamic imports #215

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 30, 2017
Merged

implement lazy-loading of components; fixes dynamic imports #215

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3886b9
implement lazy-loading of components; fixes dynamic imports
Jun 30, 2017
35eaf26
Merge branch 'master' into dynamic-imports
Jun 30, 2017
913fdb7
Fix merge
Jun 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 30 additions & 17 deletions packages/vue-component/plugin/vue-compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,37 @@ VueComponentCompiler = class VueCompo extends CachingCompiler {

//console.log(`js hash: ${jsHash}`);

// Lazy load files from NPM packages or imports directories
const isLazy = !!inputFilePath.match(/(^|\/)(node_modules|imports)\//);

// Style
let css = '';
let cssHash = '';
if (compileResult.styles.length !== 0) {
for (let style of compileResult.styles) {
css += style.css;
}

cssHash = Hash(css);

//console.log(`css hash: ${cssHash}`);
if (!isDev && isLazy) {
// Wrap CSS in Meteor's lazy CSS loader
css = `
const modules = require('meteor/modules');
modules.addStyles(${JSON.stringify(css)});
`;
}
}

const { js, templateHash } = generateJs(vueId, inputFile, compileResult)

let outputFilePath = inputFile.getPathInPackage();
let outputFilePath = inputFilePath;
// Meteor will error when loading .vue files on the server unless they are postfixed with .js
if (inputFile.getArch().indexOf('os') === 0 && inputFilePath.indexOf('node_modules') !== -1) {
outputFilePath += '.js';
}

// Including the source maps for .vue files from node_modules breaks source mapping.
const sourceMap = inputFilePath.indexOf('node_modules') === -1
? compileResult.map
Expand All @@ -167,27 +190,17 @@ VueComponentCompiler = class VueCompo extends CachingCompiler {
// Add JS Source file
inputFile.addJavaScript({
path: outputFilePath,
data: js,
data: isLazy && !isDev ? css + js : js,
sourceMap: sourceMap,
lazy: false,
lazy: isLazy,
});

// Style
let css = '';
let cssHash = '';
if (compileResult.styles.length !== 0) {
for (let style of compileResult.styles) {
css += style.css;
}

cssHash = Hash(css);

//console.log(`css hash: ${cssHash}`);

if (css) {
if (isDev) {
// Add style to client first-connection style list
global._dev_server.__addStyle({ hash: vueId, css, path: inputFilePath }, false);
} else {
} else if (!isLazy) {
// In order to avoid lazy-loading errors in --production mode, addStylesheet must come after addJavaScript
this.addStylesheet(inputFile, {
data: css
});
Expand Down