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.

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

Jump to bottom

fix: do not crash when an assert return null or undefined #1006

Merged
merged 1 commit into from Dec 6, 2019
Merged

fix: do not crash when an assert return null or undefined #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/runtime/getUrl.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ module.exports = (url, options) => {
}

// eslint-disable-next-line no-underscore-dangle, no-param-reassign
url = url.__esModule ? url.default : url;
url = url && url.__esModule ? url.default : url;

if (typeof url !== 'string') {
return url;
Expand Down
12 changes: 6 additions & 6 deletions test/__snapshots__/loader.test.js.snap
View file
Open in desktop
Expand Up @@ -109,7 +109,7 @@ exports[`loader should compile with \`css\` entry point (with \`modules\` and sc
}

// eslint-disable-next-line no-underscore-dangle, no-param-reassign
url = url.__esModule ? url.default : url;
url = url && url.__esModule ? url.default : url;

if (typeof url !== 'string') {
return url;
Expand Down Expand Up @@ -414,7 +414,7 @@ exports[`loader should compile with \`css\` entry point (with \`modules\` and sc
}

// eslint-disable-next-line no-underscore-dangle, no-param-reassign
url = url.__esModule ? url.default : url;
url = url && url.__esModule ? url.default : url;

if (typeof url !== 'string') {
return url;
Expand Down Expand Up @@ -743,7 +743,7 @@ exports[`loader should compile with \`css\` entry point: escape 1`] = `
}

// eslint-disable-next-line no-underscore-dangle, no-param-reassign
url = url.__esModule ? url.default : url;
url = url && url.__esModule ? url.default : url;

if (typeof url !== 'string') {
return url;
Expand Down Expand Up @@ -1048,7 +1048,7 @@ exports[`loader should compile with \`js\` entry point: escape 1`] = `
}

// eslint-disable-next-line no-underscore-dangle, no-param-reassign
url = url.__esModule ? url.default : url;
url = url && url.__esModule ? url.default : url;

if (typeof url !== 'string') {
return url;
Expand Down Expand Up @@ -1547,7 +1547,7 @@ module.exports = (url, options) => {
}

// eslint-disable-next-line no-underscore-dangle, no-param-reassign
url = url.__esModule ? url.default : url;
url = url && url.__esModule ? url.default : url;

if (typeof url !== 'string') {
return url;
Expand Down Expand Up @@ -1824,7 +1824,7 @@ module.exports = (url, options) => {
}

// eslint-disable-next-line no-underscore-dangle, no-param-reassign
url = url.__esModule ? url.default : url;
url = url && url.__esModule ? url.default : url;

if (typeof url !== 'string') {
return url;
Expand Down
54 changes: 29 additions & 25 deletions test/runtime/__snapshots__/getUrl.test.js.snap
View file
Open in desktop
Expand Up @@ -2,73 +2,73 @@

exports[`escape should escape url 1`] = `true`;

exports[`escape should escape url 2`] = `"image.png"`;
exports[`escape should escape url 2`] = `null`;

exports[`escape should escape url 3`] = `"image.png"`;
exports[`escape should escape url 3`] = `undefined`;

exports[`escape should escape url 4`] = `"image.png"`;

exports[`escape should escape url 5`] = `"\\"image other.png\\""`;
exports[`escape should escape url 5`] = `"image.png"`;

exports[`escape should escape url 6`] = `"\\"image other.png\\""`;
exports[`escape should escape url 6`] = `"image.png"`;

exports[`escape should escape url 7`] = `"\\"image other.png\\""`;

exports[`escape should escape url 8`] = `"\\"image\\\\\\"other.png\\""`;
exports[`escape should escape url 8`] = `"\\"image other.png\\""`;

exports[`escape should escape url 9`] = `"\\"image\\\\nother.png\\""`;
exports[`escape should escape url 9`] = `"\\"image other.png\\""`;

exports[`escape should escape url 10`] = `"image.png#hash"`;
exports[`escape should escape url 10`] = `"\\"image\\\\\\"other.png\\""`;

exports[`escape should escape url 11`] = `"image.png#hash"`;
exports[`escape should escape url 11`] = `"\\"image\\\\nother.png\\""`;

exports[`escape should escape url 12`] = `"image.png#hash"`;

