Skip to content

Commit 860079b

Browse files
committed
Merge branch 'master' into button
2 parents 2ca9146 + 0c4d54c commit 860079b

Some content is hidden

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

70 files changed

+7626
-22973
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env node */
22
module.exports = {
33
root: true,
4-
ignorePatterns: ['*.config.js', '*.spec.js', 'tasks/*', 'dist/*'],
4+
ignorePatterns: ['*.config.js', '*.spec.js', 'dist/*'],
55
extends: [
66
'plugin:vue/vue3-recommended',
77
'eslint:recommended',

.github/workflows/build.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
node: [ '16', '18', '20' ]
17+
node: [ '18', '20' ]
1818
name: Node ${{ matrix.node }}
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v3
21+
uses: actions/checkout@v4
2222
- name: Setup node
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ matrix.node }}
2626
- name: Install dependencies
@@ -33,11 +33,11 @@ jobs:
3333
runs-on: ubuntu-latest
3434
steps:
3535
- name: Checkout
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737
- name: Setup node
38-
uses: actions/setup-node@v3
38+
uses: actions/setup-node@v4
3939
with:
40-
node-version: 18
40+
node-version: 20
4141
- name: Install dependencies
4242
run: npm install
4343
- name: Testing
@@ -60,10 +60,13 @@ jobs:
6060
needs: [sonar]
6161
runs-on: ubuntu-latest
6262
steps:
63-
- uses: actions/checkout@v1
63+
- name: Checkout code
64+
uses: actions/checkout@v4
65+
with:
66+
fetch-depth: 0
6467
- name: Install dependencies
65-
run: yarn
68+
run: npm ci
6669
- name: Publish to Chromatic
67-
uses: chromaui/action@v1
70+
uses: chromaui/action@latest
6871
with:
6972
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ jobs:
1111
name: Running Publish Build
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
- name: Setup node
16-
uses: actions/setup-node@v3
16+
uses: actions/setup-node@v4
1717
with:
18-
node-version: 18
18+
node-version: 20
1919
- name: Install dependencies
2020
run: npm install
2121
- name: Build
2222
run: npm run build
2323
- name: Testing
2424
run: npm test
2525
- name: Publish NPM package
26-
uses: JS-DevTools/npm-publish@v1
26+
uses: JS-DevTools/npm-publish@v3
2727
with:
2828
token: ${{ secrets.NPM_TOKEN }}
2929
access: "public"
3030
dry-run: false
31-
check-version: true
31+
strategy: all

.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.storybook/main.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
const path = require('path');
2-
const {resolve} = require("path");
32

43

54
module.exports = {
65
stories: [
7-
"../src/**/*.stories.@(js|jsx|ts|tsx|vue)",
8-
"../src/stories/**/*.mdx",
6+
"../components/src/**/*.stories.@(js|jsx|ts|tsx|vue)",
7+
"../components/src/stories/**/*.mdx",
98
],
109

1110
staticDirs: ["../public"],
@@ -35,7 +34,7 @@ module.exports = {
3534
type: 'asset/source',
3635
loader: 'svgo-loader',
3736
options: {
38-
configFile: require.resolve('../svgo.config.js'),
37+
configFile: require.resolve('../components/svgo.config.js'),
3938
},
4039
}
4140
);
@@ -61,9 +60,9 @@ module.exports = {
6160

6261
config.resolve.alias = {
6362
'vue': path.resolve(__dirname, '../node_modules/vue/dist/vue.esm-bundler.js'),
64-
'~core': path.resolve(__dirname, '../src/core'),
65-
'~widgets': path.resolve(__dirname, '../src/widgets'),
66-
'~constants': resolve(__dirname, '../src/constants'),
63+
'~core': path.resolve(__dirname, '../components/src/core'),
64+
'~widgets': path.resolve(__dirname, '../components/src/widgets'),
65+
'~constants': path.resolve(__dirname, '../components/src/constants'),
6766
};
6867

6968
return config;
File renamed without changes.

jest.config.js renamed to components/jest.config.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
2+
rootDir: __dirname,
23
moduleFileExtensions: [
34
'js',
45
'json',
@@ -37,17 +38,14 @@ module.exports = {
3738

3839
coverageDirectory: '<rootDir>/test/coverage/',
3940

40-
coveragePathIgnorePatterns: [
41-
'<rootDir>/dist/',
42-
'<rootDir>/helpers/',
43-
'<rootDir>/node_modules/',
44-
'<rootDir>/src/stories/',
45-
],
46-
4741
testEnvironment: 'jsdom',
4842
testEnvironmentOptions: {
4943
url: 'http://localhost/',
5044
},
5145

5246
coverageProvider: 'v8',
47+
48+
testEnvironmentOptions: {
49+
customExportConditions: ["node", "node-addons"],
50+
},
5351
};
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)