Skip to content

Commit

Permalink
feat(es-dev-server): remove extra babel plugins
Browse files Browse the repository at this point in the history 
babel/babel#10811 was merged and released in
babel 7.8.0
  • Loading branch information
@bennypowers
bennypowers committed Mar 29, 2020
1 parent 93b7a90 commit a55f7e5
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 53 deletions.
6 changes: 0 additions & 6 deletions packages/es-dev-server/src/utils/babel-transform.js
View file
Expand Up @@ -28,12 +28,6 @@ export const defaultConfig = {
require.resolve('@babel/plugin-syntax-import-meta'),
require.resolve('@babel/plugin-syntax-class-properties'),
require.resolve('@babel/plugin-syntax-numeric-separator'),

/**
* This can be removed when https://github.com/babel/babel/pull/10811 is merged
*/
[require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'), { loose: true }],
[require.resolve('@babel/plugin-proposal-optional-chaining'), { loose: true }],
],
sourceType: 'module',
};
Expand Down
4 changes: 2 additions & 2 deletions packages/es-dev-server/test/middleware/compatibility-transform.test.js
View file
Expand Up @@ -67,13 +67,13 @@ async function expectCompatibilityTransform(userAgent, features = {}) {

expect(stage4NoModernBrowserImpl).to.include(
features.optionalChaining
? 'lorem == null ? void 0 : (_lorem$ipsum = lorem.ipsum) == null ? void 0 : _lorem$ipsum.foo'
? "(lorem === null || lorem === void 0 ? void 0 : lorem.ipsum) === 'lorem ipsum' && (lorem === null || lorem === void 0 ? void 0 : (_lorem$ipsum = lorem.ipsum) === null || _lorem$ipsum === void 0 ? void 0 : _lorem$ipsum.foo) === undefined;"
: 'lorem?.ipsum?.foo',
);

expect(stage4NoModernBrowserImpl).to.include(
features.nullishCoalescing
? "foo != null ? foo : 'nullish colaesced'"
? "(foo !== null && foo !== void 0 ? foo : 'nullish colaesced') === 'nullish colaesced'"
: "foo ?? 'nullish colaesced'",
);
}
Expand Down
8 changes: 4 additions & 4 deletions packages/es-dev-server/test/snapshots/polyfills-loader/inline-scripts-no-polyfills.html
View file
Expand Up @@ -28,7 +28,7 @@
class Foo {}

const bar = 'buz';
console.log((_ref = (_window = window) == null ? void 0 : (_window$foo = _window.foo) == null ? void 0 : _window$foo.bar) != null ? _ref : 'x');
console.log((_ref = (_window = window) === null || _window === void 0 ? void 0 : (_window$foo = _window.foo) === null || _window$foo === void 0 ? void 0 : _window$foo.bar) !== null && _ref !== void 0 ? _ref : 'x');

