Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Updates for Polymer 3 #1096

Merged
merged 24 commits into from
Apr 21, 2018
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5231e09
Remove `bower.json`; update `package.json`; use name specifiers.
bicknellr Apr 18, 2018
de5a683
Add `LICENSE`.
bicknellr Apr 18, 2018
4fce025
Fix stray path specifiers.
bicknellr Apr 18, 2018
ba09f0b
Update paths in test files.
bicknellr Apr 18, 2018
6e05d99
Update wct-browser-legacy
bicknellr Apr 18, 2018
034c12c
Add npm description & repository
abdonrd Apr 18, 2018
6cc6667
Update webcomponentsjs version
abdonrd Apr 18, 2018
fecc150
Add the Polymer CLI as devdepency
abdonrd Apr 18, 2018
e20dddb
Restore index.html relative paths
abdonrd Apr 18, 2018
8b6957a
Remove ESLint to simplify (also the actual deps are not updated)
abdonrd Apr 18, 2018
bc77f33
Update LICENSE as GitHub preview compatible
abdonrd Apr 18, 2018
dd23723
Merge PolymerElement & html import
abdonrd Apr 18, 2018
50cfeb9
Update licenses
abdonrd Apr 18, 2018
ed94a59
Sort imports
abdonrd Apr 18, 2018
766f791
Indent html content
abdonrd Apr 18, 2018
4178618
Add src to polymer.json sources
abdonrd Apr 18, 2018
e231817
Remove Polymer CLI from Travis
abdonrd Apr 18, 2018
eea9e41
Merge pull request #1097 from Polymer/polymer-3-more-updates
bicknellr Apr 18, 2018
689a3de
Remove LICENSE file: the correct license is referenced by comments at…
bicknellr Apr 18, 2018
cb6a684
Remove static `is` getters.
bicknellr Apr 19, 2018
2464a8c
Revert date changes in license comments.
bicknellr Apr 20, 2018
4837776
Update polymer-cli.
bicknellr Apr 20, 2018
974b67e
Revert `sources` change in `polymer.json`.
bicknellr Apr 21, 2018
44bccb4
Update `package-lock.json`.
bicknellr Apr 21, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Copyright (c) 2018 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
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
26 changes: 0 additions & 26 deletions bower.json

This file was deleted.

