Browse Source

Switch to yarn package-manager

pull/3346/head
Igor Kulikov 6 years ago
parent
commit
5e80c176ae
  1. 51
      ui-ngx/angular.json
  2. 15337
      ui-ngx/package-lock.json
  3. 22
      ui-ngx/pom.xml
  4. 10111
      ui-ngx/yarn.lock

51
ui-ngx/angular.json

@ -25,13 +25,41 @@
"assets": [
"src/thingsboard.ico",
"src/assets",
{ "glob": "worker-html.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" },
{ "glob": "worker-css.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" },
{ "glob": "worker-json.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" },
{ "glob": "worker-javascript.js", "input": "./node_modules/ace-builds/src-min/", "output": "/" },
{ "glob": "marker-icon-2x.png", "input": "node_modules/leaflet/dist/images/", "output": "/" },
{ "glob": "marker-icon.png", "input": "node_modules/leaflet/dist/images/", "output": "/" },
{ "glob": "marker-shadow.png", "input": "node_modules/leaflet/dist/images/", "output": "/" }
{
"glob": "worker-html.js",
"input": "./node_modules/ace-builds/src-min/",
"output": "/"
},
{
"glob": "worker-css.js",
"input": "./node_modules/ace-builds/src-min/",
"output": "/"
},
{
"glob": "worker-json.js",
"input": "./node_modules/ace-builds/src-min/",
"output": "/"
},
{
"glob": "worker-javascript.js",
"input": "./node_modules/ace-builds/src-min/",
"output": "/"
},
{
"glob": "marker-icon-2x.png",
"input": "node_modules/leaflet/dist/images/",
"output": "/"
},
{
"glob": "marker-icon.png",
"input": "node_modules/leaflet/dist/images/",
"output": "/"
},
{
"glob": "marker-shadow.png",
"input": "node_modules/leaflet/dist/images/",
"output": "/"
}
],
"styles": [
"src/styles.scss",
@ -48,7 +76,7 @@
],
"stylePreprocessorOptions": {
"includePaths": [
"src/scss"
"src/scss"
]
},
"scripts": [
@ -216,5 +244,8 @@
}
}
},
"defaultProject": "thingsboard"
}
"defaultProject": "thingsboard",
"cli": {
"packageManager": "yarn"
}
}

15337
ui-ngx/package-lock.json

File diff suppressed because it is too large

22
ui-ngx/pom.xml

@ -54,17 +54,17 @@
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v12.16.1</nodeVersion>
<npmVersion>6.13.4</npmVersion>
<yarnVersion>v1.22.4</yarnVersion>
</configuration>
</execution>
<execution>
<id>npm install</id>
<id>yarn install</id>
<goals>
<goal>npm</goal>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>install</arguments>
@ -76,7 +76,7 @@
</build>
<profiles>
<profile>
<id>npm-build</id>
<id>yarn-build</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@ -92,9 +92,9 @@
</configuration>
<executions>
<execution>
<id>npm build</id>
<id>yarn build</id>
<goals>
<goal>npm</goal>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>run build:prod</arguments>
@ -106,10 +106,10 @@
</build>
</profile>
<profile>
<id>npm-start</id>
<id>yarn-start</id>
<activation>
<property>
<name>npm-start</name>
<name>yarn-start</name>
</property>
</activation>
<build>
@ -124,9 +124,9 @@
</configuration>
<executions>
<execution>
<id>npm start</id>
<id>yarn start</id>
<goals>
<goal>npm</goal>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>start</arguments>

10111
ui-ngx/yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save