Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Yarn config updates to help manager client resolve node modules

Rich Turner664960da7ebe
diff --git a/client/build.gradle b/client/build.gradle
index 99e07c74a..26750f619 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -157,6 +157,8 @@ task gwtSuperDev(dependsOn: classes, type: JavaExec) {
jvmArgs("-Dgwt.persistentunitcachedir=$gwtCacheDir")
}
+gwtSuperDev.dependsOn tasks.getByPath(":yarnInstall")
+
installDist {
dependsOn resolveTask(":client:src:main:webapp:installDist")
into "${resolveProject(':deployment').projectDir}/manager/app/manager"
diff --git a/client/src/main/webapp/package.json b/client/src/main/webapp/package.json
index 5fcb13dfc..6e717cbfa 100644
--- a/client/src/main/webapp/package.json
+++ b/client/src/main/webapp/package.json
@@ -4,6 +4,7 @@
"homepage": "http://openremote.com/",
"author": "OpenRemote",
"description": "OR Manager",
+ "private": true,
"main": "index.html",
"license": "AGPL-3.0-or-later",
"ignore": [
@@ -26,5 +27,8 @@
"resolutions": {
"@polymer/polymer": "^2.6.1",
"@polymer/promise-polyfill": "^1.0.1-pre.3"
+ },
+ "workspaces": {
+ "nohoist": ["@polymer/**", "@webcomponents/**", "font-awesome", "moment", "intl", "chart.js"]
}
}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index ea56ab380..e5267170b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2982,10 +2982,10 @@ grid-index@^1.0.0:
resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7"
integrity sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==
[email protected], growl@^1.10.5:
- version "1.10.5"
- resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
- integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+ version "1.9.2"
+ resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
+ integrity sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=
handle-thing@^2.0.0:
version "2.0.0"
@@ -3655,6 +3655,14 @@ lit-element@^2.0.1:
dependencies:
lit-html "^1.0.0"
+
+lit-element@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.1.0.tgz#85bc3f1da0227f4b13de8a1be978229b9fa327e9"
+ integrity sha512-0z/KHm1xZweivfOVRr8AKR06+D3k02u15m9s4jkuRdnGe5wfmEwePzrQQBsSZNILdnfJvfo3TJOeGhBCVZaPbw==
+ dependencies:
+ lit-html "^1.0.0"
+
lit-html@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-0.12.0.tgz#d994420fda74744f9d4a79401b086de929643e6a"