Skip to content

Commit 43eaab8

Browse files
committed
fixed linting, bumped up zibri version
1 parent 02756d8 commit 43eaab8

File tree

7 files changed

+75
-64
lines changed

7 files changed

+75
-64
lines changed

.github/workflows/cd.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
types: [closed]
55
branches: [release]
66

7+
permissions:
8+
id-token: write
9+
contents: read
10+
711
jobs:
812
deploy:
913
if: github.event.pull_request.merged
@@ -12,8 +16,12 @@ jobs:
1216
- uses: actions/checkout@v4
1317
with:
1418
ref: release
15-
- run: npm ci
16-
- run: npm run build
17-
- uses: JS-DevTools/npm-publish@v3
19+
- uses: actions/setup-node@v4
1820
with:
19-
token: ${{ secrets.NPM_TOKEN }}
21+
node-version: '20'
22+
registry-url: 'https://registry.npmjs.org'
23+
# Ensure npm 11.5.1 or later is installed
24+
- run: npm install -g npm@latest
25+
- run: npm i
26+
- run: npm run build
27+
- run: npm publish

eslint.config.mjs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// For more info, see https://github.com/storybookjs/eslint-plugin-storybook#configuration-flat-config-format
2-
import storybook from "eslint-plugin-storybook";
3-
41
import { configs } from 'eslint-config-service-soft';
52

63
// eslint-disable-next-line jsdoc/require-description
74
/** @type {import('eslint').Linter.Config} */
8-
export default [...configs, {
9-
ignores: ['src/__testing__/tmp/*', 'src/__testing__/coverage/*', 'sandbox']
10-
}, ...storybook.configs["flat/recommended"]];
5+
export default [
6+
...configs,
7+
{
8+
ignores: ['src/__testing__/tmp/*', 'src/__testing__/coverage/*', 'sandbox']
9+
}
10+
];

package-lock.json

Lines changed: 39 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"engines": {
77
"node": ">=20"
88
},
9+
"repository": {
10+
"url": "https://github.com/Service-Soft/monux-cli"
11+
},
912
"keywords": [
1013
"monux",
1114
"mx",

src/__testing__/mock/file-mock.utilities.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ export abstract class FileMockUtilities {
197197

198198
private static async createAppRoutesServerTs(mockConstants: MockConstants): Promise<void> {
199199
await FsUtilities.createFile(mockConstants.ANGULAR_APP_ROUTES_SERVER_TS, [
200-
`import { RenderMode, ServerRoute } from '@angular/ssr';`,
200+
'import { RenderMode, ServerRoute } from \'@angular/ssr\';',
201201
'',
202-
`export const serverRoutes: ServerRoute[] = [`,
202+
'export const serverRoutes: ServerRoute[] = [',
203203
'\t{',
204-
`\t\tpath: '**',`,
205-
`\t\trenderMode: RenderMode.Prerender`,
204+
'\t\tpath: \'**\',',
205+
'\t\trenderMode: RenderMode.Prerender',
206206
'\t}',
207207
'];'
208208
], true, false);
@@ -228,17 +228,17 @@ export abstract class FileMockUtilities {
228228

229229
private static async createAppConfigServer(mockConstants: MockConstants): Promise<void> {
230230
await FsUtilities.createFile(mockConstants.ANGULAR_APP_CONFIG_SERVER_TS, [
231-
`import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';`,
232-
`import { provideServerRendering, withRoutes } from '@angular/ssr';`,
231+
'import { mergeApplicationConfig, ApplicationConfig } from \'@angular/core\';',
232+
'import { provideServerRendering, withRoutes } from \'@angular/ssr\';',
233233
'',
234-
`import { appConfig } from './app.config';`,
235-
`import { serverRoutes } from './app.routes.server';`,
234+
'import { appConfig } from \'./app.config\';',
235+
'import { serverRoutes } from \'./app.routes.server\';',
236236
'',
237-
`const serverConfig: ApplicationConfig = {`,
238-
`\tproviders: [provideServerRendering(withRoutes(serverRoutes))]`,
239-
`};`,
237+
'const serverConfig: ApplicationConfig = {',
238+
'\tproviders: [provideServerRendering(withRoutes(serverRoutes))]',
239+
'};',
240240
'',
241-
`export const config: ApplicationConfig = mergeApplicationConfig(appConfig, serverConfig);`
241+
'export const config: ApplicationConfig = mergeApplicationConfig(appConfig, serverConfig);'
242242
], true, false);
243243
}
244244

src/npm/npm-utilities.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ describe('NpmUtilities', () => {
1919
'{',
2020
' "name": "@library/library",',
2121
' "version": "1.0.0",',
22+
' "description": "",',
2223
' "main": "index.js",',
2324
' "scripts": {',
2425
' "test": "echo \\\"Error: no test specified\\\" && exit 1"',
2526
' },',
2627
' "keywords": [],',
2728
' "author": "",',
2829
' "license": "ISC",',
29-
' "description": ""',
30+
' \"type\": \"commonjs\"',
3031
'}'
3132
]);
3233
}, MAX_ADD_TIME);

src/zibri/zibri.utilities.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type ZibriCliOptions<T extends ZibriCliCommands>
3737
*/
3838
export abstract class ZibriUtilities {
3939

40-
private static readonly CLI_VERSION: string = '1.6.4';
40+
private static readonly CLI_VERSION: string = '2.1.1';
4141

4242
/**
4343
* Runs a zibri cli command inside the provided directory.

0 commit comments

Comments
 (0)