6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 8 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
{
"name": "polymer-starter-kit",
"author": "The Polymer Authors",
"license": "BSD-3-Clause",
"devDependencies": {
"eslint": "^3.19.0",
"eslint-config-google": "^0.7.0",
"eslint-plugin-html": "^2.0.0",
"wct-browser-legacy": "0.0.1-pre.11"
},
"version": "4.0.0-pre.1",
"scripts": {
"lint": "npm run lint:javascript && polymer lint",
"lint:javascript": "eslint . --ext js,html --ignore-path .gitignore",
"test": "polymer test",
"test:integration": "polymer build # test that psk builds without error with the CLI"
},
"version": "4.0.0-pre.1",
"resolutions": {
"inherits": "2.0.3",
"samsam": "1.1.3",
"supports-color": "3.1.2",
"type-detect": "1.0.0"
},
"author": "The Polymer Authors",
"dependencies": {
"@polymer/app-layout": "^3.0.0-pre.12",
"@polymer/app-route": "^3.0.0-pre.12",
Expand All @@ -32,5 +20,11 @@
"@polymer/paper-icon-button": "^3.0.0-pre.12",
"@polymer/polymer": "^3.0.0-pre.12",
"@webcomponents/webcomponentsjs": "^1.0.0"
},
"devDependencies": {
"eslint": "^3.19.0",
"eslint-config-google": "^0.7.0",
"eslint-plugin-html": "^2.0.0",
"wct-browser-legacy": "^0.0.1-pre.12"
}
}
7 changes: 6 additions & 1 deletion polymer.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,10 @@
}
],
"moduleResolution": "node",
"npm": true
"npm": true,
"lint": {
"rules": [
"polymer-3"
]
}
}
29 changes: 14 additions & 15 deletions src/my-app.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import { PolymerElement } from '../node_modules/@polymer/polymer/polymer-element.js';
import '../node_modules/@polymer/app-layout/app-drawer/app-drawer.js';
import '../node_modules/@polymer/app-layout/app-drawer-layout/app-drawer-layout.js';
import '../node_modules/@polymer/app-layout/app-header/app-header.js';
import '../node_modules/@polymer/app-layout/app-header-layout/app-header-layout.js';
import '../node_modules/@polymer/app-layout/app-scroll-effects/app-scroll-effects.js';
import '../node_modules/@polymer/app-layout/app-toolbar/app-toolbar.js';
import '../node_modules/@polymer/app-route/app-location.js';
import '../node_modules/@polymer/app-route/app-route.js';
import '../node_modules/@polymer/iron-pages/iron-pages.js';
import '../node_modules/@polymer/iron-selector/iron-selector.js';
import '../node_modules/@polymer/paper-icon-button/paper-icon-button.js';
import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import '@polymer/app-layout/app-drawer/app-drawer.js';
import '@polymer/app-layout/app-drawer-layout/app-drawer-layout.js';
import '@polymer/app-layout/app-header/app-header.js';
import '@polymer/app-layout/app-header-layout/app-header-layout.js';
import '@polymer/app-layout/app-scroll-effects/app-scroll-effects.js';
import '@polymer/app-layout/app-toolbar/app-toolbar.js';
import '@polymer/app-route/app-location.js';
import '@polymer/app-route/app-route.js';
import '@polymer/iron-pages/iron-pages.js';
import '@polymer/iron-selector/iron-selector.js';
import '@polymer/paper-icon-button/paper-icon-button.js';
import './my-icons.js';
import { setPassiveTouchGestures, setRootPath } from '../node_modules/@polymer/polymer/lib/utils/settings.js';
import { html } from '../node_modules/@polymer/polymer/lib/utils/html-tag.js';
//import { importHref } from '../node_modules/@polymer/polymer/lib/utils/import-href.js';
import { setPassiveTouchGestures, setRootPath } from '@polymer/polymer/lib/utils/settings.js';
import { html } from '@polymer/polymer/lib/utils/html-tag.js';
// Gesture events like tap and track generated from touch will not be
// preventable, allowing for better scrolling performance.
/**
Expand Down
2 changes: 1 addition & 1 deletion src/my-icons.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '../node_modules/@polymer/iron-iconset-svg/iron-iconset-svg.js';
import '@polymer/iron-iconset-svg/iron-iconset-svg.js';
const $_documentContainer = document.createElement('div');
$_documentContainer.setAttribute('style', 'display: none;');

Expand Down
4 changes: 2 additions & 2 deletions src/my-view1.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PolymerElement } from '../node_modules/@polymer/polymer/polymer-element.js';
import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import './shared-styles.js';
import { html } from '../node_modules/@polymer/polymer/lib/utils/html-tag.js';
import { html } from '@polymer/polymer/lib/utils/html-tag.js';
/**
@license
Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
Expand Down
4 changes: 2 additions & 2 deletions src/my-view2.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PolymerElement } from '../node_modules/@polymer/polymer/polymer-element.js';
import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import './shared-styles.js';
import { html } from '../node_modules/@polymer/polymer/lib/utils/html-tag.js';
import { html } from '@polymer/polymer/lib/utils/html-tag.js';
/**
@license
Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
Expand Down
4 changes: 2 additions & 2 deletions src/my-view3.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PolymerElement } from '../node_modules/@polymer/polymer/polymer-element.js';
import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import './shared-styles.js';
import { html } from '../node_modules/@polymer/polymer/lib/utils/html-tag.js';
import { html } from '@polymer/polymer/lib/utils/html-tag.js';
/**
@license
Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
Expand Down
4 changes: 2 additions & 2 deletions src/my-view404.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { PolymerElement } from '../node_modules/@polymer/polymer/polymer-element.js';
import { html } from '../node_modules/@polymer/polymer/lib/utils/html-tag.js';
import { PolymerElement } from '@polymer/polymer/polymer-element.js';
import { html } from '@polymer/polymer/lib/utils/html-tag.js';
/**
@license
Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion src/shared-styles.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '../node_modules/@polymer/polymer/polymer-element.js';
import '@polymer/polymer/polymer-element.js';
const $_documentContainer = document.createElement('div');
$_documentContainer.setAttribute('style', 'display: none;');

Expand Down
2 changes: 1 addition & 1 deletion test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<title>Tests</title>

<script src="../../wct-browser-legacy/browser.js"></script>
<script src="../node_modules/wct-browser-legacy/browser.js"></script>
</head>
<body>
<script>
Expand Down
7 changes: 3 additions & 4 deletions test/my-view1.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

<title>my-view1</title>

<script src="../../@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../wct-browser-legacy/browser.js"></script>
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="../node_modules/wct-browser-legacy/browser.js"></script>

<!-- Import the element to test -->
<script type="module" src="../src/my-view1.js"></script>
Expand All @@ -29,8 +29,7 @@
</template>
</test-fixture>

<script type="module">
import '../src/my-view1.js';
<script type="module">
suite('my-view1 tests', function() {
test('Number in circle should be 1', function() {
var myView = fixture('BasicView');
Expand Down