Skip to content

Commit

Permalink
Merge pull request #161 from dnum-mi/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
laruiss authored Nov 30, 2021
2 parents 0c48302 + 1cb8763 commit 3739baf
Show file tree
Hide file tree
Showing 137 changed files with 18,168 additions and 9,657 deletions.
11 changes: 11 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,16 @@ module.exports = {
jest: true,
},
},
{
files: [
'**/src/**/*.e2e.{j,t}s?(x)',
],
env: {
'cypress/globals': true,
},
extends: [
'plugin:cypress/recommended',
],
},
],
}
58 changes: 30 additions & 28 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,38 @@ export const parameters = {
},
options: {
storySort: {
method: 'alphabetical',
order: [
'Docs',
['Introduction', 'Guide d’utilisation', 'Guide du développeur'],
'Basic',
[
'Titres',
'Titres Alternatifs',
'Alertes',
'Fil d’Ariane - Breadcrumb',
'Logo Officiel - Official logo',
'Boutons - Button',
'Groupe de Boutons - ButtonGroup',
'Champs de saisie - Input',
'Case à cocher - Checkbox',
'Boutons radio - Radio button',
'Liste déroulante - Select',
'Interrupteur - Toggle switch',
'Étiquettes - Tags',
],
'Éléments',
[
'Carte - Card',
'Barre de recherche - Search bar',
'En-tête - Header',
'Lettres d’information et réseaux - Follow',
'Pied de page - Footer',
'Modale - Modal',
'Onglets - Tabs', ['Onglets', 'Titre', 'Onglets'],
'Table'
],
// ['1. Introduction', '2. Guide d’utilisation', '3. Guide du développeur'],
'Fondamentaux',
'Composants',
// [
// 'Titres',
// 'Titres Alternatifs',
// 'Alertes',
// 'Fil d’Ariane - Breadcrumb',
// 'Logo Officiel - Official logo',
// 'Boutons - Button',
// 'Groupe de Boutons - ButtonGroup',
// 'Champs de saisie - Input',
// 'Case à cocher - Checkbox',
// 'Boutons radio - Radio button',
// 'Liste déroulante - Select',
// 'Interrupteur - Toggle switch',
// 'Étiquettes - Tags',
// ],
// 'Éléments',
// [
// 'Carte - Card',
// 'Barre de recherche - Search bar',
// 'En-tête - Header',
// 'Lettres d’information et réseaux - Follow',
// 'Pied de page - Footer',
// 'Modale - Modal',
// 'Onglets - Tabs', ['Onglets', 'Titre', 'Onglets'],
// 'Table'
// ],
],
},
}
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"postcss": "css"
},
"eslint.workingDirectories": [{ "mode": "auto"}],
"editor.codeActionsOnSave": {
"source.fixAll": true,
},
"files.associations": {
"*.css": "postcss"
},
Expand Down
18 changes: 15 additions & 3 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
module.exports = {
presets: [[
'@babel/preset-env',
{
targets:
{ node: 'current' },
},
],
],
plugins: [
'@babel/plugin-syntax-jsx',
],
presets: [
'@babel/preset-env',
],
env: {
test: {
plugins: [
'babel-plugin-transform-import-meta',
],
},
},
}
5 changes: 3 additions & 2 deletions cypress.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"testFiles": "cypress/specs/**.spec.js",
"testFiles": "cypress/tests/**/*.e2e.js",
"pluginsFile": "cypress/plugins/index.js",
"video": false,
"component": {
"componentFolder": "src",
"testFiles": "**.e2e.js*",
"testFiles": "**/*.e2e.js*",
"viewportHeight": 500,
"viewportWidth": 700
}
Expand Down
3 changes: 2 additions & 1 deletion cypress/support/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
// ***********************************************************

// Import commands.js using ES2015 syntax:
import './commands'
import './commands.js'

// Alternatively you can use CommonJS syntax:
// require('./commands')
import 'cypress-plugin-tab'
8 changes: 4 additions & 4 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ module.exports = {
// cacheDirectory: "/tmp/jest_rs",

// Automatically clear mock calls and instances between every test
// clearMocks: false,
clearMocks: true,

// Indicates whether the coverage information should be collected while executing the test
// collectCoverage: false,
collectCoverage: true,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,
Expand Down Expand Up @@ -149,7 +149,7 @@ module.exports = {
// snapshotSerializers: [],

// The test environment that will be used for testing
// testEnvironment: "jest-environment-jsdom",
testEnvironment: 'jest-environment-jsdom',

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},
Expand Down Expand Up @@ -192,7 +192,7 @@ module.exports = {
// '^.+\\.svg$': 'jest-svg-transformer',
// '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
'^.+\\.js$': 'babel-jest',
'^.+\\.vue$': 'vue-jest',
'^.+\\.vue$': '@vue/vue3-jest',
},

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
Expand Down
Loading

0 comments on commit 3739baf

Please sign in to comment.