Skip to content

Commit 1cd2934

Browse files
Merge pull request #3 from emulsify-ds/feat-emulsify-core-upgrade-3.x
RELEASE: upgrade emulsify core to 3.x branch
2 parents a8c16ec + 5814471 commit 1cd2934

20 files changed

Lines changed: 177 additions & 107 deletions

.cli/init.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,14 @@ const main = () => {
140140
from: '../emulsify.libraries.yml',
141141
to: `../${machineName}.libraries.yml`,
142142
},
143+
{
144+
from: '../config/install/emulsify.settings.yml',
145+
to: `../config/install/${machineName}.settings.yml'`,
146+
},
147+
{
148+
from: '../config/schema/emulsify.schema.yml',
149+
to: `../config/schema/${machineName}.schema.yml`,
150+
},
143151
]);
144152

145153
// Update info.yml file.

.github/workflows/contributors.yml

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Add contributors
22
on:
3-
schedule:
4-
- cron: '20 20 * * *'
53
push:
64
branches:
75
- main
@@ -10,15 +8,29 @@ on:
108
jobs:
119
add-contributors:
1210
runs-on: ubuntu-latest
11+
permissions:
12+
contents: write
1313
steps:
14-
- uses: actions/checkout@v3
15-
- uses: BobAnkh/add-contributors@master
14+
- uses: actions/checkout@v4
1615
with:
17-
CONTRIBUTOR: '### Contributors'
18-
COLUMN_PER_ROW: '6'
19-
ACCESS_TOKEN: ${{secrets.ADD_TO_PROJECT_PAT}}
20-
IMG_WIDTH: '100'
21-
FONT_SIZE: '14'
22-
PATH: '/README.md'
23-
COMMIT_MESSAGE: 'docs(README): update contributors'
24-
AVATAR_SHAPE: 'round'
16+
fetch-depth: 0
17+
token: ${{ secrets.CONTRIBUTORS_TOKEN }}
18+
19+
- name: Setup Node.js
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: '24'
23+
24+
- name: Install all-contributors-cli
25+
run: npm install -g all-contributors-cli
26+
27+
- name: Generate contributors
28+
run: |
29+
all-contributors generate
30+
git config --global user.name 'GitHub Actions'
31+
git config --global user.email 'github-actions@github.com'
32+
git add README.md
33+
git commit -m "docs: update contributors" || exit 0
34+
git push
35+
env:
36+
GITHUB_TOKEN: ${{ secrets.CONTRIBUTORS_TOKEN }}

.github/workflows/semantic-release.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
name: Release
1+
name: Semantic Release on Merge
22
on:
33
push:
44
branches: [main]
55
jobs:
66
release:
7+
name: Attempt Semantic Release
78
runs-on: ubuntu-latest
89
steps:
910
- name: Checkout
10-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1112
with:
1213
fetch-depth: 0
1314
- name: Install Node.js
14-
uses: actions/setup-node@v3
15+
uses: actions/setup-node@v4
1516
with:
16-
node-version: '20'
17+
node-version: '24.x'
1718
- name: Install
1819
run: npm install
1920
- name: Release

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
24
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { defineConfig } from "eslint/config";
2+
import {default as emulsifyCoreConfig} from "../../node_modules/@emulsify/core/config/eslint.config.js";
3+
4+
export default defineConfig(
5+
6+
// apply an array config to a subset of files
7+
{
8+
files: ["../../src/**/*.js"],
9+
extends: [emulsifyCoreConfig]
10+
},
11+
12+
// your modifications
13+
{
14+
rules: {
15+
"no-unused-vars": "warn"
16+
}
17+
}
18+
);

config/emulsify-core/eslintrc.config.json

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

config/emulsify-core/storybook/example.theme.js

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

config/emulsify-core/storybook/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ const configOverrides = {};
2727
// },
2828
// };
2929

30-
module.exports = {configOverrides};
30+
export default configOverrides;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!-- Add scripts or css files to render for the entire storybook instance outside the preview window. -->
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<!-- Add scripts or css files to render for every stories.js file within the preview window. -->

0 commit comments

Comments
 (0)