Skip to content

Commit

Permalink
ci: use gitsubmodule
Browse files Browse the repository at this point in the history
  • Loading branch information
splincode committed Sep 19, 2023
1 parent 6744776 commit 7ac1776
Show file tree
Hide file tree
Showing 99 changed files with 2,106 additions and 2,113 deletions.
4 changes: 0 additions & 4 deletions .browserslistrc

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/auto-add-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
automate-project-columns:
runs-on: ubuntu-latest
steps:
- uses: taiga-family/ci/actions/setup-project@1.12.4
- uses: taiga-family/ci/actions/setup-project@1.13.0
with:
token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }}
4 changes: 2 additions & 2 deletions .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
pull-requests: write
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/two-approve@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0
- uses: taiga-family/ci/actions/two-approve@1.13.0
if: env.TAIGA_FAMILY_BOT_IS_AUTHOR == 'true'
with:
token1: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-author-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0

- name: Auto assign
if: env.IS_OWNER_MODE == 'true'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-cleanup-caches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/cleanup-cache@1.12.4
- uses: taiga-family/ci/actions/cleanup-cache@1.13.0
if: github.event_name == 'push'
with:
branch-name: ${{ github.head_ref || github.ref_name }}
- uses: taiga-family/ci/actions/cleanup-cache@1.12.4
- uses: taiga-family/ci/actions/cleanup-cache@1.13.0
if: github.event_name == 'pull_request'
with:
branch-name: refs/pull/${{ github.event.pull_request.number }}/merge
2 changes: 1 addition & 1 deletion .github/workflows/auto-dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/dependency-review@1.12.4
- uses: taiga-family/ci/actions/dependency-review@1.13.0
2 changes: 1 addition & 1 deletion .github/workflows/auto-remove-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/auto-remove-label@1.12.4
- uses: taiga-family/ci/actions/auto-remove-label@1.13.0
4 changes: 2 additions & 2 deletions .github/workflows/build-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/setup-node@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0
- uses: taiga-family/ci/actions/setup-node@1.13.0

- name: Build demo
run: npm run build
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,15 @@ jobs:
name: Build libs
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/[email protected]
- uses: taiga-family/ci/actions/[email protected]
- uses: taiga-family/ci/actions/[email protected]
- uses: taiga-family/ci/actions/[email protected]
with:
node-path: |
**/node_modules/**
**/taiga-ui/node_modules/**
- run: ls taiga-ui
- run: npx nx show projects
- name: Build library
run: npx nx build tui-editor

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/setup-node@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0
- uses: taiga-family/ci/actions/setup-node@1.13.0

- run: npx nx build demo

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/setup-node@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0
- uses: taiga-family/ci/actions/setup-node@1.13.0

- name: Build demo for Github Pages
run: npx nx build-gh-pages demo

- uses: taiga-family/ci/actions/setup-deploy@1.12.4
- uses: taiga-family/ci/actions/setup-deploy@1.13.0
with:
token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }}
folder: dist/demo/browser
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/rebase@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0
- uses: taiga-family/ci/actions/rebase@1.13.0
continue-on-error: true
- uses: taiga-family/ci/actions/setup-node@1.12.4
- uses: taiga-family/ci/actions/setup-node@1.13.0

- name: Building demo-app of git-branch without cache
run: npx nx build demo --output-path ${{ env.DIST }}
Expand All @@ -31,8 +31,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/setup-node@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0
- uses: taiga-family/ci/actions/setup-node@1.13.0

- name: Download cache / ${{ env.CACHE_DIST_KEY }}
uses: actions/cache/[email protected]
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0

- name: Download artifacts / ${{ env.SNAPSHOTS_CACHE_KEY }}
continue-on-error: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/setup-node@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0
- uses: taiga-family/ci/actions/setup-node@1.13.0

- name: Lint check
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ jobs:
persist-credentials: false
ref: ${{ github.head_ref }}
token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }}
- uses: taiga-family/ci/actions/setup-node@1.12.4
- uses: taiga-family/ci/actions/setup-git@1.12.4
- uses: taiga-family/ci/actions/setup-node@1.13.0
- uses: taiga-family/ci/actions/setup-git@1.13.0
with:
token: ${{ secrets.TAIGA_FAMILY_BOT_PAT }}
- uses: taiga-family/ci/actions/setup-npm@1.12.4
- uses: taiga-family/ci/actions/setup-npm@1.13.0
with:
token: ${{ secrets.NPM_TOKEN }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/setup-node@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0
- uses: taiga-family/ci/actions/setup-node@1.13.0

- run: npx nx build demo
- run: tree ${{ env.DIST }} -P '*.html'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/variables@1.12.4
- uses: taiga-family/ci/actions/setup-node@1.12.4
- uses: taiga-family/ci/actions/variables@1.13.0
- uses: taiga-family/ci/actions/setup-node@1.13.0

- name: Run tests
run: npx nx test tui-editor
Expand Down
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "taiga-ui"]
path = taiga-ui
url = [email protected]:taiga-family/taiga-ui.git
branch = main
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
**/dist/**
**/coverage/**
package-lock.json
taiga-ui/**
.husky
2 changes: 1 addition & 1 deletion apps/demo-cypress/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "demo-cypress",
"name": "editor-demo-cypress",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/demo-cypress/cypress",
"projectType": "application",
Expand Down
17 changes: 10 additions & 7 deletions apps/demo/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "demo",
"name": "editor-demo",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/demo/src",
Expand All @@ -25,14 +25,17 @@
},
{
"glob": "**/*",
"input": "node_modules/@taiga-ui/icons/src",
"input": "taiga-ui/projects/icons/src",
"output": "assets/taiga-ui/icons"
}
],
"stylePreprocessorOptions": {
"includePaths": ["taiga-ui/projects/core/styles", "taiga-ui/projects/styles"]
},
"styles": [
"node_modules/@taiga-ui/core/styles/taiga-ui-theme.less",
"node_modules/@taiga-ui/core/styles/taiga-ui-fonts.less",
"node_modules/@taiga-ui/styles/taiga-ui-global.less",
"taiga-ui/projects/core/styles/taiga-ui-theme.less",
"taiga-ui/projects/core/styles/taiga-ui-fonts.less",
"taiga-ui/projects/styles/taiga-ui-global.less",
"apps/demo/src/styles.less"
],
"scripts": [
Expand Down Expand Up @@ -94,10 +97,10 @@
},
"configurations": {
"production": {
"browserTarget": "demo:build:production"
"browserTarget": "editor-demo:build:production"
},
"development": {
"browserTarget": "demo:build:development"
"browserTarget": "editor-demo:build:development"
}
},
"defaultConfiguration": "development"
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/app.browser.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ import {TuiLogoModule} from './modules/logo/logo.module';

