Skip to content

Commit

Permalink
Merge branch 'master' into SFINT-5552
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonMilord authored May 30, 2024
2 parents b33b547 + 534e1c2 commit 0c71cca
Show file tree
Hide file tree
Showing 385 changed files with 28,849 additions and 35,016 deletions.
2 changes: 2 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
"popperjs",
"posttofeed",
"poutine",
"predev",
"Pyrenomycetes",
"reduxjs",
"Résultats",
Expand Down Expand Up @@ -269,6 +270,7 @@
"thisisaurl",
"thisisnotadate",
"tryitnow",
"testid",
"tsdoc",
"ttfb",
"uikit",
Expand Down
2 changes: 1 addition & 1 deletion .deployment.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"s3": {
"bucket": "{terraform.infra.infra.bucket_binaries}",
"directory": "proda/StaticCDN/atomic/v$[ATOMIC_MINOR_VERSION]/storybook",
"source": "utils/atomic-storybook/storybook-static",
"source": "packages/atomic/storybook-static",
"parameters": {
"acl": "public-read"
}
Expand Down
22 changes: 22 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
{
"name": "Node.js & TypeScript",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'updateContentCommand ' to run commands when the prebuild is created or updated https://docs.github.com/en/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-time-consuming-tasks-to-be-included-in-the-prebuild
"updateContentCommand": "CI=true bash -c 'npm ci && npm run build'"

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
2 changes: 1 addition & 1 deletion .github/actions/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ runs:
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
id: nx-cache
with:
path: node_modules/.cache/nx
path: .nx/cache
key: nx-${{ github.sha }}
- if: steps.nx-cache.outputs.cache-hit != 'true'
run: npm run build
Expand Down
10 changes: 5 additions & 5 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ runs:
with:
path: |
**/node_modules/
!node_modules/.cache/nx/
key: npm-${{ hashFiles('package-lock.json') }}-${{ hashFiles('utils/atomic-storybook/package-lock.json') }}
!.nx/cache/
key: npm-${{ hashFiles('package-lock.json') }}}}
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
with:
path: packages/quantic/force-app/main/default/staticresources
key: quantic-${{ hashFiles('package-lock.json') }}-${{ hashFiles('utils/atomic-storybook/package-lock.json') }}
key: quantic-${{ hashFiles('package-lock.json') }}}}
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
with:
path: ~/.cache/Cypress
key: cy-${{ hashFiles('package-lock.json') }}-${{ hashFiles('utils/atomic-storybook/package-lock.json') }}
key: cy-${{ hashFiles('package-lock.json') }}}}
- if: inputs.load-cache == 'true'
uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
id: nx-cache
with:
path: node_modules/.cache/nx
path: .nx/cache
key: nx-${{ github.sha }}
fail-on-cache-miss: ${{ inputs.fail-on-cache-miss == 'true' }}
- if: steps.npm-cache.outputs.cache-hit != 'true'
Expand Down
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for more information:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
# https://containers.dev/guide/dependabot

version: 2
updates:
- package-ecosystem: 'devcontainers'
directory: '/'
schedule:
interval: weekly
2 changes: 0 additions & 2 deletions .github/workflows/package-lock-root-success.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ on:
branches: [master]
paths-ignore:
- '**/package-lock.json'
- '!utils/atomic-storybook/package-lock.json'
- '!package-lock.json'
pull_request:
branches: [master]
paths-ignore:
- '**/package-lock.json'
- '!utils/atomic-storybook/package-lock.json'
- '!package-lock.json'

jobs:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ sarifs
**.cy.ts.mp4
.cspellcache
scripts/translation-gpt/temporary.json
.nx/cache

# CI Release
topology.json
.git-message
.git-message
.nx/cache
packages/atomic/custom-elements.json
5 changes: 3 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
dist
**/*.d.ts
LICENSE.md
**/.storybook/**
utils/**/.storybook/**
**/.angular/**
**/.next/**
**/www/**
scripts/deploy/execute-deployment-pipeline.mjs
**/staticresources/**
**/staticresources/**
/.nx/cache
37 changes: 24 additions & 13 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
{
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["cached:build", "cached:build:stencil"]
}
}
},
"plugins": ["@coveo/nx-plugin"],
"namedInputs": {
"sharedGlobals": [
{
Expand Down Expand Up @@ -38,7 +29,10 @@
"!{projectRoot}/*.md",
"!{projectRoot}/*.tsbuildinfo",
"!{projectRoot}/LICENSE",
"!{projectRoot}/**/?(*.)+({{spec.{ts,tsx},spec.{ts,tsx}.snap},{?(*([^.]).)stories.{tsx,css},mdx}})"
"!{projectRoot}/**/?(*.)spec.{ts,tsx}",
"!{projectRoot}/**/?(*.)spec.{ts,tsx}.snap}",
"!{projectRoot}/**/?(*.)stories.{tsx,css}",
"!{projectRoot}/**/?(*.)mdx"
],
"negativeBuildOutputs": [
"!{projectRoot}/dist",
Expand All @@ -58,7 +52,10 @@
"buildInputs",
"negativeNonBuildOutputs",
"negativeBuildOutputs",
"negativeCommonNonProduction"
"negativeCommonNonProduction",
"!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)",
"!{projectRoot}/.storybook/**/*",
"!{projectRoot}/tsconfig.storybook.json"
]
},
"targetDefaults": {
Expand All @@ -77,7 +74,8 @@
"{projectRoot}/.next",
"{projectRoot}/next-env.d.ts"
],
"dependsOn": ["^build"]
"dependsOn": ["^build"],
"cache": true
},
"dev": {
"dependsOn": ["^build"]
Expand Down Expand Up @@ -110,8 +108,21 @@
},
"release:phase5": {
"dependsOn": ["^release:phase5"]
},
"cached:build:stencil": {
"cache": true
},
"build-storybook": {
"cache": true,
"inputs": [
"default",
"^production",
"{projectRoot}/.storybook/**/*",
"{projectRoot}/tsconfig.storybook.json"
]
}
},
"defaultBase": "master",
"$schema": "./node_modules/nx/schemas/nx-schema.json"
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"useInferencePlugins": false
}
Loading

0 comments on commit 0c71cca

Please sign in to comment.