Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[building] support optional chaining and nullish coalescing #1094

Merged
merged 3 commits into from Dec 8, 2019
Merged

[building] support optional chaining and nullish coalescing #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b187eec
feat(building-rollup): support optional chaining and nullish coalescing
LarsDenBakker Dec 8, 2019
cbeacb4
feat(building-webpack): support optional chaining and nullish coalescing
LarsDenBakker Dec 8, 2019
17ac477
chore: update linting dependencies
LarsDenBakker Dec 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Expand Up @@ -43,22 +43,22 @@
"@open-wc/testing-karma-bs": "file:./packages/testing-karma-bs",
"@types/chai-fs": "^2.0.2",
"@vuepress/plugin-google-analytics": "^1.0.0-alpha.30",
"babel-eslint": "^10.0.0",
"babel-eslint": "^10.0.3",
"core-js": "2.6.10",
"eslint": "^6.1.0",
"eslint": "^6.7.2",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-plugin-html": "^6.0.0",
"eslint-plugin-import": "^2.18.0",
"eslint-plugin-no-only-tests": "^2.3.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-no-only-tests": "^2.4.0",
"eslint-plugin-wc": "^1.2.0",
"husky": "3.0.0",
"lerna": "3.4.3",
"lint-staged": "^9.2.0",
"npm-run-all": "4.1.3",
"prettier": "^1.18.2",
"prettier": "^1.19.1",
"prettier-plugin-package": "^0.3.1",
"rimraf": "^3.0.0",
"typescript-temporary-fork-for-jsdoc": "^3.6.0-insiders.20190802",
"typescript": "^3.7.3",
"vuepress": "^1.0.0-alpha.30",
"webpack-merge": "^4.1.5"
},
Expand Down
4 changes: 4 additions & 0 deletions packages/building-rollup/demo/js/demo-app.js
View file
Open in desktop
Expand Up @@ -34,7 +34,11 @@ class DemoApp extends LitElement {
customElements.define('demo-app', DemoApp);

const cssText = DemoApp.styles.cssText.replace(/\s/g, '');
const foo = { bar: 'lorem ipsum' };
const loremIpsum = undefined;

window.__optionalChaining = foo?.bar === 'lorem ipsum' && foo?.bar?.loremIpsum === undefined;
window.__nullishCoalescing = (loremIpsum ?? 'lorem ipsum') === 'lorem ipsum';
window.__partialCSS = cssText.includes('font-size:16px') && cssText.includes('display:block');
window.__litElement = (async () => {
await import('./lazy-component.js');
Expand Down
2 changes: 2 additions & 0 deletions packages/building-rollup/demo/js/index.html
View file
Open in desktop
Expand Up @@ -31,6 +31,8 @@ <h1>Static content in index.html is preserved</h1>
importMeta2: window.__importMeta2 || false,
asyncFunction: await window.__asyncFunction || false,
forOf: window.__forOf || false,
optionalChaining: window.__optionalChaining || false,
nullishCoalescing: window.__nullishCoalescing || false,
};
document.getElementById('test').innerHTML = `<pre>${JSON.stringify(window.__tests, null, 2)}</pre>`;
})();
Expand Down
4 changes: 4 additions & 0 deletions packages/building-rollup/demo/ts-babel/demo-app.ts
View file
Open in desktop
Expand Up @@ -31,7 +31,11 @@ class DemoApp extends LitElement {
}

const cssText = DemoApp.styles.cssText.replace(/\s/g, '');
const foo = { bar: 'lorem ipsum' };
const loremIpsum = undefined;

