Move compatibility to own entrypoint again
This commit is contained in:
parent
2c1b25b00b
commit
3272c32f87
|
@ -20,13 +20,7 @@ module.exports.emptyPackages = ({ latestBuild }) =>
|
|||
// Loads stuff from a CDN
|
||||
require.resolve("@polymer/font-roboto/roboto.js"),
|
||||
require.resolve("@vaadin/vaadin-material-styles/font-roboto.js"),
|
||||
// Compatibility not needed for latest builds
|
||||
latestBuild &&
|
||||
// wrapped in require.resolve so it blows up if file no longer exists
|
||||
require.resolve(
|
||||
path.resolve(paths.polymer_dir, "src/resources/compatibility.ts")
|
||||
),
|
||||
// This polyfill is loaded in workers to support ES5, filter it out.
|
||||
// Polyfill only needed for ES5 workers so filter out in latestBuild
|
||||
latestBuild && require.resolve("proxy-polyfill/src/index.js"),
|
||||
].filter(Boolean);
|
||||
|
||||
|
@ -118,6 +112,7 @@ module.exports.config = {
|
|||
authorize: "./src/entrypoints/authorize.ts",
|
||||
onboarding: "./src/entrypoints/onboarding.ts",
|
||||
core: "./src/entrypoints/core.ts",
|
||||
compatibility: "./src/entrypoints/compatibility.ts",
|
||||
"custom-panel": "./src/entrypoints/custom-panel.ts",
|
||||
},
|
||||
outputPath: outputPath(paths.app_output_root, latestBuild),
|
||||
|
@ -132,6 +127,10 @@ module.exports.config = {
|
|||
return {
|
||||
entry: {
|
||||
main: path.resolve(paths.demo_dir, "src/entrypoint.ts"),
|
||||
compatibility: path.resolve(
|
||||
paths.polymer_dir,
|
||||
"src/entrypoints/compatibility.ts"
|
||||
),
|
||||
},
|
||||
outputPath: outputPath(paths.demo_output_root, latestBuild),
|
||||
publicPath: publicPath(latestBuild),
|
||||
|
|
|
@ -53,6 +53,7 @@ gulp.task("gen-pages-dev", (done) => {
|
|||
const content = renderTemplate(page, {
|
||||
latestPageJS: `/frontend_latest/${page}.js`,
|
||||
|
||||
es5Compatibility: "/frontend_es5/compatibility.js",
|
||||
es5PageJS: `/frontend_es5/${page}.js`,
|
||||
});
|
||||
|
||||
|
@ -78,6 +79,7 @@ gulp.task("gen-pages-prod", (done) => {
|
|||
const content = renderTemplate(page, {
|
||||
latestPageJS: latestManifest[`${page}.js`],
|
||||
|
||||
es5Compatibility: es5Manifest["compatibility.js"],
|
||||
es5PageJS: es5Manifest[`${page}.js`],
|
||||
});
|
||||
|
||||
|
@ -97,6 +99,7 @@ gulp.task("gen-index-app-dev", (done) => {
|
|||
latestCoreJS: "/frontend_latest/core.js",
|
||||
latestCustomPanelJS: "/frontend_latest/custom-panel.js",
|
||||
|
||||
es5Compatibility: "/frontend_es5/compatibility.js",
|
||||
es5AppJS: "/frontend_es5/app.js",
|
||||
es5CoreJS: "/frontend_es5/core.js",
|
||||
es5CustomPanelJS: "/frontend_es5/custom-panel.js",
|
||||
|
@ -120,6 +123,7 @@ gulp.task("gen-index-app-prod", (done) => {
|
|||
latestCoreJS: latestManifest["core.js"],
|
||||
latestCustomPanelJS: latestManifest["custom-panel.js"],
|
||||
|
||||
es5Compatibility: es5Manifest["compatibility.js"],
|
||||
es5AppJS: es5Manifest["app.js"],
|
||||
es5CoreJS: es5Manifest["core.js"],
|
||||
es5CustomPanelJS: es5Manifest["custom-panel.js"],
|
||||
|
@ -206,6 +210,7 @@ gulp.task("gen-index-demo-dev", (done) => {
|
|||
const content = renderDemoTemplate("index", {
|
||||
latestDemoJS: "/frontend_latest/main.js",
|
||||
|
||||
es5Compatibility: "/frontend_es5/compatibility.js",
|
||||
es5DemoJS: "/frontend_es5/main.js",
|
||||
});
|
||||
|
||||
|
@ -228,6 +233,7 @@ gulp.task("gen-index-demo-prod", (done) => {
|
|||
const content = renderDemoTemplate("index", {
|
||||
latestDemoJS: latestManifest["main.js"],
|
||||
|
||||
es5Compatibility: es5Manifest["compatibility.js"],
|
||||
es5DemoJS: es5Manifest["main.js"],
|
||||
});
|
||||
const minified = minifyHtml(content);
|
||||
|
|
|
@ -14,6 +14,32 @@ module.exports = function (userOptions = {}) {
|
|||
|
||||
return {
|
||||
name: "ignore",
|
||||
resolveId(importee, importer) {
|
||||
// Only use ignore to intercept imports that we don't control
|
||||
// inside node_module dependencies.
|
||||
if (
|
||||
importee.endsWith("commonjsHelpers.js") ||
|
||||
importee.endsWith("rollupPluginBabelHelpers.js") ||
|
||||
importee.endsWith("?commonjs-proxy") ||
|
||||
!importer ||
|
||||
!importer.includes("/node_modules/")
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
let fullPath;
|
||||
try {
|
||||
fullPath = importee.startsWith(".")
|
||||
? path.resolve(importee, importer)
|
||||
: require.resolve(importee);
|
||||
} catch (err) {
|
||||
console.error("Error in ignore plugin", { importee, importer }, err);
|
||||
throw err;
|
||||
}
|
||||
|
||||
return files.some((toIgnorePath) => fullPath.startsWith(toIgnorePath))
|
||||
? fullPath
|
||||
: null;
|
||||
},
|
||||
|
||||
load(id) {
|
||||
return files.some((toIgnorePath) => id.startsWith(toIgnorePath))
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import "../../src/resources/compatibility";
|
||||
import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
|
||||
import { navigate } from "../../src/common/navigate";
|
||||
import {
|
||||
|
|
|
@ -95,9 +95,12 @@
|
|||
_ls("/static/polyfills/custom-elements-es5-adapter.js");
|
||||
<% if (useRollup) { %>
|
||||
_ls("/static/js/s.min.js").onload = function() {
|
||||
System.import("<%= es5DemoJS %>");
|
||||
System.import("<%= es5Compatibility %>").then(function() {
|
||||
System.import("<%= es5DemoJS %>");
|
||||
});
|
||||
};
|
||||
<% } else { %>
|
||||
_ls("<%= es5Compatibility %>");
|
||||
_ls("<%= es5DemoJS %>");
|
||||
<% } %>
|
||||
}
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
// Compat needs to be first import
|
||||
import "../resources/compatibility";
|
||||
import "@polymer/polymer/lib/elements/dom-if";
|
||||
import "@polymer/polymer/lib/elements/dom-repeat";
|
||||
import "../auth/ha-authorize";
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
// Compat needs to be first import
|
||||
import "../resources/compatibility";
|
||||
import {
|
||||
Auth,
|
||||
Connection,
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import "../resources/compatibility";
|
||||
import { PolymerElement } from "@polymer/polymer";
|
||||
import { fireEvent } from "../common/dom/fire_event";
|
||||
import { loadJS } from "../common/dom/load_resource";
|
||||
|
@ -18,9 +17,12 @@ let es5Loaded: Promise<unknown> | undefined;
|
|||
|
||||
window.loadES5Adapter = () => {
|
||||
if (!es5Loaded) {
|
||||
es5Loaded = loadJS(
|
||||
`${__STATIC_PATH__}polyfills/custom-elements-es5-adapter.js`
|
||||
).catch(); // Swallow errors as it raises errors on old browsers.
|
||||
es5Loaded = Promise.all([
|
||||
loadJS(
|
||||
`${__STATIC_PATH__}polyfills/custom-elements-es5-adapter.js`
|
||||
).catch(),
|
||||
import(/* webpackChunkName: "compat" */ "./compatibility"),
|
||||
]);
|
||||
}
|
||||
return es5Loaded;
|
||||
};
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
// Compat needs to be first import
|
||||
import "../resources/compatibility";
|
||||
import "../onboarding/ha-onboarding";
|
||||
import "../resources/ha-style";
|
||||
import "../resources/roboto";
|
||||
|
|
|
@ -50,9 +50,12 @@
|
|||
_ls("/static/polyfills/custom-elements-es5-adapter.js");
|
||||
<% if (useRollup) { %>
|
||||
_ls("/static/js/s.min.js").onload = function() {
|
||||
System.import("<%= es5PageJS %>");
|
||||
System.import("<%= es5Compatibility %>").then(function() {
|
||||
System.import("<%= es5PageJS %>");
|
||||
});
|
||||
}
|
||||
<% } else { %>
|
||||
_ls("<%= es5Compatibility %>");
|
||||
_ls("<%= es5PageJS %>");
|
||||
<% } %>
|
||||
}
|
||||
|
|
|
@ -70,13 +70,14 @@
|
|||
|
||||
<% if (useRollup) { %>
|
||||
_ls("/static/js/s.min.js").onload = function() {
|
||||
// Although core and app can load in any order, we need to
|
||||
// force loading core first because it contains polyfills
|
||||
return System.import("<%= es5CoreJS %>").then(function() {
|
||||
System.import("<%= es5Compatibility %>").then(function() {
|
||||
return System.import("<%= es5CoreJS %>");
|
||||
}).then(function() {
|
||||
System.import("<%= es5AppJS %>");
|
||||
});
|
||||
}
|
||||
<% } else { %>
|
||||
_ls("<%= es5Compatibility %>");
|
||||
_ls("<%= es5CoreJS %>");
|
||||
_ls("<%= es5AppJS %>");
|
||||
<% } %>
|
||||
|
|
|
@ -52,9 +52,12 @@
|
|||
_ls("/static/polyfills/custom-elements-es5-adapter.js");
|
||||
<% if (useRollup) { %>
|
||||
_ls("/static/js/s.min.js").onload = function() {
|
||||
System.import("<%= es5PageJS %>");
|
||||
System.import("<%= es5Compatibility %>").then(function() {
|
||||
System.import("<%= es5PageJS %>");
|
||||
});
|
||||
}
|
||||
<% } else { %>
|
||||
_ls("<%= es5Compatibility %>");
|
||||
_ls("<%= es5PageJS %>");
|
||||
<% } %>
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue