chore(merge v4-dev): latest patched commit → 8e59752ee

.bundlewatch.config.json

@@ -30,7 +30,7 @@
     },
     {
       "path": "./dist/js/boosted.bundle.min.js",
-      "maxSize": "26.5 kB"
+      "maxSize": "26.75 kB"
     },
     {
       "path": "./dist/js/boosted.js",

.eslintignore

@@ -3,7 +3,7 @@
 **/vendor/
 /_gh_pages/
 /js/coverage/
-/site/sw.js
+/site/static/sw.js
 **/docs/**/demo/*
 **/docs/**/rtl-*/**/
 **/docs/**/examples/orange-*

.github/CONTRIBUTING.md

@@ -142,7 +142,7 @@ and/or [`/boosted/js/`](https://github.com/Orange-OpenSource/Orange-Boosted-Boot
 
 Similarly, when contributing to Boosted's documentation, you should edit the
 documentation source files in
-[the `/boosted/docs/` directory of the `v4-dev` branch](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/v4-dev/docs).
+[the `/boosted/site/content/docs/` directory of the `v4-dev` branch](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/tree/v4-dev/site/content/docs).
 **Do not edit the `gh-pages` branch.** That branch is generated from the
 documentation source files and is managed separately by the Bootstrap Core Team.
 

.github/workflows/browserstack.yml

@@ -3,6 +3,7 @@ on:
   push:
 env:
   CI: true
+  FORCE_COLOR: 2
   NODE: 14.x
 
 jobs:

.github/workflows/bundlewatch.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   CI: true
+  FORCE_COLOR: 2
   NODE: 14.x
 
 jobs:

.github/workflows/css.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   CI: true
+  FORCE_COLOR: 2
   NODE: 14.x
 
 jobs:

.github/workflows/dart-sass.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   CI: true
+  FORCE_COLOR: 2
   NODE: 14.x
 
 jobs:

.github/workflows/docs.yml

@@ -8,8 +8,8 @@ on:
 
 env:
   CI: true
+  FORCE_COLOR: 2
   NODE: 14.x
-  RUBY: 2.7.x
 
 jobs:
   docs:
@@ -24,25 +24,7 @@ jobs:
         with:
           node-version: "${{ env.NODE }}"
 
-      - name: Set up Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ env.RUBY }}
-
-      - name: Set up Ruby env
-        run: |
-          echo "gem: --no-document" > ~/.gemrc # Disable gem docs
-          bundle config set clean 'true'
-          bundle config set deployment 'true'
-
-      - name: Set up Ruby cache
-        uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-ruby-v${{ env.RUBY }}-${{ hashFiles('Gemfile') }}-${{ hashFiles('Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-ruby-v${{ env.RUBY }}-${{ hashFiles('Gemfile') }}-${{ hashFiles('Gemfile.lock') }}
-            ${{ runner.os }}-ruby-v${{ env.RUBY }}-
+      - run: java -version
 
       - name: Set up npm cache
         uses: actions/cache@v2
@@ -53,19 +35,8 @@ jobs:
             ${{ runner.OS }}-node-v${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
             ${{ runner.OS }}-node-v${{ env.NODE }}-
 
-      - run: ruby --version
-      - run: gem --version
-      - run: bundle --version
-      - run: java -version
-
       - name: Install npm dependencies
         run: npm ci
 
-      - name: Install bundler dependencies
-        run: bundle install --deployment --jobs=4 --retry=3 --clean
-
-      - name: Copy CSS and JS
-        run: npm run css-copy && npm run js-copy
-
       - name: Test docs
         run: npm run docs

.github/workflows/js.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   CI: true
+  FORCE_COLOR: 2
 
 jobs:
   run:

.github/workflows/lint.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   CI: true
+  FORCE_COLOR: 2
   NODE: 14.x
 
 jobs:

.gitignore

@@ -1,18 +1,9 @@
 # Ignore docs files
 /_gh_pages/
-/site/.jekyll-cache
-/site/.jekyll-metadata
-site/docs/**/dist
-docs/4.0/examples/rtl-*
 
 # Hugo folders
 /resources/
 
-# Ignore ruby/bundler files
-/.bundle/
-/vendor/
-/.ruby-version
-
 # Numerous always-ignore extensions
 *.diff
 *.err
@@ -56,3 +47,6 @@ Thumbs.db
 /node_modules/
 .pa11y/
 pa11y-ci-results.json
+
+# Boosted mod
+docs/4.0/examples/rtl-*

.stylelintignore

@@ -2,6 +2,9 @@
 **/dist/
 **/vendor/
 /_gh_pages/
+/js/coverage/
+
+
 site/docs/4.5/examples/demo/**
 site/docs/4.5/examples/rtl-*/**
 site/docs/4.5/assets/css/tarteaucitronboosted.css

README.md

@@ -110,18 +110,18 @@ Have a bug or a feature request? Please first read the [issue guidelines](https:
 
 ## Documentation
 
-Boosted documentation, included in this repo in the root directory, is built with [Jekyll](https://jekyllrb.com/) and publicly hosted on GitHub Pages at <https://boosted.orange.com/>. The docs may also be run locally.
+Boosted documentation, included in this repo in the root directory, is built with [Hugo](https://gohugo.io/) and publicly hosted on GitHub Pages at <https://boosted.orange.com/>. The docs may also be run locally.
 
-Documentation search is powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). Working on our search? Be sure to set `debug: true` in `site/docs/4.5/assets/js/src/search.js` file.
+Documentation search is powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). Working on our search? Be sure to set `debug: true` in `site/assets/js/src/search.js` file.
 
 ### Running documentation locally
 
-1. Run through the [tooling setup](https://boosted.orange.com/docs/4.5/getting-started/build-tools/#tooling-setup) to install Jekyll (the site builder) and other Ruby dependencies with `bundle install`.
-2. Run `npm install` to install Node.js dependencies.
+1. Run `npm install` to install the Node.js dependencies, including Hugo (the site builder).
+2. Run `npm run test` (or a specific npm script) to rebuild distributed CSS and JavaScript files, as well as our docs assets.
 3. Run `npm start` to compile CSS and JavaScript files, generate our docs, and watch for changes.
-4. Open `http://localhost:9001` in your browser, and voilà.
+4. Open http://localhost:9001/ in your browser, and voilà.
 
-Learn more about using Jekyll by reading its [documentation](https://jekyllrb.com/docs/).
+Learn more about using Hugo by reading its [documentation](https://gohugo.io/documentation/).
 
 ### Documentation for previous releases