exports[`escape should escape url 13`] = `"\\"image other.png#hash\\""`;
exports[`escape should escape url 13`] = `"image.png#hash"`;

exports[`escape should escape url 14`] = `"\\"image other.png#hash\\""`;
exports[`escape should escape url 14`] = `"image.png#hash"`;

exports[`escape should escape url 15`] = `"\\"image other.png#hash\\""`;

exports[`escape should escape url 16`] = `"\\"image other.png\\""`;
exports[`escape should escape url 16`] = `"\\"image other.png#hash\\""`;

exports[`escape should escape url 17`] = `"\\"image other.png\\""`;
exports[`escape should escape url 17`] = `"\\"image other.png#hash\\""`;

exports[`escape should escape url 18`] = `"\\"image other.png\\""`;

exports[`escape should escape url 19`] = `"image.png"`;
exports[`escape should escape url 19`] = `"\\"image other.png\\""`;

exports[`escape should escape url 20`] = `"image.png"`;
exports[`escape should escape url 20`] = `"\\"image other.png\\""`;

exports[`escape should escape url 21`] = `"image.png"`;

exports[`escape should escape url 22`] = `"\\"image other.png\\""`;
exports[`escape should escape url 22`] = `"image.png"`;

exports[`escape should escape url 23`] = `"\\"image other.png\\""`;
exports[`escape should escape url 23`] = `"image.png"`;

exports[`escape should escape url 24`] = `"\\"image other.png\\""`;

exports[`escape should escape url 25`] = `"\\"image\\\\\\"other.png\\""`;
exports[`escape should escape url 25`] = `"\\"image other.png\\""`;

exports[`escape should escape url 26`] = `"\\"image\\\\nother.png\\""`;
exports[`escape should escape url 26`] = `"\\"image other.png\\""`;

exports[`escape should escape url 27`] = `"image.png#hash"`;
exports[`escape should escape url 27`] = `"\\"image\\\\\\"other.png\\""`;

exports[`escape should escape url 28`] = `"image.png#hash"`;
exports[`escape should escape url 28`] = `"\\"image\\\\nother.png\\""`;

exports[`escape should escape url 29`] = `"image.png#hash"`;

exports[`escape should escape url 30`] = `"\\"image other.png#hash\\""`;
exports[`escape should escape url 30`] = `"image.png#hash"`;

exports[`escape should escape url 31`] = `"\\"image other.png\\""`;
exports[`escape should escape url 31`] = `"image.png#hash"`;

exports[`escape should escape url 32`] = `"\\"image other.png\\""`;
exports[`escape should escape url 32`] = `"\\"image other.png#hash\\""`;

exports[`escape should escape url 33`] = `"\\"image other.png\\""`;

exports[`escape should escape url 34`] = `"\\"image other.png#hash\\""`;
exports[`escape should escape url 34`] = `"\\"image other.png\\""`;

exports[`escape should escape url 35`] = `"\\"image other.png#hash\\""`;
exports[`escape should escape url 35`] = `"\\"image other.png\\""`;

exports[`escape should escape url 36`] = `"\\"image other.png#hash\\""`;

Expand All @@ -81,3 +81,7 @@ exports[`escape should escape url 39`] = `"\\"image other.png#hash\\""`;
exports[`escape should escape url 40`] = `"\\"image other.png#hash\\""`;

exports[`escape should escape url 41`] = `"\\"image other.png#hash\\""`;

exports[`escape should escape url 42`] = `"\\"image other.png#hash\\""`;

exports[`escape should escape url 43`] = `"\\"image other.png#hash\\""`;
3 changes: 3 additions & 0 deletions test/runtime/getUrl.test.js
View file
Open in desktop
Expand Up @@ -3,6 +3,9 @@ const getUrl = require('../../src/runtime/getUrl');
describe('escape', () => {
it('should escape url', () => {
expect(getUrl(true)).toMatchSnapshot();
expect(getUrl(null)).toMatchSnapshot();
// eslint-disable-next-line no-undefined
expect(getUrl(undefined)).toMatchSnapshot();
expect(getUrl('image.png')).toMatchSnapshot();
expect(getUrl('"image.png"')).toMatchSnapshot();
expect(getUrl("'image.png'")).toMatchSnapshot();
Expand Down