From 6a438655a981d835a5a5bbf267b0997926eb5c3d Mon Sep 17 00:00:00 2001 From: Russell Bicknell Date: Fri, 4 May 2018 14:49:22 -0700 Subject: [PATCH] [3.0-preview] Update webcomponentsjs to v2.0.0-0 . (#1103) * Update `package.json` and `package-lock.json`. * `webcomponents-lite.js` -> `webcomponents-bundle.js` * Use @webcomponents/webcomponentjs `^1.2.0 || ^2.0.0-0` to allow it to be deduped with Polymer v3.0.0-pre.12 . * Revert "Use @webcomponents/webcomponentjs `^1.2.0 || ^2.0.0-0` to allow it to be deduped with Polymer v3.0.0-pre.12 ." This reverts commit 820da729fb59dcc8fe0a3882ff403546a67b68d4. * Update Polymer to ^3.0.0-pre.13 which depends on webcomponentsjs ^2.0.0-0. * Update elements to ^3.0.0-pre.13, which now depend on @polymer/polymer ^3.0.0-pre.13. * Update webcomponentsjs to ^2.0.0-beta.2 . * Update element dependencies to ^3.0.0-pre.14 . * Update elements to ^3.0.0-pre.15 ; rebuild package-lock.json. --- package-lock.json | 14 +++++++++++--- package.json | 20 ++++++++++---------- test/my-view1.html | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index e73f3317..6d9b5911 100644 --- a/package-lock.json +++ b/package-lock.json @@ -226,9 +226,9 @@ "integrity": "sha512-NShZ8DRiPnsBFpbbhITL5KZd47cU0v8paRc3F5I/TkC7MX/UtUEvvmQN6ghffb4oNVTC3Aqt95vK2JFaFgDLtw==" }, "@webcomponents/webcomponentsjs": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-1.2.0.tgz", - "integrity": "sha512-P9JWydfpBR+CK12UwtBaoD/lYF3PR9XBArAWk5J9nfPaJwA3OUox4StZmyFSVDLsvpFq5HsEtxU/OdHAlAWPnw==" + "version": "2.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.0.0-beta.2.tgz", + "integrity": "sha512-qgt5dRWfMirJwtKiSjdP6I7UjWTMIP/SYBD/M55/KlSSABy7SMkZ4MPES0ict3ddpfAgZ99OLziWAD1klsxVFw==" }, "accessibility-developer-tools": { "version": "2.12.0", @@ -15687,6 +15687,14 @@ "sinon": "^1.17.1", "sinon-chai": "^2.10.0", "stacky": "^1.3.1" + }, + "dependencies": { + "@webcomponents/webcomponentsjs": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-1.2.0.tgz", + "integrity": "sha512-P9JWydfpBR+CK12UwtBaoD/lYF3PR9XBArAWk5J9nfPaJwA3OUox4StZmyFSVDLsvpFq5HsEtxU/OdHAlAWPnw==", + "dev": true + } } }, "wrappy": { diff --git a/package.json b/package.json index b3126c8c..c6289f39 100644 --- a/package.json +++ b/package.json @@ -13,16 +13,16 @@ "test:integration": "polymer build # test that psk builds without error with the CLI" }, "dependencies": { - "@polymer/app-layout": "^3.0.0-pre.12", - "@polymer/app-route": "^3.0.0-pre.12", - "@polymer/iron-flex-layout": "^3.0.0-pre.12", - "@polymer/iron-iconset-svg": "^3.0.0-pre.12", - "@polymer/iron-media-query": "^3.0.0-pre.12", - "@polymer/iron-pages": "^3.0.0-pre.12", - "@polymer/iron-selector": "^3.0.0-pre.12", - "@polymer/paper-icon-button": "^3.0.0-pre.12", - "@polymer/polymer": "^3.0.0-pre.12", - "@webcomponents/webcomponentsjs": "^1.2.0" + "@polymer/app-layout": "^3.0.0-pre.15", + "@polymer/app-route": "^3.0.0-pre.15", + "@polymer/iron-flex-layout": "^3.0.0-pre.15", + "@polymer/iron-iconset-svg": "^3.0.0-pre.15", + "@polymer/iron-media-query": "^3.0.0-pre.15", + "@polymer/iron-pages": "^3.0.0-pre.15", + "@polymer/iron-selector": "^3.0.0-pre.15", + "@polymer/paper-icon-button": "^3.0.0-pre.15", + "@polymer/polymer": "^3.0.0-pre.13", + "@webcomponents/webcomponentsjs": "^2.0.0-beta.2" }, "devDependencies": { "polymer-cli": "^1.7.0-pre.17", diff --git a/test/my-view1.html b/test/my-view1.html index 4d476c4f..6f4b890c 100644 --- a/test/my-view1.html +++ b/test/my-view1.html @@ -16,7 +16,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN my-view1 - +