Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2025-11-08 13:58:47 +00:00
Code Issues Releases Wiki Activity

material_3_demo: update web scaffold to latest (#1700)

Browse Source
This commit is contained in:
Kevin Moore
2023-03-14 20:24:47 -07:00
committed by GitHub
parent 2422c8907e
commit d430081b71
3 changed files with 42 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
experimental/material_3_demo/web/index.html
View File

@@ -31,74 +31,29 @@
<title>material_3_demo</title> <title>material_3_demo</title>
<link rel="manifest" href="manifest.json"> <link rel="manifest" href="manifest.json">
<script>
// The value below is injected by flutter build, do not touch.
var serviceWorkerVersion = null;
</script>
<!-- This script adds the flutter initialization JS code -->
<script src="flutter.js" defer></script>
</head> </head>
<body> <body>
<!-- This script installs service_worker.js to provide PWA functionality to
application. For more information, see:
https://developers.google.com/web/fundamentals/primers/service-workers -->
<script> <script>
var serviceWorkerVersion = null; window.addEventListener('load', function(ev) {
var scriptLoaded = false; // Download main.dart.js
function loadMainDartJs() { _flutter.loader.loadEntrypoint({
if (scriptLoaded) { serviceWorker: {
return; serviceWorkerVersion: serviceWorkerVersion,
} },
scriptLoaded = true; onEntrypointLoaded: function(engineInitializer) {
var scriptTag = document.createElement('script'); engineInitializer.initializeEngine().then(function(appRunner) {
scriptTag.src = 'main.dart.js'; appRunner.runApp();
scriptTag.type = 'application/javascript';
document.body.append(scriptTag);
}
if ('serviceWorker' in navigator) {
// Service workers are supported. Use them.
window.addEventListener('load', function () {
// Wait for registration to finish before dropping the <script> tag.
// Otherwise, the browser will load the script multiple times,
// potentially different versions.
var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
navigator.serviceWorker.register(serviceWorkerUrl)
.then((reg) => {
function waitForActivation(serviceWorker) {
serviceWorker.addEventListener('statechange', () => {
if (serviceWorker.state == 'activated') {
console.log('Installed new service worker.');
loadMainDartJs();
}
});
}
if (!reg.active && (reg.installing || reg.waiting)) {
// No active web worker and we have installed or are installing
// one for the first time. Simply wait for it to activate.
waitForActivation(reg.installing || reg.waiting);
} else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
// When the app updates the serviceWorkerVersion changes, so we
// need to ask the service worker to update.
console.log('New service worker available.');
reg.update();
waitForActivation(reg.installing);
} else {
// Existing service worker is still good.
console.log('Loading app from service worker.');
loadMainDartJs();
}
}); });
}
// If service worker doesn't succeed in a reasonable amount of time,
// fallback to plain <script> tag.
setTimeout(() => {
if (!scriptLoaded) {
console.warn(
'Failed to load app from service worker. Falling back to plain <script> tag.',
);
loadMainDartJs();
}
}, 4000);
}); });
} else { });
// Service workers not supported. Just drop the <script> tag.
loadMainDartJs();
}
</script> </script>
</body> </body>
</html> </html>

12
material_3_demo/.metadata
View File

@@ -4,7 +4,7 @@
# This file should be version controlled. # This file should be version controlled.
version: version:
revision: 610450523b20e59f42a908d6bc711a739e7d85e8 revision: a599c08c329cada6696abd10cfdf0e6a139b2a2b
channel: master channel: master
project_type: app project_type: app
@@ -13,11 +13,11 @@ project_type: app
migration: migration:
platforms: platforms:
- platform: root - platform: root
create_revision: 610450523b20e59f42a908d6bc711a739e7d85e8 create_revision: a599c08c329cada6696abd10cfdf0e6a139b2a2b
base_revision: 610450523b20e59f42a908d6bc711a739e7d85e8 base_revision: a599c08c329cada6696abd10cfdf0e6a139b2a2b
- platform: macos - platform: web
create_revision: 610450523b20e59f42a908d6bc711a739e7d85e8 create_revision: a599c08c329cada6696abd10cfdf0e6a139b2a2b
base_revision: 610450523b20e59f42a908d6bc711a739e7d85e8 base_revision: a599c08c329cada6696abd10cfdf0e6a139b2a2b
# User provided section # User provided section

81
material_3_demo/web/index.html
View File

@@ -31,74 +31,29 @@
<title>material_3_demo</title> <title>material_3_demo</title>
<link rel="manifest" href="manifest.json"> <link rel="manifest" href="manifest.json">
<script>
// The value below is injected by flutter build, do not touch.
var serviceWorkerVersion = null;
</script>
<!-- This script adds the flutter initialization JS code -->
<script src="flutter.js" defer></script>
</head> </head>
<body> <body>
<!-- This script installs service_worker.js to provide PWA functionality to
application. For more information, see:
https://developers.google.com/web/fundamentals/primers/service-workers -->
<script> <script>
var serviceWorkerVersion = null; window.addEventListener('load', function(ev) {
var scriptLoaded = false; // Download main.dart.js
function loadMainDartJs() { _flutter.loader.loadEntrypoint({
if (scriptLoaded) { serviceWorker: {
return; serviceWorkerVersion: serviceWorkerVersion,
} },
scriptLoaded = true; onEntrypointLoaded: function(engineInitializer) {
var scriptTag = document.createElement('script'); engineInitializer.initializeEngine().then(function(appRunner) {
scriptTag.src = 'main.dart.js'; appRunner.runApp();
scriptTag.type = 'application/javascript';
document.body.append(scriptTag);
}
if ('serviceWorker' in navigator) {
// Service workers are supported. Use them.
window.addEventListener('load', function () {
// Wait for registration to finish before dropping the <script> tag.
// Otherwise, the browser will load the script multiple times,
// potentially different versions.
var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
navigator.serviceWorker.register(serviceWorkerUrl)
.then((reg) => {
function waitForActivation(serviceWorker) {
serviceWorker.addEventListener('statechange', () => {
if (serviceWorker.state == 'activated') {
console.log('Installed new service worker.');
loadMainDartJs();
}
});
}
if (!reg.active && (reg.installing || reg.waiting)) {
// No active web worker and we have installed or are installing
// one for the first time. Simply wait for it to activate.
waitForActivation(reg.installing || reg.waiting);
} else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
// When the app updates the serviceWorkerVersion changes, so we
// need to ask the service worker to update.
console.log('New service worker available.');
reg.update();
waitForActivation(reg.installing);
} else {
// Existing service worker is still good.
console.log('Loading app from service worker.');
loadMainDartJs();
}
}); });
}
// If service worker doesn't succeed in a reasonable amount of time,
// fallback to plain <script> tag.
setTimeout(() => {
if (!scriptLoaded) {
console.warn(
'Failed to load app from service worker. Falling back to plain <script> tag.',
);
loadMainDartJs();
}
}, 4000);
}); });
} else { });
// Service workers not supported. Just drop the <script> tag.
loadMainDartJs();
}
</script> </script>
</body> </body>
</html> </html>