Skip to content

Commit 8a715a6

Browse files
laruisslaruiss
authored
Merge pull request #489 from dnum-mi/develop
Develop
2 parents 8944bb8 + 7b9fe73 commit 8a715a6

File tree

115 files changed

+11406
-21342
lines changed

Some content is hidden

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

115 files changed

+11406
-21342
lines changed

‎.babelrc.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"sourceType": "unambiguous",
3+
"presets": [
4+
[
5+
"@babel/preset-env",
6+
{
7+
"targets": {
8+
"chrome": 100
9+
}
10+
}
11+
],
12+
"@babel/preset-typescript"
13+
],
14+
"plugins": []
15+
}

‎.github/workflows/publish-release-beta.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
release:
99
name: Release
10-
runs-on: ubuntu-18.04
10+
runs-on: ubuntu-22.04
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v2

‎.github/workflows/publish-release-next.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Release
2+
on:
3+
push:
4+
branches:
5+
- next
6+
7+
jobs:
8+
release:
9+
name: Release
10+
runs-on: ubuntu-20.04
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v2
14+
- name: Setup Node.js
15+
uses: actions/setup-node@v2
16+
with:
17+
always-auth: true
18+
node-version: 16
19+
- name: Install dependencies
20+
run: npm ci
21+
- name: Release
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
25+
run: npm run semantic-release

‎.github/workflows/publish-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
release:
1010
name: Release
11-
runs-on: ubuntu-18.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v2

‎.npmrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
//registry.npmjs.com/:_authToken=${NPM_TOKEN}
33
always-auth=true
44
legacy-peer-deps=true
5+
access=public
6+

‎.storybook/main.js‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
1+
import { mergeConfig } from 'vite'
2+
13
module.exports = {
2-
"stories": [
3-
"../src/**/*.stories.@(mdx|js|jsx|ts|tsx)"
4-
],
5-
"addons": [
6-
"@storybook/addon-links",
7-
"@storybook/addon-essentials",
8-
{
9-
name: '@storybook/addon-postcss',
10-
options: {
11-
postcssLoaderOptions: {
12-
implementation: require('postcss'),
13-
}
4+
"stories": ["../src/**/*.@(mdx|stories.@(js|jsx|ts|tsx))"],
5+
"addons": ["@storybook/addon-links", "@storybook/addon-essentials", {
6+
name: '@storybook/addon-postcss',
7+
options: {
8+
postcssLoaderOptions: {
9+
implementation: require('postcss')
1410
}
15-
},
16-
],
11+
}
12+
}],
1713
staticDirs: ['../public'],
18-
// core: {
19-
// builder: 'webpack5'
20-
// }
21-
core: {
22-
builder: "@storybook/builder-vite"
14+
framework: {
15+
name: "@storybook/vue3-vite",
16+
options: {}
17+
},
18+
docs: {
19+
autodocs: true
20+
},
21+
async viteFinal(config, {
22+
configType
23+
}) {
24+
return mergeConfig(config, {
25+
define: {
26+
'process.env': {}
27+
}
28+
});
2329
}
2430
};

‎.storybook/preview.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { defineComponent } from 'vue'
2-
import { app } from '@storybook/vue3'
2+
import { setup } from '@storybook/vue3'
33
import { FocusTrap } from 'focus-trap-vue'
44

55
// import '@gouvfr/dsfr/dist/core/core.module.js'
66

7-
import '../src/main.css'
7+
import '../src/assets/variables-fdr.css'
8+
import '@gouvfr/dsfr/dist/dsfr.min.css'
9+
// import '../src/main.css'
810

911
import './theme.css'
1012

@@ -33,7 +35,7 @@ export const parameters = {
3335

3436

3537
const RouterLink = defineComponent({
36-
name: 'router-link',
38+
name: 'RouterLink',
3739
props: {
3840
to: String,
3941
},
@@ -42,6 +44,8 @@ const RouterLink = defineComponent({
4244
`,
4345
})
4446

45-
app.component('router-link', RouterLink);
46-
app.component('VIcon', VIcon)
47-
app.component('FocusTrap', FocusTrap)
47+
setup(app => {
48+
app.component('RouterLink', RouterLink);
49+
app.component('VIcon', VIcon)
50+
app.component('FocusTrap', FocusTrap)
51+
})

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8" />
55
<link rel="icon" href="/favicon.ico" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Vite App</title>
7+
<title>Demo VueDSFR</title>
88
</head>
99
<body>
1010
<div id="app"></div>

0 commit comments

Comments
 (0)