window.__optionalChaining = foo?.bar === 'lorem ipsum' && foo?.bar?.loremIpsum === undefined;
window.__nullishCoalescing = (loremIpsum ?? 'lorem ipsum') === 'lorem ipsum';
window.__partialCSS = cssText.includes('font-size:16px') && cssText.includes('display:block');
window.__litElement = (async () => {
await import('./lazy-component.ts');
Expand Down
2 changes: 2 additions & 0 deletions packages/building-rollup/demo/ts-babel/index.html
View file
Open in desktop
Expand Up @@ -31,6 +31,8 @@ <h1>Static content in index.html is preserved</h1>
importMeta2: window.__importMeta2 || false,
asyncFunction: await window.__asyncFunction || false,
forOf: window.__forOf || false,
optionalChaining: window.__optionalChaining || false,
nullishCoalescing: window.__nullishCoalescing || false,
};
document.getElementById('test').innerHTML = `<pre>${JSON.stringify(window.__tests, null, 2)}</pre>`;
})();
Expand Down
8 changes: 8 additions & 0 deletions packages/building-rollup/modern-and-legacy-config.js
View file
Open in desktop
Expand Up @@ -77,6 +77,14 @@ function createConfig(_options, legacy) {
plugins: [
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
/**
* This can be removed when https://github.com/babel/babel/pull/10811 is released
*/
[
require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
{ loose: true },
],
[require.resolve('@babel/plugin-proposal-optional-chaining'), { loose: true }],
// rollup rewrites import.meta.url, but makes them point to the file location after bundling
// we want the location before bundling
['bundled-import-meta', { importStyle: 'baseURI' }],
Expand Down
8 changes: 8 additions & 0 deletions packages/building-rollup/modern-config.js
View file
Open in desktop
Expand Up @@ -67,6 +67,14 @@ module.exports = function createBasicConfig(_options) {
plugins: [
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
/**
* This can be removed when https://github.com/babel/babel/pull/10811 is released
*/
[
require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
{ loose: true },
],
[require.resolve('@babel/plugin-proposal-optional-chaining'), { loose: true }],
// rollup rewrites import.meta.url, but makes them point to the file location after bundling
// we want the location before bundling
'bundled-import-meta',
Expand Down
2 changes: 2 additions & 0 deletions packages/building-rollup/package.json
View file
Open in desktop
Expand Up @@ -40,6 +40,8 @@
],
"dependencies": {
"@babel/core": "^7.7.2",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4",
"@babel/plugin-proposal-optional-chaining": "^7.7.5",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/preset-env": "^7.7.1",
Expand Down
2 changes: 2 additions & 0 deletions packages/building-rollup/test/integration.test.js
View file
Open in desktop
Expand Up @@ -78,6 +78,8 @@ describe('integration tests', () => {
importMeta2: true,
asyncFunction: true,
forOf: true,
optionalChaining: true,
nullishCoalescing: true,
});
});

Expand Down
4 changes: 4 additions & 0 deletions packages/building-webpack/demo/js/demo-app.js
View file
Open in desktop
Expand Up @@ -34,7 +34,11 @@ class DemoApp extends LitElement {
customElements.define('demo-app', DemoApp);

const cssText = DemoApp.styles.cssText.replace(/\s/g, '');
const foo = { bar: 'lorem ipsum' };
const loremIpsum = undefined;

window.__optionalChaining = foo?.bar === 'lorem ipsum' && foo?.bar?.loremIpsum === undefined;
window.__nullishCoalescing = (loremIpsum ?? 'lorem ipsum') === 'lorem ipsum';
window.__partialCSS = cssText.includes('font-size:16px') && cssText.includes('display:block');
window.__litElement = (async () => {
await import('./lazy-component.js');
Expand Down
2 changes: 2 additions & 0 deletions packages/building-webpack/demo/js/index.js
View file
Open in desktop
Expand Up @@ -11,6 +11,8 @@ import './syntax.js';
importMeta2: window.__importMeta2 || false,
asyncFunction: (await window.__asyncFunction) || false,
forOf: window.__forOf || false,
optionalChaining: window.__optionalChaining || false,
nullishCoalescing: window.__nullishCoalescing || false,
};
document.getElementById('test').innerHTML = `<pre>${JSON.stringify(
window.__tests,
Expand Down
4 changes: 4 additions & 0 deletions packages/building-webpack/demo/ts-babel/demo-app.ts
View file
Open in desktop
Expand Up @@ -31,7 +31,11 @@ class DemoApp extends LitElement {
}

const cssText = DemoApp.styles.cssText.replace(/\s/g, '');
const foo = { bar: 'lorem ipsum' };
const loremIpsum = undefined;

window.__optionalChaining = foo?.bar === 'lorem ipsum' && foo?.bar?.loremIpsum === undefined;
window.__nullishCoalescing = (loremIpsum ?? 'lorem ipsum') === 'lorem ipsum';
window.__partialCSS = cssText.includes('font-size:16px') && cssText.includes('display:block');
window.__litElement = (async () => {
await import('./lazy-component.ts');
Expand Down
2 changes: 2 additions & 0 deletions packages/building-webpack/demo/ts-babel/index.ts
View file
Open in desktop
Expand Up @@ -11,6 +11,8 @@ import './syntax.ts';
importMeta2: window.__importMeta2 || false,
asyncFunction: (await window.__asyncFunction) || false,
forOf: window.__forOf || false,
optionalChaining: window.__optionalChaining || false,
nullishCoalescing: window.__nullishCoalescing || false,
};
document.getElementById('test').innerHTML = `<pre>${JSON.stringify(
window.__tests,
Expand Down
8 changes: 8 additions & 0 deletions packages/building-webpack/modern-and-legacy-config.js
View file
Open in desktop
Expand Up @@ -78,6 +78,14 @@ function createConfig(options, legacy) {
plugins: [
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
/**
* This can be removed when https://github.com/babel/babel/pull/10811 is released
*/
[
require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
{ loose: true },
],
[require.resolve('@babel/plugin-proposal-optional-chaining'), { loose: true }],
production && [
'template-html-minifier',
{
Expand Down
8 changes: 8 additions & 0 deletions packages/building-webpack/modern-config.js
View file
Open in desktop
Expand Up @@ -78,6 +78,14 @@ module.exports = userOptions => {
plugins: [
'@babel/plugin-syntax-dynamic-import',
'@babel/plugin-syntax-import-meta',
/**
* This can be removed when https://github.com/babel/babel/pull/10811 is released
*/
[
require.resolve('@babel/plugin-proposal-nullish-coalescing-operator'),
{ loose: true },
],
[require.resolve('@babel/plugin-proposal-optional-chaining'), { loose: true }],
production && [
'template-html-minifier',
{
Expand Down
3 changes: 2 additions & 1 deletion packages/building-webpack/package.json
View file
Open in desktop
Expand Up @@ -41,6 +41,8 @@
],
"dependencies": {
"@babel/core": "^7.7.2",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4",
"@babel/plugin-proposal-optional-chaining": "^7.7.5",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-syntax-import-meta": "^7.2.0",
"@babel/preset-env": "^7.7.1",
Expand All @@ -67,7 +69,6 @@
"puppeteer": "^2.0.0",
"rimraf": "^3.0.0",
"ts-loader": "^5.3.3",
"typescript": "^3.3.3333",
"webpack": "^4.28.0",
"webpack-bundle-analyzer": "^3.0.3",
"webpack-cli": "^3.3.9",
Expand Down
2 changes: 2 additions & 0 deletions packages/building-webpack/test/integration.test.js
View file
Open in desktop
Expand Up @@ -92,6 +92,8 @@ describe('integration tests', () => {
importMeta2: true,
asyncFunction: true,
forOf: true,
optionalChaining: true,
nullishCoalescing: true,
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/create/package.json
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@
"babel-plugin-transform-dynamic-import": "^2.1.0",
"chai": "^4.2.0",
"chai-fs": "^2.0.0",
"eslint": "^6.1.0",
"eslint": "^6.7.2",
"mocha": "^6.2.2",
"onchange": "^5.2.0",
"rimraf": "^3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/es-dev-server/package.json
View file
Open in desktop
Expand Up @@ -91,8 +91,8 @@
"@babel/cli": "^7.7.0",
"@babel/plugin-proposal-class-properties": "^7.7.0",
"@babel/plugin-proposal-decorators": "^7.7.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
"@babel/plugin-proposal-optional-chaining": "^7.6.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.7.4",
"@babel/plugin-proposal-optional-chaining": "^7.7.5",
"@babel/plugin-proposal-private-methods": "^7.6.0",
"@babel/plugin-transform-modules-systemjs": "^7.7.0",
"@babel/preset-typescript": "^7.7.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/eslint-config/package.json
View file
Open in desktop
Expand Up @@ -23,13 +23,13 @@
"config"
],
"dependencies": {
"babel-eslint": "^10.0.0",
"eslint": "^6.1.0",
"babel-eslint": "^10.0.3",
"eslint": "^6.7.2",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-plugin-html": "^6.0.0",
"eslint-plugin-import": "^2.18.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-lit": "^1.2.0",
"eslint-plugin-no-only-tests": "^2.3.1",
"eslint-plugin-no-only-tests": "^2.4.0",
"eslint-plugin-wc": "^1.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/lit-helpers/src/live.js
View file
Open in desktop
@@ -1,4 +1,4 @@
/* eslint-disable no-param-reassign, no-restricted-syntax, guard-for-in */
/* eslint-disable no-param-reassign, no-restricted-syntax, guard-for-in, no-console */
import { directive, PropertyPart, AttributePart } from 'lit-html';

export const live = directive((/** @type {unknown} */ value) => (
Expand Down
2 changes: 1 addition & 1 deletion packages/prettier-config/package.json
View file
Open in desktop
Expand Up @@ -25,6 +25,6 @@
],
"dependencies": {
"eslint-config-prettier": "^3.3.0",
"prettier": "^1.18.2"
"prettier": "^1.19.1"
}
}