Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: build config

Rich Turner43476978ec99
diff --git a/ui/demo/demo-or-map/babel.config.js b/ui/demo/demo-or-map/babel.config.js
index 72912d0a7..a12d41ed6 100644
--- a/ui/demo/demo-or-map/babel.config.js
+++ b/ui/demo/demo-or-map/babel.config.js
@@ -7,7 +7,7 @@ module.exports = api => {
"@babel/preset-env",
{
modules: false,
- exclude: ['transform-async-to-generator', 'transform-regenerator'],
+ exclude: ['transform-async-to-generator'],
targets: [
"last 2 versions",
"IE 11"
@@ -16,14 +16,21 @@ module.exports = api => {
]
],
plugins: [
- "@babel/plugin-transform-regenerator",
- "@babel/external-helpers",
+ [
+ "@babel/transform-runtime",
+ {
+ "corejs": false,
+ "helpers": true,
+ "regenerator": true,
+ "useESModules": false
+ }
+ ],
"@babel/syntax-dynamic-import",
"@babel/syntax-object-rest-spread",
[
- "@babel/plugin-transform-runtime",
+ 'module:fast-async',
{
- "regenerator": true
+ spec: true
}
]
]
diff --git a/ui/demo/demo-or-map/index.html b/ui/demo/demo-or-map/index.html
index 61fb6dcbd..d1afaa7b9 100644
--- a/ui/demo/demo-or-map/index.html
+++ b/ui/demo/demo-or-map/index.html
@@ -6,6 +6,16 @@
<title>Demo</title>
+ <!--
+ Feature detect Custom Elements support. If the browser DOES support Custom
+ Elements then we need to load the custom-elements-es5-adapter because
+ our project code has been transpiled from ES2015 to ES5 and native Custom
+ Elements expect elements will be registered as classes.
+ -->
+ <script>if (!window.customElements) { document.write('<!--'); }</script>
+ <script src="./modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
+ <!--! DO NOT REMOVE THIS COMMENT, WE NEED ITS CLOSING MARKER -->
+
<custom-style>
<style is="custom-style" include="demo-pages-shared-styles">
</style>
@@ -26,22 +36,6 @@
</demo-snippet>
</div>
-<!--
-Feature detect Custom Elements support. If the browser DOES support Custom
-Elements then we need to load the custom-elements-es5-adapter because
-our project code has been transpiled from ES2015 to ES5 and native Custom
-Elements expect elements will be registered as classes.
--->
-<div id="ce-es5-shim">
- <script type="text/javascript">
- if (!window.customElements) {
- var ceShimContainer = document.querySelector('#ce-es5-shim');
- ceShimContainer.parentElement.removeChild(ceShimContainer);
- }
- </script>
- <script type="text/javascript" src="modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
-</div>
-
<!--
Use the webcomponents-loader script which will feature detect which Web
Components features are missing and lazy load the appropriate polyfills.
diff --git a/ui/demo/demo-or-map/package.json b/ui/demo/demo-or-map/package.json
index 6f6e02d6f..6a1f1368f 100644
--- a/ui/demo/demo-or-map/package.json
+++ b/ui/demo/demo-or-map/package.json
@@ -16,15 +16,14 @@
},
"devDependencies": {
"@babel/core": "^7.2.2",
- "@babel/plugin-external-helpers": "^7.2.0",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-syntax-object-rest-spread": "^7.2.0",
"@babel/plugin-transform-regenerator": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"@babel/runtime": "^7.2.0",
- "@polymer/iron-demo-helpers": "^3.0.0-pre.19",
"babel-loader": "^8.0.4",
+ "@polymer/iron-demo-helpers": "^3.0.0-pre.19",
"copy-webpack-plugin": "^4.6.0",
"css-loader": "^2.0.0",
"file-loader": "^2.0.0",
diff --git a/ui/demo/demo-or-map/webpack.config.js b/ui/demo/demo-or-map/webpack.config.js
index 8704394e9..5cfeb79f5 100644
--- a/ui/demo/demo-or-map/webpack.config.js
+++ b/ui/demo/demo-or-map/webpack.config.js
@@ -1,6 +1,5 @@
var CopyWebpackPlugin = require("copy-webpack-plugin");
var HtmlWebpackPlugin = require("html-webpack-plugin");
-var path = require("path");
module.exports = {
mode: 'development',
@@ -25,7 +24,7 @@ module.exports = {
}),
new CopyWebpackPlugin([
{
- from: "../../node_modules/@webcomponents/webcomponentsjs",
+ from: require.resolve("@webcomponents/webcomponentsjs"),
to: "modules/@webcomponents/webcomponentsjs",
ignore: "!*.js"
}
@@ -44,7 +43,7 @@ module.exports = {
{
test: /\.js$/,
include: function(modulePath) {
- return /@webcomponents[\/|\\]shadycss|lit-html|@polymer/.test(modulePath) || !/node_modules/.test(modulePath);
+ return /(@webcomponents[\/|\\]shadycss|lit-css|styled-lit-element|lit-html|@polymer|@lit|pwa-helpers)/.test(modulePath) || !/node_modules/.test(modulePath);
},
use: [
{