Skip to content

the host of the assets,if not set,it will be 127.0.0.1:${devServer.port} in development #33

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

Open
daolou wants to merge 6 commits into
base: master
Choose a base branch
from
Open

the host of the assets,if not set,it will be 127.0.0.1:${devServer.port} in development #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b5feb74
fix(devServer): the host of the assets,if not set url,it will be
daolou May 25, 2019
92b1415
fix(devServer): the host of the assets,if not set url,it will be
daolou May 25, 2019
3f53bfb
fix(devServer):delete package-lock.json
daolou May 26, 2019
78bf2e4
Merge branch 'master' into master
hubcarl Aug 7, 2020
567258b
style: merge eslint
hubcarl Aug 7, 2020
ce7bf24
style: ci eslint
hubcarl Aug 7, 2020
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
14 changes: 11 additions & 3 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,21 @@ module.exports = app => {
throw new Error('check autoPort fail');
}
}
const protocol = app.options.https && assetsConfig.dynamicLocalIP ? 'https' : 'http';
assetsConfig.url = `${protocol}://127.0.0.1:${port}`;
// if not set url,it will be `127.0.0.1:${devServer.port}`
if (assetsConfig.url) {
assetsConfig.url = `${assetsConfig.url}:${port}`;
} else {
const protocol = app.options.https && assetsConfig.dynamicLocalIP ? 'https' : 'http';
assetsConfig.url = `${protocol}://127.0.0.1:${port}`;
}
}

// it should check manifest.json on deployment
if (!assetsConfig.isLocalOrUnittest) {
const manifestPath = path.join(app.config.baseDir, 'config/manifest.json');
const manifestPath = path.join(
app.config.baseDir,
'config/manifest.json'
);
assert(fs.existsSync(manifestPath), `${manifestPath} is required`);
assetsConfig.manifest = require(manifestPath);
}
Expand Down
2 changes: 1 addition & 1 deletion config/config.default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = appInfo => ({
/**
* assets options
* @member Config#assets
* @property {String} url - the host of the assets, it will be `http://127.0.0.1:${devServer.port}` in development.
* @property {String} url - the host of the assets,if not set,it will be `127.0.0.1:${devServer.port}` in development.
* @property {String} publicPath - the base path of the assets
* @property {String} templatePath - the file path of template rendering html
* @property {String} templateViewEngine - the view engine for rendering template
Expand Down