function asyncGenerator() {
return _asyncGenerator.apply(this, arguments);
Expand All @@ -43,7 +43,7 @@
});
return _asyncGenerator.apply(this, arguments);
}
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4Lmh0bWwiXSwibmFtZXMiOlsibWVzc2FnZSIsImNvbnNvbGUiLCJsb2ciLCJGb28iLCJiYXIiLCJ3aW5kb3ciLCJmb28iLCJhc3luY0dlbmVyYXRvciIsIlByb21pc2UiLCJyZXNvbHZlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDSSxNQUFNQSxPQUFPLEdBQUcsS0FBaEI7QUFDQUMsT0FBTyxDQUFDQyxHQUFSLDJCQUErQkYsT0FBL0I7O0FBRUEsTUFBTUcsR0FBTixDQUFVOztBQUlWLE1BQU1DLEdBQUcsR0FBRyxLQUFaO0FBRUFILE9BQU8sQ0FBQ0MsR0FBUixvQkFBWUcsTUFBWixvQ0FBWSxRQUFRQyxHQUFwQixxQkFBWSxZQUFhRixHQUF6QixtQkFBZ0MsR0FBaEM7O1NBRWdCRyxjOzs7Ozt3Q0FBaEIsYUFBaUM7QUFDL0IsK0JBQU1DLE9BQU8sQ0FBQ0MsT0FBUixFQUFOO0FBQ0EsVUFBTSxDQUFOO0FBQ0EsK0JBQU1ELE9BQU8sQ0FBQ0MsT0FBUixFQUFOO0FBQ0EsVUFBTSxDQUFOO0FBQ0QsRyIsInNvdXJjZXNDb250ZW50IjpbIlxuICAgIGNvbnN0IG1lc3NhZ2UgPSAnZm9vJztcbiAgICBjb25zb2xlLmxvZyhgVGhlIG1lc3NhZ2UgaXM6ICR7bWVzc2FnZX1gKTtcblxuICAgIGNsYXNzIEZvbyB7XG5cbiAgICB9XG5cbiAgICBjb25zdCBiYXIgPSAnYnV6JztcblxuICAgIGNvbnNvbGUubG9nKHdpbmRvdz8uZm9vPy5iYXIgPz8gJ3gnKTtcblxuICAgIGFzeW5jIGZ1bmN0aW9uKiBhc3luY0dlbmVyYXRvcigpIHtcbiAgICAgIGF3YWl0IFByb21pc2UucmVzb2x2ZSgpO1xuICAgICAgeWllbGQgMDtcbiAgICAgIGF3YWl0IFByb21pc2UucmVzb2x2ZSgpO1xuICAgICAgeWllbGQgMTtcbiAgICB9XG4gICJdfQ==</script>
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4Lmh0bWwiXSwibmFtZXMiOlsibWVzc2FnZSIsImNvbnNvbGUiLCJsb2ciLCJGb28iLCJiYXIiLCJ3aW5kb3ciLCJmb28iLCJhc3luY0dlbmVyYXRvciIsIlByb21pc2UiLCJyZXNvbHZlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDSSxNQUFNQSxPQUFPLEdBQUcsS0FBaEI7QUFDQUMsT0FBTyxDQUFDQyxHQUFSLDJCQUErQkYsT0FBL0I7O0FBRUEsTUFBTUcsR0FBTixDQUFVOztBQUlWLE1BQU1DLEdBQUcsR0FBRyxLQUFaO0FBRUFILE9BQU8sQ0FBQ0MsR0FBUixvQkFBWUcsTUFBWiwyREFBWSxRQUFRQyxHQUFwQixnREFBWSxZQUFhRixHQUF6Qix1Q0FBZ0MsR0FBaEM7O1NBRWdCRyxjOzs7Ozt3Q0FBaEIsYUFBaUM7QUFDL0IsK0JBQU1DLE9BQU8sQ0FBQ0MsT0FBUixFQUFOO0FBQ0EsVUFBTSxDQUFOO0FBQ0EsK0JBQU1ELE9BQU8sQ0FBQ0MsT0FBUixFQUFOO0FBQ0EsVUFBTSxDQUFOO0FBQ0QsRyIsInNvdXJjZXNDb250ZW50IjpbIlxuICAgIGNvbnN0IG1lc3NhZ2UgPSAnZm9vJztcbiAgICBjb25zb2xlLmxvZyhgVGhlIG1lc3NhZ2UgaXM6ICR7bWVzc2FnZX1gKTtcblxuICAgIGNsYXNzIEZvbyB7XG5cbiAgICB9XG5cbiAgICBjb25zdCBiYXIgPSAnYnV6JztcblxuICAgIGNvbnNvbGUubG9nKHdpbmRvdz8uZm9vPy5iYXIgPz8gJ3gnKTtcblxuICAgIGFzeW5jIGZ1bmN0aW9uKiBhc3luY0dlbmVyYXRvcigpIHtcbiAgICAgIGF3YWl0IFByb21pc2UucmVzb2x2ZSgpO1xuICAgICAgeWllbGQgMDtcbiAgICAgIGF3YWl0IFByb21pc2UucmVzb2x2ZSgpO1xuICAgICAgeWllbGQgMTtcbiAgICB9XG4gICJdfQ==</script>

