Skip to content

Commit

Permalink
Merge pull request #212 from zyfra/feat/nx-plugin
Browse files Browse the repository at this point in the history
chore: release 1.0.0-beta.34
  • Loading branch information
ZurabDev authored Apr 26, 2023
2 parents 428bd4d + 573a6e8 commit e16e3cd
Show file tree
Hide file tree
Showing 101 changed files with 1,529 additions and 38,970 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"files": ["*.ts", "*.tsx"],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
"rules": {
"@typescript-eslint/explicit-function-return-type": "off",
"no-unused-vars": "off",
"no-duplicate-imports": "error",
"@typescript-eslint/member-ordering": ["warn"],
Expand All @@ -34,7 +35,6 @@
"fixToUnknown": true
}
],
"@typescript-eslint/explicit-function-return-type": ["error"],
"@typescript-eslint/explicit-member-accessibility": [
"error",
{
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ _Выберите нужное отметив галочку [x]_
- [ ] `@prizm-ui/theme`
- [ ] `@prizm-ui/charts`
- [ ] `@prizm-ui/ast`
- [ ] `@prizm-ui/cb3-to-prizm`
- [ ] `@prizm-ui/nx-plugin`
-

### Компонент
Expand Down Expand Up @@ -47,7 +47,7 @@ Dependencies:
```
➜ npm ls @prizm-ui/components
@prizm-ui/components 1.0.0-beta.33
@prizm-ui/components 1.0.0-beta.34
```

```
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ assignees: ''
- [ ] `@prizm-ui/theme`
- [ ] `@prizm-ui/charts`
- [ ] `@prizm-ui/ast`
- [ ] `@prizm-ui/cb3-to-prizm`
- [ ] `@prizm-ui/nx-plugin`
-

### Компонент
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ assignees: ''
- [ ] `@prizm-ui/theme`
- [ ] `@prizm-ui/charts`
- [ ] `@prizm-ui/ast`
- [ ] `@prizm-ui/cb3-to-prizm`
- [ ] `@prizm-ui/nx-plugin`

### Компонент

Expand All @@ -33,7 +33,7 @@ v16.13.0

Dependencies:

`@prizm-ui/components 1.0.0-beta.33`
`@prizm-ui/components 1.0.0-beta.34`

Операционная ситема:

Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- [ ] `@prizm-ui/theme`
- [ ] `@prizm-ui/charts`
- [ ] `@prizm-ui/ast`
- [ ] `@prizm-ui/cb3-to-prizm`
- [ ] `@prizm-ui/nx-plugin`

### Компонент

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- run: cd dist/libs/theme && npm publish --access public --verbose || exit_code=0
- run: cd dist/libs/icons/base && npm publish --access public --verbose || exit_code=0
- run: cd dist/libs/icons/flags && npm publish --access public --verbose || exit_code=0
- run: cd dist/libs/cb3-to-prizm && npm publish --access public --verbose || exit_code=0
- run: cd dist/libs/plugin && npm publish --access public --verbose || exit_code=0
- run: cd dist/libs/ast && npm publish --access public --verbose || exit_code=0
- run: npx nx build charts-base
- run: cd dist/libs && ls -ls || exit_code=0
Expand Down
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ Build library:
- echo "_auth=$NPM_AUTH_TOKEN" >> .npmrc
- cp .npmrc ~/
- npm --userconfig ~/.npmrc install && npm --userconfig ~/.npmrc run all
- npm --userconfig ~/.npmrc install && npm --userconfig ~/.npmrc run build:doc
artifacts:
expire_in: 1 day
paths:
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/issue_templates/bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Dependencies:
```
➜ npm ls @prizm-ui/zyfra-components
@prizm-ui/zyfra-components 1.0.0-beta.33
@prizm-ui/zyfra-components 1.0.0-beta.34
```

```
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/issue_templates/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ v16.13.0

Dependencies:

`@prizm-ui/components 1.0.0-beta.33`
`@prizm-ui/components 1.0.0-beta.34`

Операционная ситема:

Expand Down
106 changes: 72 additions & 34 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,40 +53,6 @@
},
"tags": []
},
"cb3-to-prizm": {
"root": "libs/cb3-to-prizm",
"sourceRoot": "libs/cb3-to-prizm/src",
"projectType": "library",
"architect": {
"build": {
"builder": "@nrwl/node:package",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/libs/cb3-to-prizm",
"tsConfig": "libs/cb3-to-prizm/tsconfig.lib.json",
"packageJson": "libs/cb3-to-prizm/package.json",
"main": "libs/cb3-to-prizm/src/index.ts",
"assets": ["libs/cb3-to-prizm/*.md"]
}
},
"lint": {
"builder": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/cb3-to-prizm/**/*.ts"]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/cb3-to-prizm"],
"options": {
"jestConfig": "libs/cb3-to-prizm/jest.config.js",
"passWithNoTests": true
}
}
},
"tags": []
},
"charts-base": {
"projectType": "library",
"root": "libs/charts/base",
Expand Down Expand Up @@ -642,6 +608,78 @@
},
"tags": []
},
"plugin": {
"root": "libs/plugin",
"sourceRoot": "libs/plugin/src",
"projectType": "library",
"architect": {
"lint": {
"builder": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/plugin/**/*.ts"]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/plugin"],
"options": {
"jestConfig": "libs/plugin/jest.config.js",
"passWithNoTests": true
}
},
"build": {
"builder": "@nrwl/node:package",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/libs/plugin",
"tsConfig": "libs/plugin/tsconfig.lib.json",
"packageJson": "libs/plugin/package.json",
"main": "libs/plugin/src/index.ts",
"assets": [
"libs/plugin/*.md",
{
"input": "./libs/plugin/src",
"glob": "**/!(*.ts)",
"output": "./src"
},
{
"input": "./libs/plugin/src",
"glob": "**/*.d.ts",
"output": "./src"
},
{
"input": "./libs/plugin",
"glob": "generators.json",
"output": "."
},
{
"input": "./libs/plugin",
"glob": "executors.json",
"output": "."
}
]
}
}
},
"tags": []
},
"plugin-e2e": {
"root": "apps/plugin-e2e",
"projectType": "application",
"sourceRoot": "apps/plugin-e2e/src",
"architect": {
"e2e": {
"builder": "@nrwl/nx-plugin:e2e",
"options": {
"target": "plugin:build",
"jestConfig": "apps/plugin-e2e/jest.config.js"
}
}
},
"tags": [],
"implicitDependencies": ["plugin"]
},
"schematics": {
"projectType": "library",
"root": "libs/schematics",
Expand Down
14 changes: 13 additions & 1 deletion apps/doc/src/app/about-prizm/changelog/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,25 @@

All notable changes to this project will be documented in this file.

## [1.0.0-beta.34](https:/zyfra/Prizm) (27-04-2023)

### Features

- feat(plugin): new @prizm-ui/nx-plugin with all our generators and executors for manipulate code
- feat(doc): new page with info how to use our migrator
- feat(ast): now our code manipulator support changing in new ts version >4.7

### BREAKING CHANGES

- feat(testid): update data-testid attributes by RFC [MR](https:/zyfra/Prizm/pull/206)
- feat(cb3-to-prizm): remove @prizm-ui/cb3-to-prizm lib, move to @prizm-ui/nx-plugin

## [1.0.0-beta.33](https:/zyfra/Prizm) (24-04-2023)

### Features

- feat(cb3-to-prizm): add textarea support to migrate
- feat(doc/ast): add example with migration of textarea
-

### BUG FIXES

Expand Down
8 changes: 0 additions & 8 deletions apps/doc/src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -689,14 +689,6 @@ export const ROUTES: Routes = [
title: 'Overlay',
},
},
{
path: 'tools/cb3-to-prizm',
loadChildren: (): Promise<unknown> =>
import('./tools/cb3-to-prizm/cb3-to-prizm.module').then(i => i.Cb3ToPrizmModule),
data: {
title: 'CB3 to Prizm',
},
},
{
path: 'tools/ast',
loadChildren: (): Promise<unknown> => import('./tools/ast/ast.module').then(i => i.AstModule),
Expand Down
25 changes: 22 additions & 3 deletions apps/doc/src/app/forZIIoT/migration/migration.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,23 @@
<prizm-doc-page header="Migration Guide" package="guide" type="guide" class="info-page">
We later add migration guides from previous ui library to Prizm. <br />
Please wait for a while.
<prizm-doc-page header="Migration Guide">
<div class="page-description" description>Update cb3 to PRIZM using our library with plugins</div>

<ng-template prizmDocPageTab>
Для запуска нашего мигратора в вашем проекте
<prizm-doc-code
filename="Запуск"
[code]="'nx generate @prizm-ui/nx-plugin:migrate-from-cb3 --project=[YOU PROJECT NAME] '"
></prizm-doc-code>
<prizm-doc-code
filename="Запуск c prettier"
[code]="
'nx generate @prizm-ui/nx-plugin:migrate-from-cb3 --project=[YOU PROJECT NAME] --runPrettier true'
"
></prizm-doc-code>
</ng-template>

<ng-template prizmDocPageTab>
<ol class="b-demo-steps">
<prizm-doc-code filename="Установка" [code]="'npm i @prizm-ui/nx-plugin'"></prizm-doc-code>
</ol>
</ng-template>
</prizm-doc-page>
6 changes: 0 additions & 6 deletions apps/doc/src/app/pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -623,12 +623,6 @@ export const pages: PrizmOrderedDocPage = [
keywords: 'overlay, оверлей, modal, модальное',
route: '/tools/overlay',
},
{
section: SectionNameEnum.tools,
title: 'CB3 to prizm',
keywords: 'migrator, cb3, prizm, мигратор',
route: '/tools/cb3-to-prizm',
},
{
section: SectionNameEnum.tools,
title: 'AST',
Expand Down
17 changes: 0 additions & 17 deletions apps/doc/src/app/tools/cb3-to-prizm/cb3-to-prizm.component.html

This file was deleted.

8 changes: 0 additions & 8 deletions apps/doc/src/app/tools/cb3-to-prizm/cb3-to-prizm.component.ts

This file was deleted.

16 changes: 0 additions & 16 deletions apps/doc/src/app/tools/cb3-to-prizm/cb3-to-prizm.module.ts

This file was deleted.

2 changes: 1 addition & 1 deletion apps/doc/src/app/version-manager/versions.constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export interface PrizmVersionMeta {

export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [
{
label: '1.0.0-beta.33',
label: '1.0.0-beta.34',
baseHref: '',
},
{
Expand Down
14 changes: 14 additions & 0 deletions apps/plugin-e2e/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = {
displayName: 'plugin-e2e',
preset: '../../jest.preset.js',
globals: {
'ts-jest': {
tsconfig: '<rootDir>/tsconfig.spec.json',
},
},
transform: {
'^.+\\.[tj]s$': 'ts-jest',
},
moduleFileExtensions: ['ts', 'js', 'html'],
coverageDirectory: '../../coverage/apps/plugin-e2e',
};
Loading

0 comments on commit e16e3cd

Please sign in to comment.