From d1de44775b9df6132af9974f6aaef09c5f2d678f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Edenstr=C3=B6m?= Date: Wed, 6 Oct 2021 07:29:27 +0200 Subject: [PATCH] fix: licenses extractor is used on the correct package.json --- apps/skolplattformen-sthlm/package.json | 4 +- ...brary-extractor.js => library-extractor.js | 0 package.json | 31 +++--- yarn.lock | 105 +++++++++++++++++- 4 files changed, 119 insertions(+), 21 deletions(-) rename apps/skolplattformen-sthlm/library-extractor.js => library-extractor.js (100%) diff --git a/apps/skolplattformen-sthlm/package.json b/apps/skolplattformen-sthlm/package.json index 5ac5af46..f72dcc17 100644 --- a/apps/skolplattformen-sthlm/package.json +++ b/apps/skolplattformen-sthlm/package.json @@ -12,9 +12,7 @@ "test:watch": "jest --watch", "typecheck": "tsc --watch", "i18n": "sync-i18n --files '**/translations/*.json' --primary en --languages ar de pl so sv --space 2", - "check-i18n": "npm run i18n -- --check", - "extract-licenses": "react-native-oss-license --json > licenses-oss.json && node library-extractor.js && rm licenses-oss.json", - "postinstall": "yarn extract-licenses" + "check-i18n": "npm run i18n -- --check" }, "dependencies": { "react": "*", diff --git a/apps/skolplattformen-sthlm/library-extractor.js b/library-extractor.js similarity index 100% rename from apps/skolplattformen-sthlm/library-extractor.js rename to library-extractor.js diff --git a/package.json b/package.json index 13b561f6..c5851f1d 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,13 @@ "version": "0.0.0", "license": "MIT", "scripts": { - "start": "nx serve", + "start": "nx start", + "ios": "nx run-ios", + "android": "nx run-android", "build": "nx build", - "test": "nx test" + "test": "nx test", + "extract-licenses": "react-native-oss-license --json > licenses-oss.json && node library-extractor.js && rm licenses-oss.json && mv libraries.json apps/skolplattformen-sthlm", + "postinstall": "yarn extract-licenses" }, "private": true, "dependencies": { @@ -38,7 +42,9 @@ "moment": "^2.29.1", "node-html-parser": "^2.1.0", "personnummer": "3.1.3", + "react": "17.0.2", "react-dom": "17.0.2", + "react-native": "0.65.1", "react-native-animatable": "^1.3.3", "react-native-calendar-events": "2.2.0", "react-native-dev-menu": "^4.0.2", @@ -56,9 +62,7 @@ "react-native-svg": "12.1.0", "react-native-typography": "1.4.1", "react-native-webview": "11.4.2", - "react-native": "0.65.1", "react-redux": "^7.2.3", - "react": "17.0.2", "redux": "^4.0.5", "regenerator-runtime": "0.13.7", "tslib": "^2.0.0", @@ -71,53 +75,54 @@ "@nrwl/eslint-plugin-nx": "12.9.0", "@nrwl/jest": "12.9.0", "@nrwl/linter": "12.9.0", - "@nrwl/react-native": "^12.9.0", "@nrwl/react": "12.9.0", + "@nrwl/react-native": "^12.9.0", "@nrwl/tao": "12.9.0", "@nrwl/web": "12.9.0", "@nrwl/workspace": "12.9.0", + "@react-native-community/cli": "6.0.0", "@react-native-community/cli-platform-android": "6.0.0", "@react-native-community/cli-platform-ios": "6.0.0", - "@react-native-community/cli": "6.0.0", "@testing-library/jest-dom": "5.14.1", "@testing-library/jest-native": "4.0.2", + "@testing-library/react": "11.2.6", "@testing-library/react-hooks": "7.0.1", "@testing-library/react-native": "8.0.0-rc.0", - "@testing-library/react": "11.2.6", "@types/base-64": "^1.0.0", "@types/detox": "17.14.2", "@types/he": "^1.1.1", "@types/jest": "26.0.24", "@types/luxon": "^1.26.4", - "@types/node-fetch": "^2.5.10", "@types/node": "14.14.33", + "@types/node-fetch": "^2.5.10", + "@types/react": "17.0.19", "@types/react-dom": "17.0.3", "@types/react-native": "0.64.13", - "@types/react": "17.0.19", "@types/tough-cookie": "^4.0.0", "@typescript-eslint/eslint-plugin": "~4.28.3", "@typescript-eslint/parser": "~4.28.3", "@ui-kitten/metro-config": "^5.1.1", "babel-jest": "27.0.6", "detox": "18.20.2", + "eslint": "7.22.0", "eslint-config-prettier": "8.1.0", "eslint-plugin-import": "2.22.1", "eslint-plugin-jsx-a11y": "6.4.1", - "eslint-plugin-react-hooks": "4.2.0", "eslint-plugin-react": "7.23.1", - "eslint": "7.22.0", + "eslint-plugin-react-hooks": "4.2.0", "fetch-cookie": "^0.11.0", "https-proxy-agent": "^5.0.0", + "jest": "27.0.3", "jest-circus": "27.0.3", "jest-react-native": "18.0.0", - "jest": "27.0.3", + "metro": "0.66.2", "metro-react-native-babel-preset": "0.66.2", "metro-resolver": "0.66.2", - "metro": "0.66.2", "node-blob": "^0.0.2", "node-fetch": "^2.6.1", "prettier": "^2.3.1", "react-native-codegen": "0.0.7", + "react-native-oss-license": "^0.4.1", "react-test-renderer": "17.0.2", "tough-cookie": "^4.0.0", "ts-jest": "27.0.3", diff --git a/yarn.lock b/yarn.lock index 98de0920..04a8928b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3317,7 +3317,7 @@ array.prototype.flatmap@^1.2.4: define-properties "^1.1.3" es-abstract "^1.19.0" -asap@~2.0.3, asap@~2.0.6: +asap@^2.0.0, asap@~2.0.3, asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= @@ -4528,6 +4528,11 @@ commander@^2.19.0, commander@^2.20.0, commander@^2.9.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" @@ -5133,6 +5138,11 @@ debug@^3.1.1, debug@^3.2.6, debug@^3.2.7: dependencies: ms "^2.1.1" +debuglog@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" + integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= + decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -5328,6 +5338,14 @@ detox@18.20.2: yargs "^16.0.3" yargs-unparser "^2.0.0" +dezalgo@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" + integrity sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY= + dependencies: + asap "^2.0.0" + wrappy "1" + diff-sequences@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" @@ -6791,7 +6809,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.5, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -7388,6 +7406,11 @@ ini@^1.3.4: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +install@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/install/-/install-0.13.0.tgz#6af6e9da9dd0987de2ab420f78e60d9c17260776" + integrity sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA== + internal-ip@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" @@ -9922,7 +9945,7 @@ nopt@^5.0.0: dependencies: abbrev "1" -normalize-package-data@^2.3.2: +normalize-package-data@^2.0.0, normalize-package-data@^2.3.2: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== @@ -9978,7 +10001,7 @@ npm-install-checks@^4.0.0: dependencies: semver "^7.1.1" -npm-normalize-package-bin@^1.0.1: +npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== @@ -10645,6 +10668,14 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== +path@^0.12.7: + version "0.12.7" + resolved "https://registry.yarnpkg.com/path/-/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f" + integrity sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8= + dependencies: + process "^0.11.1" + util "^0.10.3" + pbkdf2@^3.0.3: version "3.1.2" resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" @@ -11172,7 +11203,7 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -process@^0.11.10: +process@^0.11.1, process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= @@ -11568,6 +11599,19 @@ react-native-modal-datetime-picker@^11.0.0: dependencies: prop-types "^15.7.2" +react-native-oss-license@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/react-native-oss-license/-/react-native-oss-license-0.4.1.tgz#1165f8afa630ec41f427572ee39e26e5a22b6d80" + integrity sha512-I+3HQYhVfy6D0EzOieNjcRL+M6tI9+IT+RedtAml5zBIYjD3jSu7C1TKl6eWuA1UZJm8n94wEWAzYpr6aQHr0A== + dependencies: + commander "^4.0.0" + fs-extra "^8.1.0" + glob "^7.1.5" + install "^0.13.0" + path "^0.12.7" + read-installed "^4.0.3" + yaml "^1.7.2" + react-native-reanimated@2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-2.2.2.tgz#8bc81c7ee93d599991507bb826050a5eeee1e7f2" @@ -11712,6 +11756,20 @@ read-cache@^1.0.0: dependencies: pify "^2.3.0" +read-installed@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067" + integrity sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc= + dependencies: + debuglog "^1.0.1" + read-package-json "^2.0.0" + readdir-scoped-modules "^1.0.0" + semver "2 || 3 || 4 || 5" + slide "~1.1.3" + util-extend "^1.0.1" + optionalDependencies: + graceful-fs "^4.1.2" + read-package-json-fast@^2.0.1: version "2.0.3" resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83" @@ -11720,6 +11778,16 @@ read-package-json-fast@^2.0.1: json-parse-even-better-errors "^2.3.0" npm-normalize-package-bin "^1.0.1" +read-package-json@^2.0.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a" + integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA== + dependencies: + glob "^7.1.1" + json-parse-even-better-errors "^2.3.0" + normalize-package-data "^2.0.0" + npm-normalize-package-bin "^1.0.0" + read-pkg-up@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" @@ -11776,6 +11844,16 @@ readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readdir-scoped-modules@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" + integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw== + dependencies: + debuglog "^1.0.1" + dezalgo "^1.0.0" + graceful-fs "^4.1.2" + once "^1.3.0" + readdirp@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" @@ -12582,6 +12660,11 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" +slide@~1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" + integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= + smart-buffer@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" @@ -13895,6 +13978,11 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= +util-extend@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" + integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8= + util.promisify@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" @@ -13912,6 +14000,13 @@ util@0.10.3: dependencies: inherits "2.0.1" +util@^0.10.3: + version "0.10.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" + integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A== + dependencies: + inherits "2.0.3" + util@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"