diff options
author | Evan Read <eread@gitlab.com> | 2023-06-01 03:44:55 +0300 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2023-06-01 03:44:55 +0300 |
commit | c1c96cbceef651786c001e00342f4af57ef5281c (patch) | |
tree | e9bdec9af97b6a59232a5768a3e3ba99a20e62e4 | |
parent | 5a73356c4f9488c5fcd0137bffebcd907ce7b2bf (diff) | |
parent | d4d6ede364b15db5b6cdee3926bdd30b083c30a3 (diff) |
Merge branch 'modernize-scss' into 'main'
Replace deprecated SCSS gem
Closes #1300
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3882
Merged-by: Evan Read <eread@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Co-authored-by: Achilleas Pipinellis <axil@gitlab.com>
Co-authored-by: Sarah German <sgerman@gitlab.com>
-rw-r--r-- | .gitlab/ci/build-and-deploy.gitlab-ci.yml | 1 | ||||
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 3 | ||||
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | Rules | 8 | ||||
-rw-r--r-- | content/assets/stylesheets/_variables.scss | 4 | ||||
-rw-r--r-- | doc/architecture.md | 6 | ||||
-rw-r--r-- | doc/development.md | 16 | ||||
-rw-r--r-- | doc/maintenance.md | 2 | ||||
-rw-r--r-- | doc/search.md | 2 | ||||
-rw-r--r-- | dockerfiles/single.Dockerfile | 3 | ||||
-rw-r--r-- | layouts/head.html | 12 | ||||
-rw-r--r-- | layouts/redirect.html | 6 | ||||
-rw-r--r-- | package.json | 5 | ||||
-rw-r--r-- | yarn.lock | 62 |
15 files changed, 88 insertions, 45 deletions
diff --git a/.gitlab/ci/build-and-deploy.gitlab-ci.yml b/.gitlab/ci/build-and-deploy.gitlab-ci.yml index 799d2a66..746802bd 100644 --- a/.gitlab/ci/build-and-deploy.gitlab-ci.yml +++ b/.gitlab/ci/build-and-deploy.gitlab-ci.yml @@ -28,6 +28,7 @@ script: - bundle exec rake default - bundle exec nanoc compile -VV + - yarn compile:css # Create _redirects for Pages redirects - bundle exec rake redirects # Build the Lunr.js search index if needed @@ -3,7 +3,6 @@ source 'https://rubygems.org' gem 'nanoc', '~> 4.12.15' -gem 'sassc', '~> 2.4.0' gem 'rake', '~> 13.0.6' group :nanoc do diff --git a/Gemfile.lock b/Gemfile.lock index 3fd63f0b..6d371d34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -257,8 +257,6 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.4.0) - ffi (~> 1.9) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -311,7 +309,6 @@ DEPENDENCIES rspec (~> 3.12.0) rspec-parameterized (~> 1.0.0) sass (= 3.7.4) - sassc (~> 2.4.0) simplecov (~> 0.22.0) simplecov-cobertura (~> 2.1.0) webrick (~> 1.8, >= 1.8.1) @@ -76,6 +76,8 @@ else ifeq ($(SEARCH_BACKEND),) else @printf "\n$(ERROR)ERROR: Invalid search backend specified!$(END)\n" && exit 1 endif + @printf "\n$(INFO)INFO: Compiling CSS...$(END)\n" + @yarn compile:css view: compile @printf "\n$(INFO)INFO: Starting GitLab documentation site...$(END)\n" @@ -128,14 +128,6 @@ compile '/**/*.md' do end end -compile '/**/*.scss' do - filter :erb - filter :sass, - syntax: :scss, - style: :compressed - write "#{item.identifier.without_ext}.css" -end - # Do not compile minified assets passthrough '/**/*.min.*' diff --git a/content/assets/stylesheets/_variables.scss b/content/assets/stylesheets/_variables.scss index b16a44cf..28b40494 100644 --- a/content/assets/stylesheets/_variables.scss +++ b/content/assets/stylesheets/_variables.scss @@ -308,8 +308,8 @@ $gl-font-size-monospace-sm: 0.688rem; $breakpoint-min: $breakpoint-md, $breakpoint-max: $breakpoint-xl ) { - $breakpoint-range: ($breakpoint-max - $breakpoint-min) / 1rem; - $property-range: ($property-max - $property-min) / 1rem; + $breakpoint-range: calc(($breakpoint-max - $breakpoint-min) / 1rem); + $property-range: calc(($property-max - $property-min) / 1rem); @media (min-width: $breakpoint-min) { #{$property}: calc(#{$property-min} + #{$property-range} * ((100vw - #{$breakpoint-min}) / #{$breakpoint-range})); diff --git a/doc/architecture.md b/doc/architecture.md index c09230c0..b04e670b 100644 --- a/doc/architecture.md +++ b/doc/architecture.md @@ -175,9 +175,9 @@ The archived documentation banner is displayed: - For 14.10. - For any other version. -## Bumping versions of CSS and JavaScript +## Bumping versions of JavaScript -Whenever the custom CSS and JavaScript files under `content/assets/` change, +Whenever the custom JavaScript files under `content/assets/` change, make sure to bump their version in the front matter. This method guarantees that your changes take effect by clearing the cache of previous files. @@ -186,8 +186,6 @@ layouts. For example use: ```erb <script async type="application/javascript" src="<%= @items['/assets/javascripts/badges.*'].path %>"></script> - -<link rel="stylesheet" href="<%= @items['/assets/stylesheets/toc.*'].path %>"> ``` The links pointing to the files should be similar to: diff --git a/doc/development.md b/doc/development.md index 089f2702..7112c27a 100644 --- a/doc/development.md +++ b/doc/development.md @@ -53,19 +53,21 @@ All new JavaScript should be added to the [content/frontend/](https://gitlab.com Legacy JavaScript can be found in [`content/assets/javascripts/`](https://gitlab.com/gitlab-org/gitlab-docs/-/tree/main/content/assets/javascripts/content/assets/javascripts). The files in this directory are handcrafted `ES5` JavaScript files. Work is [ongoing](https://gitlab.com/gitlab-org/gitlab-docs/-/issues/439) to modernize these files. -### Development using Rollup watch mode +### Development using watch mode -If you're working with files within the `/content/frontend/` directory, you can speed up compile time by using -[Rollup's `watch` mode](https://rollupjs.org/command-line-interface/#w-watch). This generates a new bundle when any of -the files in `/content/frontend/` are changed on disk. +Watch mode recompiles assests as the files are changed on disk. This is useful for local development. -To start Rollup in watch mode, run: +Start Rollup in watch mode: ```shell -yarn watch +yarn watch:js ``` -Changes made outside of the `/content/frontend/` directory require a full `make compile` to be previewable. +Start Sass in watch mode: + +```shell +yarn watch:css +``` ### Add a new bundle diff --git a/doc/maintenance.md b/doc/maintenance.md index 19bda3ea..db9dfb13 100644 --- a/doc/maintenance.md +++ b/doc/maintenance.md @@ -45,7 +45,7 @@ site on your own and disable the inclusion of the CSP header, you can do so with the `DISABLE_CSP` environment variable: ```shell -DISABLE_CSP=1 bundle exec nanoc compile +DISABLE_CSP=1 make compile ``` ### Add or update domains in the CSP header diff --git a/doc/search.md b/doc/search.md index 74a213d9..ab920631 100644 --- a/doc/search.md +++ b/doc/search.md @@ -66,7 +66,7 @@ Running Google search on your local site requires an API key. To set this locall Alternatively, you can pass the API key for a build like this: ```shell -GOOGLE_SEARCH_KEY="abc123" SEARCH_BACKEND="google" bundle exec nanoc compile +GOOGLE_SEARCH_KEY="abc123" SEARCH_BACKEND="google" make compile ``` Developers can also use [HackyStack](https://about.gitlab.com/handbook/infrastructure-standards/realms/sandbox/) on Google to spin up a sandbox GCP project. This allows for creating and testing a separate Programmable Search Engine, with separate API keys, and separate billing. However, for most development work, using the production instance is adequate. diff --git a/dockerfiles/single.Dockerfile b/dockerfiles/single.Dockerfile index 4dddf6fa..c930a1ff 100644 --- a/dockerfiles/single.Dockerfile +++ b/dockerfiles/single.Dockerfile @@ -61,7 +61,8 @@ RUN yarn install --frozen-lockfile \ && bundle config set --local deployment true \ && bundle install \ && bundle exec rake default \ - && bundle exec nanoc compile -VV + && bundle exec nanoc compile -VV \ + && yarn compile:css RUN if [ "$SEARCH_BACKEND" = "lunr" ]; then make build-lunr-index; fi diff --git a/layouts/head.html b/layouts/head.html index 5c803637..38bafbca 100644 --- a/layouts/head.html +++ b/layouts/head.html @@ -35,13 +35,13 @@ <link rel="stylesheet" href="/assets/vendor/utility_classes.css"> <!-- Custom --> -<link rel="stylesheet" href="<%= @items['/assets/stylesheets/stylesheet.*'].path %>"> -<link rel="stylesheet" href="<%= @items['/assets/stylesheets/highlight.*'].path %>"> -<link rel="stylesheet" href="<%= @items['/assets/stylesheets/footer.*'].path %>"> -<link rel="stylesheet" href="<%= @items['/assets/stylesheets/toc.*'].path %>"> -<link rel="stylesheet" href="<%= @items['/assets/stylesheets/help.*'].path %>"> +<link rel="stylesheet" href="/assets/stylesheets/stylesheet.css"> +<link rel="stylesheet" href="/assets/stylesheets/highlight.css"> +<link rel="stylesheet" href="/assets/stylesheets/footer.css"> +<link rel="stylesheet" href="/assets/stylesheets/toc.css"> +<link rel="stylesheet" href="/assets/stylesheets/help.css"> +<link rel="stylesheet" href="/assets/stylesheets/font-awesome.min.css"> -<link rel="stylesheet" href="<%= @items['/assets/stylesheets/font-awesome.min.*'].path %>"> <% if production? %> <!-- OneTrust Cookies Consent Notice start --> <script src="https://cdn.cookielaw.org/consent/7f944245-c5cd-4eed-a90e-dd955adfdd08/OtAutoBlock.js"></script> diff --git a/layouts/redirect.html b/layouts/redirect.html index b81aae60..003d8113 100644 --- a/layouts/redirect.html +++ b/layouts/redirect.html @@ -11,9 +11,9 @@ <link rel="prefetch" href="/assets/vendor/JetBrainsMono.woff2" as="font" crossorigin /> <link rel="stylesheet" href="/assets/vendor/index.css"> <link rel="stylesheet" href="/assets/vendor/utility_classes.css"> - - <link rel="stylesheet" href="<%= @items['/assets/stylesheets/stylesheet.*'].path %>"> - <link rel="stylesheet" href="<%= @items['/assets/stylesheets/footer.*'].path %>"> + <!-- Custom --> + <link rel="stylesheet" href="/assets/stylesheets/stylesheet.css"> + <link rel="stylesheet" href="/assets/stylesheets/footer.css"> <meta name="viewport" content="width=device-width, initial-scale=1"> </head> <body> diff --git a/package.json b/package.json index 5e9bb507..031b3591 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,9 @@ "main": "public/index.js", "scripts": { "bundle": "if [ -z $ROLLUP_OPTIONS ]; then echo INFO: ROLLUP_OPTIONS is not set; else echo INFO: ROLLUP_OPTIONS = ${ROLLUP_OPTIONS}; fi && rollup --config rollup.config.js ${ROLLUP_OPTIONS}", - "watch": "rollup --config rollup.config.js --watch", + "watch:js": "rollup --config rollup.config.js --watch", + "compile:css": "node_modules/.bin/sass content/assets/stylesheets:public/assets/stylesheets/", + "watch:css": "node_modules/.bin/sass --watch content/assets/stylesheets:public/assets/stylesheets/", "test": "jest", "test:vue3": "VUE_VERSION=3 jest", "eslint": "eslint --max-warnings 0 --ext .js,.vue .", @@ -46,6 +48,7 @@ "rollup": "^3.23.0", "rollup-plugin-copy": "^3.4.0", "rollup-plugin-import-css": "^3.2.1", + "sass": "^1.62.1", "stylelint": "^15.6.2", "vite": "^4.3.9", "vue-template-compiler": "^2.7.0", @@ -2103,7 +2103,7 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -anymatch@^3.0.3: +anymatch@^3.0.3, anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== @@ -2281,6 +2281,11 @@ balanced-match@^2.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + bluebird@^3.1.1: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" @@ -2322,7 +2327,7 @@ brace-expansion@^2.0.1: dependencies: balanced-match "^1.0.0" -braces@^3.0.2: +braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -2440,6 +2445,21 @@ cheerio@^1.0.0-rc.12: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" +"chokidar@>=3.0.0 <4.0.0": + version "3.5.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + ci-info@^3.2.0, ci-info@^3.3.0: version "3.8.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" @@ -3853,7 +3873,7 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" -glob-parent@^5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -4146,6 +4166,11 @@ ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4, ignore@~5.2.4: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== +immutable@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be" + integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg== + import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -4235,6 +4260,13 @@ is-bigint@^1.0.1: dependencies: has-bigints "^1.0.1" +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + is-boolean-object@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" @@ -4294,7 +4326,7 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -5477,7 +5509,7 @@ normalize-package-data@^3.0.0: semver "^7.3.4" validate-npm-package-license "^3.0.1" -normalize-path@^3.0.0: +normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== @@ -5685,7 +5717,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -5889,6 +5921,13 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== + dependencies: + picomatch "^2.2.1" + redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -6090,6 +6129,15 @@ safe-regex@^2.1.1: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sass@^1.62.1: + version "1.62.1" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.1.tgz#caa8d6bf098935bc92fc73fa169fb3790cacd029" + integrity sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + saxes@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" @@ -6198,7 +6246,7 @@ smob@^1.0.0: resolved "https://registry.yarnpkg.com/smob/-/smob-1.1.1.tgz#6cdd7ab45980252df92c315a7375a053e4ffb950" integrity sha512-i5aqEBPnDv9d77+NDxfjROtywxzNdAVNyaOr+RsLhM28Ts+Ar7luIp/Q+SBYa6wv/7BBcOpEkrhtDxsl2WA9Jg== -source-map-js@^1.0.1, source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== |