return `${link}/${context.package.toLowerCase()}/src/lib/tui-editor/${(
context.header[0].toLowerCase() + context.header.slice(1)
).replace(/[A-Z]/g, m => `-${m.toLowerCase()}`)}`;
).replace(/[A-Z]/g, (m: string) => `-${m.toLowerCase()}`)}`;
},
},
],
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/app.style.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

:host {
font: var(--tui-font-text-m);
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/app/pages/color-picker/examples/4/index.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

input {
.fullsize();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

.tool-button {
.transition(background);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

.tool-button {
.transition(background);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

.tool-button {
.transition(background);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

.tool-button {
.transition(background);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

.loader {
.fullsize(fixed);
Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/styles.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/styles/taiga-ui-global';
@import 'taiga-ui-global';
@import '~highlight.js/styles/github.css';

body {
Expand Down
5 changes: 3 additions & 2 deletions apps/demo/webpack.config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {GLOBAL_DEFS_FOR_TERSER_WITH_AOT} from '@angular/compiler-cli';
import {tuiIsObject} from '@taiga-ui/cdk';
import TerserPlugin from 'terser-webpack-plugin';
import {Configuration} from 'webpack';
import {merge} from 'webpack-merge';
Expand Down Expand Up @@ -105,7 +104,9 @@ const config: Configuration = {
export default (ngConfigs: Configuration): Configuration => {
const ngRules = [...(ngConfigs.module?.rules || [])].map(rule => {
if (
tuiIsObject(rule) &&
// eslint-disable-next-line @taiga-ui/experience/no-typeof
typeof rule === `object` &&
!!rule &&
DO_NOT_MUTATE_RAW_FILE_CONTENTS.some(
pattern => rule.test instanceof RegExp && rule.test?.test(pattern),
)
Expand Down
5 changes: 1 addition & 4 deletions libs/tui-editor/abstract/ng-package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"lib": {
"entryFile": "index.ts",
"styleIncludePaths": [
"../../../core/styles"
]
"entryFile": "index.ts"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

:host {
.createStackingContext();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

:host {
.createStackingContext();
Expand Down
3 changes: 2 additions & 1 deletion libs/tui-editor/components/color-selector/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"lib": {
"entryFile": "index.ts",
"styleIncludePaths": [
"../../../core/styles"
"../../../../taiga-ui/projects/core/styles",
"../../../../taiga-ui/projects/styles"
]
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

:host {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion libs/tui-editor/components/edit-link/edit-link.style.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

:host {
display: block;
Expand Down
3 changes: 2 additions & 1 deletion libs/tui-editor/components/edit-link/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"lib": {
"entryFile": "index.ts",
"styleIncludePaths": [
"../../../core/styles"
"../../../../taiga-ui/projects/core/styles",
"../../../../taiga-ui/projects/styles"
]
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '@taiga-ui/core/styles/taiga-ui-local.less';
@import 'taiga-ui-local.less';

:host {
position: relative;
Expand Down
Loading

0 comments on commit 7ac1776

Please sign in to comment.