From 163480bdad1efa04300f2615c3bddc294d422bbc Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Thu, 26 Dec 2019 16:26:35 +0100
Subject: [PATCH] [fix] Remove unused JS lib from the web artifact
---
doc/build_ios.md | 2 +-
doc/changelog/changelog_v1.4.14.md | 13 +++++++++
doc/development_guide.md | 2 +-
doc/fr/development_tutorial-01.md | 2 +-
gulpfile.js | 11 ++++---
package.json | 10 +++----
www/js/config.js | 2 +-
yarn.lock | 47 ++++++++++++++----------------
8 files changed, 51 insertions(+), 38 deletions(-)
create mode 100644 doc/changelog/changelog_v1.4.14.md
diff --git a/doc/build_ios.md b/doc/build_ios.md
index eb6ee0e68..1c8c56cc4 100644
--- a/doc/build_ios.md
+++ b/doc/build_ios.md
@@ -82,7 +82,7 @@ npm install -g nw-gyp node-pre-gyp
2. Install global dependencies (see [Development Guide](./development_guide.md) for versions to used) :
```
-npm install -g yarn gulp cordova ionic@1.7.16
+npm install -g yarn gulp cordova@9.0.0 ionic@1.7.16
```
3. Install project dependencies :
diff --git a/doc/changelog/changelog_v1.4.14.md b/doc/changelog/changelog_v1.4.14.md
new file mode 100644
index 000000000..5078d7d40
--- /dev/null
+++ b/doc/changelog/changelog_v1.4.14.md
@@ -0,0 +1,13 @@
+# Version v1.4.14
+
+## All platforms
+
+- [enh] Transfer form: display the amount's unit as a dropdown
+- [fix] I18n: better explanation for where Cesium+ profile are stored
+
+Build artifact
+
+- [enh] Migrate dependency management to Yarn, instead of Bower (deprecated)
+- [fix] Avoid error during `ionic state restore` : move `platforms/desktop` and `platforms/web` to `dist`
+- [fix] DEV: when `ionic serve` is running, avoid the web browser to be reloaded before end of compilation process
+
diff --git a/doc/development_guide.md b/doc/development_guide.md
index f72a39fa7..c4df1378a 100644
--- a/doc/development_guide.md
+++ b/doc/development_guide.md
@@ -25,7 +25,7 @@ If you are using fish shell, there is a [dedicated plugin](https://github.com/jo
- Installing node.js build tools:
```
- npm install -g yarn gulp@2.2.0 cordova@9.0.0 ionic@1.7.16
+ npm install -g yarn gulp cordova@9.0.0 ionic@1.7.16
```
## Get the source code and dependencies
diff --git a/doc/fr/development_tutorial-01.md b/doc/fr/development_tutorial-01.md
index 4f7b6b0a0..3b13012fc 100644
--- a/doc/fr/development_tutorial-01.md
+++ b/doc/fr/development_tutorial-01.md
@@ -127,7 +127,7 @@ cd cesium
Puis, lancez le téléchargement et l'installation des modules Cesium à l'aide de la commande :
```bash
-npm install -g yarn gulp cordova ionic@1.7.16
+npm install -g yarn cordova ionic@1.7.16
```
Puis pour les dépendances non globales :
diff --git a/gulpfile.js b/gulpfile.js
index 2371a3e5a..4e2bc8fd3 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -526,15 +526,18 @@ gulp.task('clean-unused-files:web', ['optimize-files:web'], function(done) {
gulp.task('clean-unused-directories:web', ['clean-unused-files:web'], function() {
var tmpPath = './dist/web/www';
- return del([
+ return del.sync([
tmpPath + '/css',
tmpPath + '/templates',
tmpPath + '/js',
tmpPath + '/dist',
tmpPath + '/lib/*',
- tmpPath + '!/lib/robotodraft',
+ '!' + tmpPath + '/lib/ionic',
+ '!' + tmpPath + '/lib/robotodraft',
+ tmpPath + '/lib/ionic/*',
+ '!' + tmpPath + '/lib/ionic/fonts',
tmpPath + '/lib/robotodraft/*',
- tmpPath + '!/lib/robotodraft/fonts'
+ '!' + tmpPath + '/lib/robotodraft/fonts'
]);
});
@@ -557,7 +560,7 @@ gulp.task('zip:web', ['clean-unused-directories:web'], function() {
gulp.task('build:web', ['zip:web'], function() {
var version = JSON.parse(fs.readFileSync('./package.json', 'utf8')).version;
- log(colors.green("Build for web created at: 'plateforms/web/build/cesium-v" + version + "-web.zip'"));
+ log(colors.green("Build for web created at: 'dist/web/build/cesium-v" + version + "-web.zip'"));
return del(['tmp']);
});
diff --git a/package.json b/package.json
index 717fc2600..1fb7abb05 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,6 @@
"@bower_components/angular-chart.js": "jtblin/angular-chart#1.1.1",
"@bower_components/angular-file-saver": "alferov/angular-file-saver#^1.1.3",
"@bower_components/angular-fullscreen": "E-IS/angular-fullscreen#1.0.2",
- "@bower_components/ng-idle": "HackedByChinese/ng-idle#^1.3.2",
"@bower_components/angular-image-crop": "andyshora/angular-image-crop#^2.0.0",
"@bower_components/angular-leaflet-directive": "E-IS/angular-leaflet-directive#0.10.1",
"@bower_components/angular-messages": "angular/bower-angular-messages#~1.5.11",
@@ -67,6 +66,7 @@
"@bower_components/leaflet.loading": "ebrelsford/Leaflet.loading#^0.1.24",
"@bower_components/leaflet.markercluster": "Leaflet/Leaflet.markercluster#0.5.0",
"@bower_components/moment": "moment/moment#^2.24.0",
+ "@bower_components/ng-idle": "HackedByChinese/ng-idle#^1.3.2",
"@bower_components/ngCordova": "driftyco/ng-cordova#0.1.27-alpha",
"@bower_components/numeral": "adamwdraper/Numeral-js#^1.5.6",
"@bower_components/qrcode.js": "davidshimjs/qrcodejs#*",
@@ -101,14 +101,14 @@
"phonegap-plugin-barcodescanner": "8.1.0"
},
"devDependencies": {
+ "@ionic/v1-toolkit": "2.0.18",
"bower": "^1.8.8",
"cordova-uglify": "^0.2.9",
- "del": "^2.2.0",
+ "del": "^3.0.0",
"delete-empty": "^0.1.3",
"event-stream": "3.3.4",
"glob": "^5.0.15",
"gulp": "^3.9.1",
- "gulp-wait": "^0.0.2",
"gulp-angular-templatecache": "^1.8.0",
"gulp-angular-translate": "^0.1.4",
"gulp-base64": "^0.1.3",
@@ -135,9 +135,9 @@
"gulp-sourcemaps": "^1.6.0",
"gulp-uglify": "^2.0.0",
"gulp-useref": "^3.1.0",
+ "gulp-wait": "^0.0.2",
"gulp-zip": "^3.2.0",
"ionic": "^1.7.16",
- "@ionic/v1-toolkit": "2.0.18",
"ionic-minify": "^2.0.10",
"jshint": "^2.9.2",
"mv": "^2.1.1",
@@ -210,4 +210,4 @@
"engines": {
"yarn": ">= 1.0.0"
}
-}
\ No newline at end of file
+}
diff --git a/www/js/config.js b/www/js/config.js
index 553b2d32b..f28b764d2 100644
--- a/www/js/config.js
+++ b/www/js/config.js
@@ -94,7 +94,7 @@ angular.module("cesium.config", [])
}
},
"version": "1.4.14",
- "build": "2019-12-24T20:10:18.736Z",
+ "build": "2019-12-26T15:22:34.695Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
diff --git a/yarn.lock b/yarn.lock
index ab9ed1304..26ac2e1b5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -50,12 +50,6 @@
version "1.0.1"
resolved "https://codeload.github.com/E-IS/angular-fullscreen/tar.gz/a2a84e034cbb94cf9cbac75684f9dfb78b33d9c5"
-"@bower_components/angular-idle@moribvndvs/ng-idle#^1.3.2":
- version "1.3.2"
- resolved "https://codeload.github.com/moribvndvs/ng-idle/tar.gz/7072c91d8c619a1817e7726a0fddaf0c8e525456"
- dependencies:
- angular "^1.2.0"
-
"@bower_components/angular-image-crop@andyshora/angular-image-crop#^2.0.0":
version "0.0.0"
resolved "https://codeload.github.com/andyshora/angular-image-crop/tar.gz/d8de6ea4f9ff5c3941399f28dc798aa8da884603"
@@ -618,11 +612,6 @@ ansi-red@^0.1.1:
dependencies:
ansi-wrap "0.1.0"
-ansi-regex@*, ansi-regex@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
- integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
-
ansi-regex@^0.2.0, ansi-regex@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
@@ -643,6 +632,11 @@ ansi-regex@^4.1.0:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+ansi-regex@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+ integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
ansi-styles@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
@@ -3305,17 +3299,16 @@ defined@^1.0.0, defined@~1.0.0:
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
-del@^2.2.0:
- version "2.2.2"
- resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
- integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
+del@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+ integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
dependencies:
- globby "^5.0.0"
+ globby "^6.1.0"
is-path-cwd "^1.0.0"
is-path-in-cwd "^1.0.0"
- object-assign "^4.0.1"
- pify "^2.0.0"
- pinkie-promise "^2.0.0"
+ p-map "^1.1.1"
+ pify "^3.0.0"
rimraf "^2.2.8"
delayed-stream@0.0.5:
@@ -5074,13 +5067,12 @@ globby@^1.0.0:
glob "^4.4.0"
object-assign "^2.0.0"
-globby@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
- integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
+globby@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+ integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
dependencies:
array-union "^1.0.1"
- arrify "^1.0.0"
glob "^7.0.3"
object-assign "^4.0.1"
pify "^2.0.0"
@@ -6226,7 +6218,7 @@ import-lazy@^2.1.0:
resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-imurmurhash@*, imurmurhash@^0.1.4:
+imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
@@ -9565,6 +9557,11 @@ p-locate@^2.0.0:
dependencies:
p-limit "^1.1.0"
+p-map@^1.1.1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+ integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+
p-try@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
--
GitLab