<script type="module">var _ref, _window, _window$foo;

Expand All @@ -70,7 +70,7 @@
class Foo {}

const bar = 'buz';
console.log((_ref = (_window = window) == null ? void 0 : (_window$foo = _window.foo) == null ? void 0 : _window$foo.bar) != null ? _ref : 'x');
console.log((_ref = (_window = window) === null || _window === void 0 ? void 0 : (_window$foo = _window.foo) === null || _window$foo === void 0 ? void 0 : _window$foo.bar) !== null && _ref !== void 0 ? _ref : 'x');

function asyncGenerator() {
return _asyncGenerator.apply(this, arguments);
Expand All @@ -85,7 +85,7 @@
});
return _asyncGenerator.apply(this, arguments);
}
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4Lmh0bWwiXSwibmFtZXMiOlsibWVzc2FnZSIsImNvbnNvbGUiLCJsb2ciLCJGb28iLCJiYXIiLCJ3aW5kb3ciLCJmb28iLCJhc3luY0dlbmVyYXRvciIsIlByb21pc2UiLCJyZXNvbHZlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDSSxTQUFTQSxPQUFULFFBQXdCLFdBQXhCO0FBQ0EsT0FBTyx1QkFBUDtBQUVBQyxPQUFPLENBQUNDLEdBQVIsMkJBQStCRixPQUEvQjs7QUFFQSxNQUFNRyxHQUFOLENBQVU7O0FBSVYsTUFBTUMsR0FBRyxHQUFHLEtBQVo7QUFFQUgsT0FBTyxDQUFDQyxHQUFSLG9CQUFZRyxNQUFaLG9DQUFZLFFBQVFDLEdBQXBCLHFCQUFZLFlBQWFGLEdBQXpCLG1CQUFnQyxHQUFoQzs7U0FFZ0JHLGM7Ozs7O3dDQUFoQixhQUFpQztBQUMvQiwrQkFBTUMsT0FBTyxDQUFDQyxPQUFSLEVBQU47QUFDQSxVQUFNLENBQU47QUFDQSwrQkFBTUQsT0FBTyxDQUFDQyxPQUFSLEVBQU47QUFDQSxVQUFNLENBQU47QUFDRCxHIiwic291cmNlc0NvbnRlbnQiOlsiXG4gICAgaW1wb3J0IHsgbWVzc2FnZSB9IGZyb20gJ215LW1vZHVsZSc7XG4gICAgaW1wb3J0ICcuL3NyYy9sb2NhbC1tb2R1bGUuanMnO1xuXG4gICAgY29uc29sZS5sb2coYFRoZSBtZXNzYWdlIGlzOiAke21lc3NhZ2V9YCk7XG5cbiAgICBjbGFzcyBGb28ge1xuXG4gICAgfVxuXG4gICAgY29uc3QgYmFyID0gJ2J1eic7XG5cbiAgICBjb25zb2xlLmxvZyh3aW5kb3c/LmZvbz8uYmFyID8/ICd4Jyk7XG5cbiAgICBhc3luYyBmdW5jdGlvbiogYXN5bmNHZW5lcmF0b3IoKSB7XG4gICAgICBhd2FpdCBQcm9taXNlLnJlc29sdmUoKTtcbiAgICAgIHlpZWxkIDA7XG4gICAgICBhd2FpdCBQcm9taXNlLnJlc29sdmUoKTtcbiAgICAgIHlpZWxkIDE7XG4gICAgfVxuICAiXX0=</script>
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4Lmh0bWwiXSwibmFtZXMiOlsibWVzc2FnZSIsImNvbnNvbGUiLCJsb2ciLCJGb28iLCJiYXIiLCJ3aW5kb3ciLCJmb28iLCJhc3luY0dlbmVyYXRvciIsIlByb21pc2UiLCJyZXNvbHZlIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFDSSxTQUFTQSxPQUFULFFBQXdCLFdBQXhCO0FBQ0EsT0FBTyx1QkFBUDtBQUVBQyxPQUFPLENBQUNDLEdBQVIsMkJBQStCRixPQUEvQjs7QUFFQSxNQUFNRyxHQUFOLENBQVU7O0FBSVYsTUFBTUMsR0FBRyxHQUFHLEtBQVo7QUFFQUgsT0FBTyxDQUFDQyxHQUFSLG9CQUFZRyxNQUFaLDJEQUFZLFFBQVFDLEdBQXBCLGdEQUFZLFlBQWFGLEdBQXpCLHVDQUFnQyxHQUFoQzs7U0FFZ0JHLGM7Ozs7O3dDQUFoQixhQUFpQztBQUMvQiwrQkFBTUMsT0FBTyxDQUFDQyxPQUFSLEVBQU47QUFDQSxVQUFNLENBQU47QUFDQSwrQkFBTUQsT0FBTyxDQUFDQyxPQUFSLEVBQU47QUFDQSxVQUFNLENBQU47QUFDRCxHIiwic291cmNlc0NvbnRlbnQiOlsiXG4gICAgaW1wb3J0IHsgbWVzc2FnZSB9IGZyb20gJ215LW1vZHVsZSc7XG4gICAgaW1wb3J0ICcuL3NyYy9sb2NhbC1tb2R1bGUuanMnO1xuXG4gICAgY29uc29sZS5sb2coYFRoZSBtZXNzYWdlIGlzOiAke21lc3NhZ2V9YCk7XG5cbiAgICBjbGFzcyBGb28ge1xuXG4gICAgfVxuXG4gICAgY29uc3QgYmFyID0gJ2J1eic7XG5cbiAgICBjb25zb2xlLmxvZyh3aW5kb3c/LmZvbz8uYmFyID8/ICd4Jyk7XG5cbiAgICBhc3luYyBmdW5jdGlvbiogYXN5bmNHZW5lcmF0b3IoKSB7XG4gICAgICBhd2FpdCBQcm9taXNlLnJlc29sdmUoKTtcbiAgICAgIHlpZWxkIDA7XG4gICAgICBhd2FpdCBQcm9taXNlLnJlc29sdmUoKTtcbiAgICAgIHlpZWxkIDE7XG4gICAgfVxuICAiXX0=</script>

