From: Nicolas Coden Date: Mon, 21 Jan 2019 23:35:25 +0000 (+0100) Subject: chore: ensure to keep dep resolutions when relocking deps X-Git-Tag: v6.6.0~3^2~39^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aff8bd759;p=thirdparty%2Ffoundation%2Ffoundation-sites.git chore: ensure to keep dep resolutions when relocking deps --- diff --git a/package-lock.json b/package-lock.json index 002a8dda2..6acf941c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9991,6 +9991,12 @@ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, + "json-format": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-format/-/json-format-1.0.1.tgz", + "integrity": "sha1-FD9n5irxKda//tKIpGJl6iPQ3ww=", + "dev": true + }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -11620,8 +11626,7 @@ "dev": true, "requires": { "args": "^5.0.0", - "mkdirp": "^0.5.1", - "puppeteer": "1.5.0" + "mkdirp": "^0.5.1" }, "dependencies": { "debug": { @@ -11632,6 +11637,9 @@ "ms": "^2.1.1" } }, + "puppeteer": { + "version": "^1.11.0" + }, "ws": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", @@ -12195,6 +12203,16 @@ "once": "^1.3.2" } }, + "npm-force-resolutions": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/npm-force-resolutions/-/npm-force-resolutions-0.0.2.tgz", + "integrity": "sha512-2F1FxxDvoatn+OwBxrUGahnEECOpr5RDuF/jqfyy5dI87KmHI3zmb+cCcKDnhR7wnhaTH54/KyPlLTtUTL0Qpw==", + "dev": true, + "requires": { + "json-format": "^1.0.1", + "source-map-support": "^0.5.5" + } + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -13319,9 +13337,6 @@ "dev": true }, "puppeteer": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.5.0.tgz", - "integrity": "sha512-eELwFtFxL+uhmg4jPZOZXzSrPEYy4CaYQNbcchBbfxY+KjMpnv6XGf/aYWaQG49OTpfi2/DMziXtDM8XuJgoUA==", "dev": true, "requires": { "debug": "^3.1.0", @@ -13358,7 +13373,8 @@ "async-limiter": "~1.0.0" } } - } + }, + "version": "^1.11.0" }, "q": { "version": "1.5.1", @@ -18118,4 +18134,4 @@ "dev": true } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 04ea0e9c2..efe202804 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "test:javascript:ci": "npm run test:javascript:transpile && mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -f test/javascript/index.html && browserstack-runner", "test:bundle": "mocha-headless-chrome -a ignore-resource-errors -a no-sandbox -f test/bundle/index.html", "test:visual": "gulp test --color", - "lockdeps": "npm i && rimraf yarn.lock && yarn import && rimraf shrinkwrap.yaml && pnpm import", + "lockdeps": "npm i && npm-force-resolutions && rimraf yarn.lock && yarn import && rimraf shrinkwrap.yaml && pnpm import", "relockdeps": "rimraf package-lock.json && npm run lockdeps", "deploy": "gulp deploy --color", "deploy:prep": "gulp deploy:prep --color", @@ -81,6 +81,7 @@ "mocha": "^5.0.5", "mocha-headless-chrome": "^2.0.1", "motion-ui": "^2.0.2", + "npm-force-resolutions": "0.0.2", "octophant": "^1.0.0", "panini": "^1.6.2", "parker": "^1.0.0-alpha.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 58b3c5050..65b4bd996 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -47,6 +47,7 @@ devDependencies: mocha: 5.2.0 mocha-headless-chrome: 2.0.1 motion-ui: 2.0.3 + npm-force-resolutions: 0.0.2 octophant: 1.0.1 panini: 1.6.3 parker: 1.0.0-alpha.0 @@ -6350,6 +6351,10 @@ packages: hasBin: true resolution: integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + /json-format/1.0.1: + dev: true + resolution: + integrity: sha1-FD9n5irxKda//tKIpGJl6iPQ3ww= /json-parse-better-errors/1.0.2: dev: true resolution: @@ -7833,6 +7838,14 @@ packages: node: '>= 0.10' resolution: integrity: sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4= + /npm-force-resolutions/0.0.2: + dependencies: + json-format: 1.0.1 + source-map-support: 0.5.10 + dev: true + hasBin: true + resolution: + integrity: sha512-2F1FxxDvoatn+OwBxrUGahnEECOpr5RDuF/jqfyy5dI87KmHI3zmb+cCcKDnhR7wnhaTH54/KyPlLTtUTL0Qpw== /npm-run-path/2.0.2: dependencies: path-key: 2.0.1 @@ -11860,6 +11873,7 @@ specifiers: mocha: ^5.0.5 mocha-headless-chrome: ^2.0.1 motion-ui: ^2.0.2 + npm-force-resolutions: 0.0.2 octophant: ^1.0.0 panini: ^1.6.2 parker: ^1.0.0-alpha.0 diff --git a/yarn.lock b/yarn.lock index 3002fd472..eff2e6792 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6157,6 +6157,11 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +json-format@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-format/-/json-format-1.0.1.tgz#143f67e62af129d6bffed288a46265ea23d0df0c" + integrity sha1-FD9n5irxKda//tKIpGJl6iPQ3ww= + json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -7735,6 +7740,14 @@ npm-bundled@^1.0.1: resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979" integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g== +npm-force-resolutions@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/npm-force-resolutions/-/npm-force-resolutions-0.0.2.tgz#91450d07a03b658f71b36efc5e034416b6a42830" + integrity sha512-2F1FxxDvoatn+OwBxrUGahnEECOpr5RDuF/jqfyy5dI87KmHI3zmb+cCcKDnhR7wnhaTH54/KyPlLTtUTL0Qpw== + dependencies: + json-format "^1.0.1" + source-map-support "^0.5.5" + npm-packlist@^1.1.6: version "1.2.0" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.2.0.tgz#55a60e793e272f00862c7089274439a4cc31fc7f" @@ -9838,7 +9851,7 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: source-map-url "^0.4.0" urix "^0.1.0" -source-map-support@~0.5.6: +source-map-support@^0.5.5, source-map-support@~0.5.6: version "0.5.10" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c" integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==