Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NFX-133 setting up npm workflows and github pages #2

Merged
merged 17 commits into from
Jul 31, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
NFX-132 changed ollion to nonfx
vikas-cldcvr committed Jul 31, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 7fc9091c196f2183ca08d22a442eeb84939498d6
39 changes: 12 additions & 27 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build

on:
push:
pull_request:
branches:
- main

@@ -10,16 +10,9 @@ defaults:
shell: bash
working-directory: .

env:
DISTRIBUTION_ID: E2ZI9E4QTG3PZ9
BUCKET_NAME: flow.ollion.com
AWS_REGION: us-east-1
ROLE_NAME: flow.ollion.com-role
ACCOUNT_ID: 679519065279

jobs:
build:
name: Build and upload to amazon s3
name: Build and Deploy to GitHub Pages
runs-on: ubuntu-latest
permissions:
id-token: write
@@ -28,31 +21,23 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v2

- name: Setup Node.js 18.x
- name: Setup Node.js 20.x
uses: actions/setup-node@v2
with:
node-version: 18.x
node-version: 20.x

- name: Install pnpm
run: corepack enable && corepack prepare [email protected] --activate

- name: Install Dependencies and Build
run: make build

- name: Configure AWS credentials from Test account
uses: aws-actions/configure-aws-credentials@v1
- name: Setup Pages
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
role-to-assume: arn:aws:iam::${{env.ACCOUNT_ID}}:role/${{env.ROLE_NAME}}
aws-region: ${{env.AWS_REGION}}

- name: Check Access
run: |
aws sts get-caller-identity
- name: Copy files to the website with the AWS CLI
run: |
aws s3 sync storybook-static/ s3://${{env.BUCKET_NAME}}/v2/
- name: Invalidate CloudFront
run: |
aws cloudfront create-invalidation --distribution-id ${{env.DISTRIBUTION_ID}} --paths "/*"
path: "storybook-static/"
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
24 changes: 12 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Test and Release

on:
push:
pull_request:
branches:
- main