<script type="module" src="./app.js"></script>

Expand Down
101 changes: 60 additions & 41 deletions yarn.lock
View file
Expand Up @@ -81,7 +81,27 @@
semver "^5.4.1"
source-map "^0.5.0"

<<<<<<< HEAD
"@babel/core@^7.7.2", "@babel/core@^7.8.3":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e"
integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==
dependencies:
"@babel/code-frame" "^7.8.3"
"@babel/generator" "^7.8.4"
"@babel/helpers" "^7.8.4"
"@babel/parser" "^7.8.4"
"@babel/template" "^7.8.3"
"@babel/traverse" "^7.8.4"
"@babel/types" "^7.8.3"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.1"
json5 "^2.1.0"
lodash "^4.17.13"
resolve "^1.3.2"
semver "^5.4.1"
source-map "^0.5.0"

"@babel/generator@^7.4.0":
version "7.7.2"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.2.tgz#2f4852d04131a5e17ea4f6645488b5da66ebf3af"
Expand All @@ -103,30 +123,6 @@
source-map "^0.5.0"

"@babel/generator@^7.7.7":
=======
"@babel/core@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.3.tgz#30b0ebb4dd1585de6923a0b4d179e0b9f5d82941"
integrity sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA==
dependencies:
"@babel/code-frame" "^7.8.3"
"@babel/generator" "^7.8.3"
"@babel/helpers" "^7.8.3"
"@babel/parser" "^7.8.3"
"@babel/template" "^7.8.3"
"@babel/traverse" "^7.8.3"
"@babel/types" "^7.8.3"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.1"
json5 "^2.1.0"
lodash "^4.17.13"
resolve "^1.3.2"
semver "^5.4.1"
source-map "^0.5.0"

"@babel/generator@^7.4.0", "@babel/generator@^7.7.4", "@babel/generator@^7.7.7":
>>>>>>> chore: update babel version
version "7.7.7"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.7.7.tgz#859ac733c44c74148e1a72980a64ec84b85f4f45"
integrity sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==
Expand All @@ -146,6 +142,16 @@
lodash "^4.17.13"
source-map "^0.5.0"

