Skip to content

Commit

Permalink
feat: automatically add cross-origin script attr when applicable (#70)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DylanPiercey
DylanPiercey authored Jul 6, 2022
1 parent a37a033 commit d2ba115
Show file tree
Hide file tree
Showing 18 changed files with 42 additions and 22 deletions.
3 changes: 2 additions & 1 deletion src/__tests__/fixtures/asset-tag/__snapshots__/webpack4/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -275,7 +276,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/__tests__/fixtures/asset-tag/__snapshots__/webpack5/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -177,7 +178,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack4/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -187,7 +188,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ..._/fixtures/basic-template-plugin-custom-runtime-id/__snapshots__/webpack5/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -87,7 +88,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack4/server--main.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ..._tests__/fixtures/basic-template-plugin-production/__snapshots__/webpack5/server--main.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack4/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -187,7 +188,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/__tests__/fixtures/basic-template-plugin/__snapshots__/webpack5/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -87,7 +88,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack4/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -175,7 +176,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down Expand Up @@ -321,6 +322,7 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -342,7 +344,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down Expand Up @@ -458,6 +460,7 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -479,7 +482,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
9 changes: 6 additions & 3 deletions src/__tests__/fixtures/multiple-entries-plugin/__snapshots__/webpack5/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -94,7 +95,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down Expand Up @@ -247,6 +248,7 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -268,7 +270,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down Expand Up @@ -389,6 +391,7 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -410,7 +413,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack4/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ const _marko_template = Object(marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -228,7 +229,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...ixtures/with-class-component-plugin-dynamic-bundle/__snapshots__/webpack5/server--main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ const _marko_template = (0,marko_dist_runtime_html__WEBPACK_IMPORTED_MODULE_0__.



const crossOriginAttr = new URL(__webpack_require__.p, "file:").protocol === "file:" ? "" : " crossorigin";

function renderAssets(out) {
const entries = this.___entries;
Expand All @@ -130,7 +131,7 @@ function renderAssets(out) {
for (const href of assets.js) {
if (!written.has(href)) {
written.add(href);
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr} async></script>`;
scripts += `<script src=${JSON.stringify(__webpack_require__.p + href)}${nonceAttr + crossOriginAttr} async></script>`;
}
}
}
Expand Down
Loading

0 comments on commit d2ba115

Please sign in to comment.