Skip to content

Commit 3e38df6

Browse files
committed
Merge branch 'dev'
2 parents 89fcffa + 7a0772d commit 3e38df6

File tree

227 files changed

+7738
-4782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+7738
-4782
lines changed

.eslintignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

.eslintrc.json

Lines changed: 0 additions & 235 deletions
This file was deleted.

.github/workflows/node-sass.yml

Lines changed: 0 additions & 52 deletions
This file was deleted.

build/generate-sri.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ import fs from 'node:fs'
1414
import path from 'node:path'
1515
import { fileURLToPath } from 'node:url'
1616
import sh from 'shelljs'
17+
import pkg from '../package.json' with { type: 'json' }
1718

1819
const __dirname = path.dirname(fileURLToPath(import.meta.url))
1920

2021
sh.config.fatal = true
2122

2223
const configFile = path.join(__dirname, '../hugo.yml')
24+
const isCanaryVersion = pkg.version.includes('canary')
2325

2426
// Array of objects which holds the files to generate SRI hashes for.
2527
// `file` is the path from the root folder
@@ -69,12 +71,13 @@ for (const { file, configPropertyName } of files) {
6971
throw error
7072
}
7173

74+
const propertyName = isCanaryVersion ? `canary_${configPropertyName}` : configPropertyName
7275
const algorithm = 'sha384'
7376
const hash = crypto.createHash(algorithm).update(data, 'utf8').digest('base64')
7477
const integrity = `${algorithm}-${hash}`
7578

76-
console.log(`${configPropertyName}: ${integrity}`)
79+
console.log(`${propertyName}: ${integrity}`)
7780

78-
sh.sed('-i', new RegExp(`^(\\s+${configPropertyName}:\\s+["'])\\S*(["'])`), `$1${integrity}$2`, configFile)
81+
sh.sed('-i', new RegExp(`^(\\s+${propertyName}:\\s+["'])\\S*(["'])`), `$1${integrity}$2`, configFile)
7982
})
8083
}

build/postcss.config.mjs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ export default context => {
1111
autoprefixer: {
1212
cascade: false
1313
},
14-
'postcss-combine-duplicated-selectors': {},
15-
rtlcss: context.env === 'RTL'
14+
'postcss-combine-duplicated-selectors': {}
1615
}
1716
}
1817
}

docs/assets/scss/_ads.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
// stylelint-disable declaration-no-important, selector-max-id
2+
@use "../../../scss/mixins/border-radius" as *;
3+
@use "../../../scss/mixins/breakpoints" as *;
4+
@use "../../../scss/vendor/rfs" as *;
25

36
//
47
// Carbon ads

docs/assets/scss/_anchor.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use "../../../scss/mixins/transition" as *;
2+
@use "../../../scss/variables" as *;
3+
14
.anchor-link {
25
padding: 0 .175rem;
36
font-weight: 400;

docs/assets/scss/_buttons.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use "../../../scss/functions/color" as *;
2+
@use "variables" as *;
3+
14
// Buttons
25
//
36
// Custom buttons for the docs.

docs/assets/scss/_callouts.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use "../../../scss/variables" as *;
2+
@use "variables" as *;
3+
14
//
25
// Callouts
36
//

docs/assets/scss/_clipboard-js.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
@use "../../../scss/mixins/border-radius" as *;
2+
@use "../../../scss/mixins/breakpoints" as *;
3+
14
// clipboard.js
25
//
36
// JS-based `Copy` buttons for code snippets.

0 commit comments

Comments
 (0)