@@ -44,17 +44,17 @@ jobs:
released-package-versions: ${{ steps.changesets.outputs.publishedPackages }}
changelog-files-config: |
{
"@ollion/flow-log":"packages/flow-log/CHANGELOG.md",
"@ollion/flow-code-editor":"packages/flow-code-editor/CHANGELOG.md",
"@ollion/flow-md-editor":"packages/flow-md-editor/CHANGELOG.md",
"@ollion/flow-text-editor":"packages/flow-text-editor/CHANGELOG.md",
"@ollion/flow-core":"packages/flow-core/CHANGELOG.md",
"@ollion/flow-table":"packages/flow-table/CHANGELOG.md",
"@ollion/flow-core-config":"packages/flow-core-config/CHANGELOG.md",
"@ollion/flow-form-builder":"packages/flow-form-builder/CHANGELOG.md",
"@ollion/flow-lineage":"packages/flow-lineage/CHANGELOG.md",
"@ollion/flow-dashboard":"packages/flow-dashboard/CHANGELOG.md",
"@ollion/custom-elements-manifest-to-types":"packages/custom-elements-manifest-to-types/CHANGELOG.md"
"@nonfx/flow-log":"packages/flow-log/CHANGELOG.md",
"@nonfx/flow-code-editor":"packages/flow-code-editor/CHANGELOG.md",
"@nonfx/flow-md-editor":"packages/flow-md-editor/CHANGELOG.md",
"@nonfx/flow-text-editor":"packages/flow-text-editor/CHANGELOG.md",
"@nonfx/flow-core":"packages/flow-core/CHANGELOG.md",
"@nonfx/flow-table":"packages/flow-table/CHANGELOG.md",
"@nonfx/flow-core-config":"packages/flow-core-config/CHANGELOG.md",
"@nonfx/flow-form-builder":"packages/flow-form-builder/CHANGELOG.md",
"@nonfx/flow-lineage":"packages/flow-lineage/CHANGELOG.md",
"@nonfx/flow-dashboard":"packages/flow-dashboard/CHANGELOG.md",
"@nonfx/custom-elements-manifest-to-types":"packages/custom-elements-manifest-to-types/CHANGELOG.md"
}
- name: Send Slack Notification
4 changes: 2 additions & 2 deletions .storybook/code-sandbox.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ export function getCodeSandBoxUrl(story) {
const params = getParameters({
files: {
"index.js": {
content: `import "@ollion/flow-core";
content: `import "@nonfx/flow-core";
import "@ollion/flow-system-icon";
document.getElementById("app").innerHTML =\`${story}\`
`,
@@ -33,7 +33,7 @@ export function getCodeSandBoxUrl(story) {
content: {
dependencies: {
"@ollion/flow-system-icon": "latest",
"@ollion/flow-core": "latest"
"@nonfx/flow-core": "latest"
}
}
}
2 changes: 1 addition & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ const alias = [
"flow-table",
"flow-dashboard"
].map(pkg => ({
find: `@ollion/${pkg}`,
find: `@nonfx/${pkg}`,
replacement: path.resolve(__dirname, "../packages", pkg, "src")
}));

22 changes: 11 additions & 11 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -4,17 +4,17 @@ import ProductIconPack from "@ollion/flow-product-icon/dist/types/icon-pack";
import GcpIconPack from "@ollion/flow-gcp-icon/dist/types/icon-pack";
import AwsIconPack from "@ollion/flow-aws-icon/dist/types/icon-pack";

import { ConfigUtil } from "@ollion/flow-core-config";
import { ConfigUtil } from "@nonfx/flow-core-config";
import { changeRoute } from "./utils";
import "@ollion/flow-core";
import "@ollion/flow-log";
import "@ollion/flow-code-editor";
import "@ollion/flow-table";
import "@ollion/flow-md-editor";
import "@ollion/flow-text-editor";
import "@ollion/flow-form-builder";
import "@ollion/flow-lineage";
import "@ollion/flow-dashboard";
import "@nonfx/flow-core";
import "@nonfx/flow-log";
import "@nonfx/flow-code-editor";
import "@nonfx/flow-table";
import "@nonfx/flow-md-editor";
import "@nonfx/flow-text-editor";
import "@nonfx/flow-form-builder";
import "@nonfx/flow-lineage";
import "@nonfx/flow-dashboard";

import { setCustomElementsManifest, setCustomElements } from "@storybook/web-components";
import { themes } from "@storybook/theming";
@@ -54,7 +54,7 @@ export const parameters = {
order: [
"About",
"foundation",
"@ollion",
"@nonfx",
[
"flow-core",
["About", "Release Notes"],
2 changes: 1 addition & 1 deletion ABOUT.md
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ When it comes to property values, Flow works with a list of default property val

Everything for front-end implementation that is available in Flow is required to exist as a Figma document as well. The Figma component properties will be the same properties for the front-end developer. This allows for better design handover + developer experience.

If you are a developer thas a new contribution to Flow and do not have Figma experience/skills, you can write to flow@ollion.com and someone from CloudCover’s design team will get in touch with you. Keep in mind that the designers are actively engaged in other products and a response/implementation might take a little time.
If you are a developer thas a new contribution to Flow and do not have Figma experience/skills, you can write to flow@nonfx.com and someone from CloudCover’s design team will get in touch with you. Keep in mind that the designers are actively engaged in other products and a response/implementation might take a little time.

## Everything as dependencies

8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ Thank you for your interest in contributing! 🎉👍

Flow is a framework that is made up of multiple dependencies / templates. Visit the [about.md](https://github.com/ollionorg/flow-core/blob/main/ABOUT.md) on the [flow-core repo](https://github.com/ollionorg/flow-core/) to learn more.

When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the [owners](https://github.com/ollionorg/flow-core/blob/main/CODEOWNERS) of this repository before making a change. You can expect a response from a maintainer within a week. If you haven’t heard anything by then, write to flow@ollion.com.
When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the [owners](https://github.com/ollionorg/flow-core/blob/main/CODEOWNERS) of this repository before making a change. You can expect a response from a maintainer within a week. If you haven’t heard anything by then, write to flow@nonfx.com.

Please note we have a code of conduct, please follow it in all your interactions with the project.

@@ -39,7 +39,7 @@ All issues as tracked here. Once you have resolved an issue,
- Flow color tokens have been consumed and no custom tokens have been created.
- Create a pull request in this repository by uploading your dependency package.
- In the PR description link to the respective figma page/file
- Include screenshots, animated GIFs or videos of the feature, you can also send it to flow@ollion.com with a reference to the PR.
- Include screenshots, animated GIFs or videos of the feature, you can also send it to flow@nonfx.com with a reference to the PR.

### Design and define new components

@@ -49,7 +49,7 @@ All issues as tracked here. Once you have resolved an issue,
### Flow Documentation

- Guidlines coming soon
- If you would like to contribute to this document and guidlines, write into flow@ollion.com
- If you would like to contribute to this document and guidlines, write into flow@nonfx.com

## Pull Request Process

@@ -115,7 +115,7 @@ further defined and clarified by project maintainers.
### Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [gcf-team](mailto:gcf-team@ollion.com). All
reported by contacting the project team at [gcf-team](mailto:gcf-team@nonfx.com). All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ For a new project, Flow has put together starter kits with basic dependencies to
- [Aungular](https://github.com/ollionorg/flow-starterkit-angular)
- [React](https://github.com/ollionorg/flow-starterkit-react)

If you would like to contribute to an existing starter kit or write a new one for a different framework, write to <flow@ollion.com> or ping on our slack channel.
If you would like to contribute to an existing starter kit or write a new one for a different framework, write to <flow@nonfx.com> or ping on our slack channel.

**VScode Plugin**: [Install Flow's Plugin](https://marketplace.visualstudio.com/items?itemName=dev-vikas.flow-intellisense-vscode) to access components, icons, values, etc, and documentation inside of VScode.

@@ -45,7 +45,7 @@ If you would like to contribute to an existing starter kit or write a new one fo

#### 1️⃣ Install flow core

`npm i --save @ollion/flow-core`
`npm i --save @nonfx/flow-core`

_Note:_ after installation re-start your application.

@@ -56,7 +56,7 @@ _Note:_ after installation re-start your application.
Copy and import the below snippet into your startup file. In **VueJS:** (src/main.ts or main.js), **Angular:** (src/main.ts), **React:** (src/index.tsx or index.jsx)

```JavaScript
import "@ollion/flow-core";
import "@nonfx/flow-core";
```

<br>
@@ -67,20 +67,20 @@ import "@ollion/flow-core";
Copy paste below line in your `main.ts` file.

```JavaScript
import "@ollion/flow-core/dist/types/vue2";
import "@nonfx/flow-core/dist/types/vue2";
```

or

```JavaScript
import "@ollion/flow-core/dist/types/vue3";
import "@nonfx/flow-core/dist/types/vue3";
```

**React**
Include react type in `tsconfig.json` like below

```JSON
"include": ["src", "./node_modules/@ollion/flow-core/dist/types/react.ts"]
"include": ["src", "./node_modules/@nonfx/flow-core/dist/types/react.ts"]
```

**Note:** after adding the snippets, re-start your application.
@@ -98,7 +98,7 @@ npm i --save @ollion/flow-system-icon
### 2️⃣ Import the icon pack

```javascript
import "@ollion/flow-core";
import "@nonfx/flow-core";
import "@ollion/flow-system-icon";
```

@@ -136,4 +136,4 @@ Visit the [Flow templates Storybook](https://flow.ollion.com/templates/index.htm

## Get in touch

If you would like to get in touch or contribute, please write to <flow@ollion.com>.
If you would like to get in touch or contribute, please write to <flow@nonfx.com>.
2 changes: 1 addition & 1 deletion SUPPORT.md
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ There are several avenues available to you for obtaining support for Flow Lineag

**Documentation:** Flow Lineage comes with comprehensive documentation that includes installation instructions, usage guidelines, and troubleshooting information, know issues file, etc. Please refer to the documentation first as it may have the answers to your questions.

**Email:** If you prefer to contact us directly, you can send an email to flow@ollion.com . Please provide a detailed description of your issue or question, along with any relevant information, and we will get back to you as soon as possible.
**Email:** If you prefer to contact us directly, you can send an email to flow@nonfx.com . Please provide a detailed description of your issue or question, along with any relevant information, and we will get back to you as soon as possible.

## How to Request Support

2 changes: 1 addition & 1 deletion docs/how-to-apply-ollion-theme.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
Run the following magic spell to transform your existing theme into the enchanting `f-ollion-dark`.

```Javascript
import { ConfigUtil } from "@ollion/flow-core";
import { ConfigUtil } from "@nonfx/flow-core";
ConfigUtil.setConfig({ theme: "f-ollion-dark" });
```

6 changes: 3 additions & 3 deletions docs/nuxt3-integration.md
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ Before we dive into the integration process, make sure you have a basic understa
To get started, install the Flow Web Component library in your Nuxt project using your preferred package manager:

```bash
npm i --save @ollion/flow-core
npm i --save @nonfx/flow-core
```

### Step 2: Register Flow components through a Nuxt plugin
@@ -26,8 +26,8 @@ export default defineNuxtPlugin({
enforce: "pre",
async setup(_nuxtApp) {
await Promise.all([
import("@ollion/flow-core"),
import("@ollion/flow-form-builder"),
import("@nonfx/flow-core"),
import("@nonfx/flow-form-builder"),
import("@ollion/flow-system-icon")
]).then(() => {
console.log("Flow components loaded");
2 changes: 1 addition & 1 deletion generate-types.cjs
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

const fs = require("fs-extra");
const path = require("path");
const { transformSchema } = require("@ollion/custom-elements-manifest-to-types");
const { transformSchema } = require("@nonfx/custom-elements-manifest-to-types");
const { execSync } = require("child_process");

const dirPaths = execSync('find ./packages -name "custom-elements.json"', {
27 changes: 14 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
"postinstall": "tsc -b"
},
"engines": {
"node": "^18.12.0",
"node": "^20.16.0",
"pnpm": ">=8.9.0"
},
"keywords": [
@@ -37,7 +37,7 @@
"devDependencies": {
"@changesets/cli": "^2.25.0",
"@faker-js/faker": "^8.3.1",
"@ollion/custom-elements-manifest-to-types": "workspace:*",
"@nonfx/custom-elements-manifest-to-types": "workspace:*",
"@ollion/prettier-config": "^2.1.0",
"@storybook/addon-a11y": "^7.6.12",
"@storybook/addon-actions": "^7.5.3",
@@ -72,18 +72,18 @@
},
"dependencies": {
"@ollion/flow-aws-icon": "latest",
"@ollion/flow-code-editor": "workspace:*",
"@ollion/flow-core": "workspace:*",
"@ollion/flow-dashboard": "workspace:*",
"@ollion/flow-form-builder": "workspace:*",
"@nonfx/flow-code-editor": "workspace:*",
"@nonfx/flow-core": "workspace:*",
"@nonfx/flow-dashboard": "workspace:*",
"@nonfx/flow-form-builder": "workspace:*",
"@ollion/flow-gcp-icon": "latest",
"@ollion/flow-lineage": "workspace:*",
"@ollion/flow-log": "workspace:*",
"@ollion/flow-md-editor": "workspace:*",
"@ollion/flow-text-editor": "workspace:*",
"@nonfx/flow-lineage": "workspace:*",
"@nonfx/flow-log": "workspace:*",
"@nonfx/flow-md-editor": "workspace:*",
"@nonfx/flow-text-editor": "workspace:*",
"@ollion/flow-product-icon": "1.14.0",
"@ollion/flow-system-icon": "latest",
"@ollion/flow-table": "workspace:*",
"@nonfx/flow-table": "workspace:*",
"d3": "^7.6.1",
"jspdf": "^2.5.1",
"lit": "^3.1.0"
@@ -98,5 +98,6 @@
"mobile": false
}
}
}
}
},
"packageManager": "[email protected]+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e"
}
2 changes: 1 addition & 1 deletion packages/custom-elements-manifest-to-types/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @ollion/custom-elements-manifest-to-types
# @nonfx/custom-elements-manifest-to-types

## [2.0.5] - 2024-07-08

Loading