Skip to content

Commit

Permalink
Merge pull request #5354 from Polymer/no-double-import
Browse files Browse the repository at this point in the history
Collapse imports for file into one statement
  • Loading branch information
rictic authored Sep 7, 2018
2 parents 448093b + 82e705f commit 5290b83
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions lib/mixins/element-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
*/
import '../utils/boot.js';

import { rootPath } from '../utils/settings.js';
import { rootPath, strictTemplatePolicy, allowTemplateFromDomModule } from '../utils/settings.js';
import { dedupingMixin } from '../utils/mixin.js';
import { stylesFromTemplate, stylesFromModuleImports } from '../utils/style-gather.js';
import { pathFromUrl, resolveCss, resolveUrl } from '../utils/resolve-url.js';
import { DomModule } from '../elements/dom-module.js';
import { PropertyEffects } from './property-effects.js';
import { PropertiesMixin } from './properties-mixin.js';
import { strictTemplatePolicy, allowTemplateFromDomModule } from '../utils/settings.js';

/**
* Current Polymer version in Semver notation.
Expand Down
5 changes: 3 additions & 2 deletions polymer-element.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
*/

import { ElementMixin } from './lib/mixins/element-mixin.js';
export { version } from './lib/mixins/element-mixin.js';
import { ElementMixin, version } from './lib/mixins/element-mixin.js';
export { html } from './lib/utils/html-tag.js';

export { version };

/**
* Base class that provides the core API for Polymer's meta-programming
* features including template stamping, data-binding, attribute deserialization,
Expand Down

0 comments on commit 5290b83

Please sign in to comment.