Merge pull request #242 from smalruby/update-chrome-origin-trials

feat: update Chrome Origin Trials token

Author: takaokouji

origin-trials.json

@@ -0,0 +1,16 @@
+{
+  "Serial": [
+    {
+      "origin": "smalruby.app",
+      "matchSubdomains": false,
+      "token": "Ag4uU2UqNmz2w+wQo7XPv6qzdHfjiLvzm//3JYQ8M7I+ro48rcE1BNq4uob+ayhLKF2VKjT6bsgToleYnAwWPwcAAABMeyJvcmlnaW4iOiJodHRwczovL3NtYWxydWJ5LmFwcDo0NDMiLCJmZWF0dXJlIjoiU2VyaWFsIiwiZXhwaXJ5IjoxNTk1MDMxMzQ3fQ==",
+      "expiry": "2020-07-18"
+    },
+    {
+      "origin": "smalruby.jp",
+      "matchSubdomains": true,
+      "token": "Ah/64l5f1XAfQJLzQwQPDxTe4V6zf3rVx8F8xmX+aEjOo+nmNJxmDygIzWvePkLHGzUefEyqFnFgZDckvn6LnQ0AAABeeyJvcmlnaW4iOiJodHRwczovL3NtYWxydWJ5LmpwOjQ0MyIsImZlYXR1cmUiOiJTZXJpYWwiLCJleHBpcnkiOjE1OTUwMzEyODUsImlzU3ViZG9tYWluIjp0cnVlfQ==",
+      "expiry": "2020-07-18"
+    }
+  ]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smalruby3-gui",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "GraphicaL User Interface for creating and running Smalruby 3.0 projects",
   "main": "./dist/smalruby3-gui.js",
   "scripts": {

src/playground/index.ejs

@@ -4,10 +4,25 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="google" value="notranslate">
-    <!-- https://.*smalruby.jp/ -->
-    <meta http-equiv="origin-trial" content="AiLqvoNHKjujJ7wzrguiMyoRK9czxpxcOC39/sQAsoa+g0HomeeA5lhDHAnaXIBOY2huQnm0sYdH3I9GtTnRFAcAAABeeyJvcmlnaW4iOiJodHRwczovL3NtYWxydWJ5LmpwOjQ0MyIsImZlYXR1cmUiOiJTZXJpYWwiLCJleHBpcnkiOjE1OTE4MDg3NDQsImlzU3ViZG9tYWluIjp0cnVlfQ==">
-    <!-- https://smalruby.app/ -->
-    <meta http-equiv="origin-trial" content="ApPFZ7Y7tWtarih9JqeOUfGqbTka9l9KnJPLxUmuLSHJ44Y2FbZ2IXeZgV0KLFMRtBUqdgUWtSNV3jAMaFnZ0wIAAABMeyJvcmlnaW4iOiJodHRwczovL3NtYWxydWJ5LmFwcDo0NDMiLCJmZWF0dXJlIjoiU2VyaWFsIiwiZXhwaXJ5IjoxNTkxODA4ODIxfQ==">
+    <%
+        const originTrials = htmlWebpackPlugin.options.originTrials;
+        if (originTrials) {
+    %>
+    <!-- Chrome Origin Trials: https://developers.chrome.com/origintrials -->
+    <%
+            Object.keys(originTrials).forEach(apiName => {
+    %>
+    <!-- <%= apiName %> API -->
+    <%
+                for (const info of originTrials[apiName]) {
+    %>
+    <!-- https://<%= info['matchSubdomains'] ? '.*' : '' %><%= info['origin'] %> -->
+    <meta http-equiv="origin-trial" content="<%= info['token'] %>">
+    <%
+                }
+            });
+        }
+    %>
     <link rel="shortcut icon" href="static/title.ico">
     <title><%= htmlWebpackPlugin.options.title %></title>
     <% if (htmlWebpackPlugin.options.sentryConfig) { %>

webpack.config.js

@@ -1,6 +1,7 @@
 const defaultsDeep = require('lodash.defaultsdeep');
 var path = require('path');
 var webpack = require('webpack');
+var fs = require('fs');
 
 // Plugins
 var CopyWebpackPlugin = require('copy-webpack-plugin');
@@ -144,32 +145,37 @@ module.exports = [
                 chunks: ['lib.min', 'gui'],
                 template: 'src/playground/index.ejs',
                 title: 'Smalruby',
-                sentryConfig: process.env.SENTRY_CONFIG ? '"' + process.env.SENTRY_CONFIG + '"' : null
+                sentryConfig: process.env.SENTRY_CONFIG ? '"' + process.env.SENTRY_CONFIG + '"' : null,
+                originTrials: JSON.parse(fs.readFileSync('origin-trials.json'))
             }),
             new HtmlWebpackPlugin({
                 chunks: ['lib.min', 'gui'],
                 template: 'src/playground/index.ejs',
                 filename: 'ja.html',
                 title: 'スモウルビー',
-                sentryConfig: process.env.SENTRY_CONFIG ? '"' + process.env.SENTRY_CONFIG + '"' : null
+                sentryConfig: process.env.SENTRY_CONFIG ? '"' + process.env.SENTRY_CONFIG + '"' : null,
+                originTrials: JSON.parse(fs.readFileSync('origin-trials.json'))
             }),
             new HtmlWebpackPlugin({
                 chunks: ['lib.min', 'blocksonly'],
                 template: 'src/playground/index.ejs',
                 filename: 'blocks-only.html',
-                title: 'Smalruby 3.0 GUI: Blocks Only Example'
+                title: 'Smalruby 3.0 GUI: Blocks Only Example',
+                originTrials: JSON.parse(fs.readFileSync('origin-trials.json'))
             }),
             new HtmlWebpackPlugin({
                 chunks: ['lib.min', 'compatibilitytesting'],
                 template: 'src/playground/index.ejs',
                 filename: 'compatibility-testing.html',
-                title: 'Smalruby 3.0 GUI: Compatibility Testing'
+                title: 'Smalruby 3.0 GUI: Compatibility Testing',
+                originTrials: JSON.parse(fs.readFileSync('origin-trials.json'))
             }),
             new HtmlWebpackPlugin({
                 chunks: ['lib.min', 'player'],
                 template: 'src/playground/index.ejs',
                 filename: 'player.html',
-                title: 'Smalruby 3.0 GUI: Player Example'
+                title: 'Smalruby 3.0 GUI: Player Example',
+                originTrials: JSON.parse(fs.readFileSync('origin-trials.json'))
             }),
             new CopyWebpackPlugin([{
                 from: 'static',