"@babel/generator@^7.8.4":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz#35bbc74486956fe4251829f9f6c48330e8d0985e"
integrity sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==
dependencies:
"@babel/types" "^7.8.3"
jsesc "^2.5.1"
lodash "^4.17.13"
source-map "^0.5.0"

"@babel/helper-annotate-as-pure@^7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz#bb3faf1e74b74bd547e867e48f551fa6b098b6ce"
Expand Down Expand Up @@ -532,13 +538,13 @@
"@babel/traverse" "^7.7.4"
"@babel/types" "^7.7.4"

"@babel/helpers@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.3.tgz#382fbb0382ce7c4ce905945ab9641d688336ce85"
integrity sha512-LmU3q9Pah/XyZU89QvBgGt+BCsTPoQa+73RxAQh8fb8qkDyIfeQnmgs+hvzhTCKTzqOyk7JTkS3MS1S8Mq5yrQ==
"@babel/helpers@^7.8.4":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz#754eb3ee727c165e0a240d6c207de7c455f36f73"
integrity sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==
dependencies:
"@babel/template" "^7.8.3"
"@babel/traverse" "^7.8.3"
"@babel/traverse" "^7.8.4"
"@babel/types" "^7.8.3"

"@babel/highlight@^7.0.0":
Expand Down Expand Up @@ -574,17 +580,15 @@
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.7.tgz#1b886595419cf92d811316d5b715a53ff38b4937"
integrity sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==

<<<<<<< HEAD
"@babel/parser@^7.7.4":
version "7.7.5"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.7.5.tgz#cbf45321619ac12d83363fcf9c94bb67fa646d71"
integrity sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==
=======
"@babel/parser@^7.8.3":
version "7.8.3"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.3.tgz#790874091d2001c9be6ec426c2eed47bc7679081"
integrity sha512-/V72F4Yp/qmHaTALizEm9Gf2eQHV3QyTL3K0cNfijwnMnb1L+LDlAubb/ZnSdGAVzVSWakujHYs1I26x66sMeQ==
>>>>>>> chore: update babel version

"@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==

"@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.7.4":
version "7.7.4"
Expand Down Expand Up @@ -1762,6 +1766,21 @@
globals "^11.1.0"
lodash "^4.17.13"

"@babel/traverse@^7.8.4":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c"
integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==
dependencies:
"@babel/code-frame" "^7.8.3"
"@babel/generator" "^7.8.4"
"@babel/helper-function-name" "^7.8.3"
"@babel/helper-split-export-declaration" "^7.8.3"
"@babel/parser" "^7.8.4"
"@babel/types" "^7.8.3"
debug "^4.1.0"
globals "^11.1.0"
lodash "^4.17.13"

"@babel/types@7.5.5":
version "7.5.5"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz#97b9f728e182785909aa4ab56264f090a028d18a"
Expand Down Expand Up @@ -3074,16 +3093,16 @@
integrity sha512-BONpjHcGX2zFa9mfnwBCLEmlDsOHzT+j6Qt1yfK3MzFXFtAykfzFjAgaxPetu0YbBlCfXuMlfxI4vlRGCGMvFg==

"@open-wc/testing-karma-bs@file:./packages/testing-karma-bs":
version "1.3.30"
version "1.3.33"
dependencies:
"@open-wc/testing-karma" "^3.2.30"
"@open-wc/testing-karma" "^3.2.33"
"@types/node" "^11.13.0"
karma-browserstack-launcher "^1.0.0"

"@open-wc/testing-karma@file:./packages/testing-karma":
version "3.2.30"
version "3.2.33"
dependencies:
"@open-wc/karma-esm" "^2.12.6"
"@open-wc/karma-esm" "^2.13.0"
axe-core "^3.3.1"
karma "^4.1.0"
karma-chrome-launcher "^3.1.0"
Expand Down

0 comments on commit a55f7e5

Please sign in to comment.