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.

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

Upgrade packages #1765

Merged
merged 5 commits into from
Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@
"typescript": "4.7.3"
},
"resolutions": {
"esbuild": "0.14.42",
"ua-parser-js": "0.7.28"
"esbuild": "0.14.42"
},
"jest": {
"coveragePathIgnorePatterns": [
Expand Down
6 changes: 3 additions & 3 deletions packages/modular-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"@rollup/plugin-babel": "5.3.1",
"@rollup/plugin-commonjs": "22.0.0",
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "13.3.0",
"@svgr/core": "6.1.2",
"@svgr/webpack": "5.5.0",
"@rollup/plugin-node-resolve": "13.2.1",
"@svgr/core": "6.2.1",
"@svgr/webpack": "6.2.1",
"@types/micromatch": "4.0.2",
"@types/semver-regex": "3.1.0",
"@types/yarnpkg__lockfile": "^1.1.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ exports[`When working with a nested app can generate a asset-manifest 1`] = `
"{
\\"files\\": {
\\"main.css\\": \\"/static/css/main.1a7488ce.css\\",
\\"main.js\\": \\"/static/js/main.99649537.js\\",
\\"main.js\\": \\"/static/js/main.502b419b.js\\",
\\"runtime-main.js\\": \\"/static/js/runtime-main.de012fdc.js\\",
\\"static/js/788.bbd34b33.js\\": \\"/static/js/788.bbd34b33.js\\",
\\"static/media/logo.svg\\": \\"/static/media/logo.103b5fa18196d5665a7e12318285c916.svg\\",
\\"index.html\\": \\"/index.html\\",
\\"main.1a7488ce.css.map\\": \\"/static/css/main.1a7488ce.css.map\\",
\\"main.99649537.js.map\\": \\"/static/js/main.99649537.js.map\\",
\\"main.502b419b.js.map\\": \\"/static/js/main.502b419b.js.map\\",
\\"runtime-main.de012fdc.js.map\\": \\"/static/js/runtime-main.de012fdc.js.map\\",
\\"788.bbd34b33.js.map\\": \\"/static/js/788.bbd34b33.js.map\\"
},
\\"entrypoints\\": [
\\"static/js/runtime-main.de012fdc.js\\",
\\"static/js/788.bbd34b33.js\\",
\\"static/css/main.1a7488ce.css\\",
\\"static/js/main.99649537.js\\"
\\"static/js/main.502b419b.js\\"
]
}"
`;
Expand Down Expand Up @@ -146,7 +146,7 @@ exports[`When working with a nested app can generate a hashed main js chunk in t
self.webpackChunk_scoped_sample_app || []).push([
[179],
{
235: (e, t, a) => {
754: (e, t, a) => {
var r = a(735),
l = a(788);
const n = a.p + \\"static/media/logo.103b5fa18196d5665a7e12318285c916.svg\\";
Expand Down Expand Up @@ -190,13 +190,13 @@ exports[`When working with a nested app can generate a hashed main js chunk in t
},
(e) => {
e.O(0, [788], () => {
return (t = 235), e((e.s = t));
return (t = 754), e((e.s = t));
var t;
});
e.O();
},
]);
//# sourceMappingURL=main.99649537.js.map
//# sourceMappingURL=main.502b419b.js.map
"
`;

Expand Down Expand Up @@ -8622,7 +8622,7 @@ exports[`When working with a nested app can generate a index.html 1`] = `
})();
</script>
<script defer=\\"defer\\" src=\\"/static/js/788.bbd34b33.js\\"></script>
<script defer=\\"defer\\" src=\\"/static/js/main.99649537.js\\"></script>
<script defer=\\"defer\\" src=\\"/static/js/main.502b419b.js\\"></script>
<link href=\\"/static/css/main.1a7488ce.css\\" rel=\\"stylesheet\\" />
</head>
<body>
Expand Down Expand Up @@ -8684,21 +8684,21 @@ exports[`when working with an app can generate a asset-manifest 1`] = `
"{
\\"files\\": {
\\"main.css\\": \\"/static/css/main.1a7488ce.css\\",
\\"main.js\\": \\"/static/js/main.6146e428.js\\",
\\"main.js\\": \\"/static/js/main.abe6afa1.js\\",
\\"runtime-main.js\\": \\"/static/js/runtime-main.e92969dd.js\\",
\\"static/js/316.394ef80b.js\\": \\"/static/js/316.394ef80b.js\\",
\\"static/media/logo.svg\\": \\"/static/media/logo.103b5fa18196d5665a7e12318285c916.svg\\",
\\"index.html\\": \\"/index.html\\",
\\"main.1a7488ce.css.map\\": \\"/static/css/main.1a7488ce.css.map\\",
\\"main.6146e428.js.map\\": \\"/static/js/main.6146e428.js.map\\",
\\"main.abe6afa1.js.map\\": \\"/static/js/main.abe6afa1.js.map\\",
\\"runtime-main.e92969dd.js.map\\": \\"/static/js/runtime-main.e92969dd.js.map\\",
\\"316.394ef80b.js.map\\": \\"/static/js/316.394ef80b.js.map\\"
},
\\"entrypoints\\": [
\\"static/js/runtime-main.e92969dd.js\\",
\\"static/js/316.394ef80b.js\\",
\\"static/css/main.1a7488ce.css\\",
\\"static/js/main.6146e428.js\\"
\\"static/js/main.abe6afa1.js\\"
]
}"
`;
Expand All @@ -8708,7 +8708,7 @@ exports[`when working with an app can generate a hashed main js chunk in the js
(self.webpackChunksample_app = self.webpackChunksample_app || []).push([
[179],
{
217: (e, t, a) => {
354: (e, t, a) => {
var r = a(784),
l = a(316);
const n = a.p + \\"static/media/logo.103b5fa18196d5665a7e12318285c916.svg\\";
Expand Down Expand Up @@ -8757,13 +8757,13 @@ exports[`when working with an app can generate a hashed main js chunk in the js
},
(e) => {
e.O(0, [316], () => {
return (t = 217), e((e.s = t));
return (t = 354), e((e.s = t));
var t;
});
e.O();
},
]);
//# sourceMappingURL=main.6146e428.js.map
//# sourceMappingURL=main.abe6afa1.js.map
"
`;

Expand Down Expand Up @@ -17187,7 +17187,7 @@ exports[`when working with an app can generate a index.html 1`] = `
})();
</script>
<script defer=\\"defer\\" src=\\"/static/js/316.394ef80b.js\\"></script>
<script defer=\\"defer\\" src=\\"/static/js/main.6146e428.js\\"></script>
<script defer=\\"defer\\" src=\\"/static/js/main.abe6afa1.js\\"></script>
<link href=\\"/static/css/main.1a7488ce.css\\" rel=\\"stylesheet\\" />
</head>
<body>
Expand Down
24 changes: 12 additions & 12 deletions packages/modular-scripts/src/__tests__/app.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ describe('When working with a nested app', () => {
expect(tree(path.join(modularRoot, 'dist', 'scoped-sample-app')))
.toMatchInlineSnapshot(`
"scoped-sample-app
├─ asset-manifest.json #1pcwjot
├─ asset-manifest.json #tpf5u4
├─ favicon.ico #6pu3rg
├─ index.html #bs7ctd
├─ index.html #1cgzs99
├─ logo192.png #1nez7vk
├─ logo512.png #1hwqvcc
├─ manifest.json #19gah8o
Expand All @@ -146,8 +146,8 @@ describe('When working with a nested app', () => {
│ ├─ 788.bbd34b33.js #33pg04
│ ├─ 788.bbd34b33.js.LICENSE.txt #eplx8h
│ ├─ 788.bbd34b33.js.map #1xdy7n0
│ ├─ main.99649537.js #b22d4x
│ ├─ main.99649537.js.map #16cngow
│ ├─ main.502b419b.js #14cckvx
│ ├─ main.502b419b.js.map #17qi16y
│ ├─ runtime-main.de012fdc.js #1qz643h
│ └─ runtime-main.de012fdc.js.map #ntuwq4
└─ media
Expand Down Expand Up @@ -247,12 +247,12 @@ describe('When working with a nested app', () => {
'scoped-sample-app',
'static',
'js',
'main.99649537.js',
'main.502b419b.js',
),
),
),
{
filepath: 'main.99649537.js',
filepath: 'main.502b419b.js',
},
),
).toMatchSnapshot();
Expand Down Expand Up @@ -347,9 +347,9 @@ describe('when working with an app', () => {
expect(tree(path.join(modularRoot, 'dist', 'sample-app')))
.toMatchInlineSnapshot(`
"sample-app
├─ asset-manifest.json #lp70k5
├─ asset-manifest.json #620pei
├─ favicon.ico #6pu3rg
├─ index.html #afmhhb
├─ index.html #1vp7lky
├─ logo192.png #1nez7vk
├─ logo512.png #1hwqvcc
├─ manifest.json #19gah8o
Expand All @@ -363,8 +363,8 @@ describe('when working with an app', () => {
│ ├─ 316.394ef80b.js #1mv4xg9
│ ├─ 316.394ef80b.js.LICENSE.txt #eplx8h
│ ├─ 316.394ef80b.js.map #b33pzn
│ ├─ main.6146e428.js #1d7hazv
│ ├─ main.6146e428.js.map #hkmqfm
│ ├─ main.abe6afa1.js #t9np46
│ ├─ main.abe6afa1.js.map #nchh6d
│ ├─ runtime-main.e92969dd.js #1is98ey
│ └─ runtime-main.e92969dd.js.map #19haxsp
└─ media
Expand Down Expand Up @@ -434,12 +434,12 @@ describe('when working with an app', () => {
'sample-app',
'static',
'js',
'main.6146e428.js',
'main.abe6afa1.js',
),
),
),
{
filepath: 'main.6146e428.js',
filepath: 'main.abe6afa1.js',
},
),
).toMatchSnapshot();
Expand Down
Loading