+2 -2

package.json

··· 52 52 "@ampproject/rollup-plugin-closure-compiler": "^0.26.0", 53 53 "@babel/core": "7.9.6", 54 54 "@babel/plugin-transform-modules-commonjs": "^7.9.6", 55 55 + "@babel/plugin-transform-template-literals": "^7.12.1", 55 56 "@rollup/plugin-buble": "^0.21.3", 56 57 "@rollup/plugin-commonjs": "^11.1.0", 57 58 "@rollup/plugin-node-resolve": "^7.1.3", ··· 64 65 "npm-run-all": "^4.1.5", 65 66 "prettier": "^2.0.5", 66 67 "rimraf": "^3.0.2", 67 67 - "rollup": "^2.10.2", 68 68 - "rollup-plugin-babel": "^4.4.0" 68 68 + "rollup": "^2.10.2" 69 69 }, 70 70 "prettier": { 71 71 "singleQuote": true

-8

rollup.config.js

··· 1 1 import commonjs from '@rollup/plugin-commonjs'; 2 2 import resolve from '@rollup/plugin-node-resolve'; 3 3 import buble from '@rollup/plugin-buble'; 4 4 - import babel from 'rollup-plugin-babel'; 5 4 import compiler from '@ampproject/rollup-plugin-closure-compiler'; 6 5 7 6 import simplifyJSTags from './scripts/simplify-jstags-plugin.js'; ··· 24 23 templateString: false, 25 24 }, 26 25 exclude: 'node_modules/**', 27 27 - }), 28 28 - babel({ 29 29 - babelrc: false, 30 30 - extensions: ['ts', 'tsx', 'js'], 31 31 - exclude: 'node_modules/**', 32 32 - presets: [], 33 33 - plugins: ['babel-plugin-closure-elimination'], 34 26 }), 35 27 ]; 36 28

+8 -1

scripts/simplify-jstags-plugin.js

··· 1 1 import { transformSync as transform } from '@babel/core'; 2 2 import { createFilter } from '@rollup/pluginutils'; 3 3 4 4 + import transformTemplateLiterals from '@babel/plugin-transform-template-literals'; 5 5 + import eliminateClosures from 'babel-plugin-closure-elimination'; 6 6 + 4 7 const simplifyJSTags = ({ types: t }) => ({ 5 8 visitor: { 6 9 TaggedTemplateExpression(path) { ··· 44 47 } 45 48 46 49 return transform(code, { 47 47 - plugins: [simplifyJSTags], 50 50 + plugins: [ 51 51 + simplifyJSTags, 52 52 + [transformTemplateLiterals, { loose: true }], 53 53 + eliminateClosures, 54 54 + ], 48 55 babelrc: false, 49 56 }); 50 57 },

+13 -21

yarn.lock

··· 85 85 dependencies: 86 86 "@babel/types" "^7.8.3" 87 87 88 88 - "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.8.3": 88 88 + "@babel/helper-module-imports@^7.8.3": 89 89 version "7.8.3" 90 90 resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498" 91 91 integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg== ··· 116 116 version "7.8.3" 117 117 resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670" 118 118 integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ== 119 119 + 120 120 + "@babel/helper-plugin-utils@^7.10.4": 121 121 + version "7.10.4" 122 122 + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" 123 123 + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== 119 124 120 125 "@babel/helper-replace-supers@^7.8.6": 121 126 version "7.9.6" ··· 249 254 "@babel/helper-plugin-utils" "^7.8.3" 250 255 "@babel/helper-simple-access" "^7.8.3" 251 256 babel-plugin-dynamic-import-node "^2.3.3" 257 257 + 258 258 + "@babel/plugin-transform-template-literals@^7.12.1": 259 259 + version "7.12.1" 260 260 + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843" 261 261 + integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw== 262 262 + dependencies: 263 263 + "@babel/helper-plugin-utils" "^7.10.4" 252 264 253 265 "@babel/template@^7.3.3", "@babel/template@^7.8.3", "@babel/template@^7.8.6": 254 266 version "7.8.6" ··· 1516 1528 version "2.0.1" 1517 1529 resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.1.tgz#f8e030fb21cefa183b44b7ad516b747434e7a3e0" 1518 1530 integrity sha512-tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg== 1519 1519 - 1520 1520 - estree-walker@^0.6.1: 1521 1521 - version "0.6.1" 1522 1522 - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" 1523 1523 - integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w== 1524 1531 1525 1532 estree-walker@^1.0.1: 1526 1533 version "1.0.1" ··· 3584 3591 integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== 3585 3592 dependencies: 3586 3593 glob "^7.1.3" 3587 3587 - 3588 3588 - rollup-plugin-babel@^4.4.0: 3589 3589 - version "4.4.0" 3590 3590 - resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz#d15bd259466a9d1accbdb2fe2fff17c52d030acb" 3591 3591 - integrity sha512-Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw== 3592 3592 - dependencies: 3593 3593 - "@babel/helper-module-imports" "^7.0.0" 3594 3594 - rollup-pluginutils "^2.8.1" 3595 3595 - 3596 3596 - rollup-pluginutils@^2.8.1: 3597 3597 - version "2.8.2" 3598 3598 - resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" 3599 3599 - integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== 3600 3600 - dependencies: 3601 3601 - estree-walker "^0.6.1" 3602 3594 3603 3595 rollup@^2.10.2: 3604 3596 version "2.10.2"