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

Dev/wip next app #690

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
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
129 changes: 71 additions & 58 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,52 @@ jobs:
- name: Run Test
run: CI=true pnpm jest --coverage

install-build:
name: Build and upload artifacts
# install-build:
# name: Build and upload artifacts
# runs-on: ubuntu-latest
# if: github.repository_owner == 'dflex-js' && github.event.pull_request.draft != true
# steps:
# - name: Check out repository
# uses: actions/checkout@v3

# - name: Cache pnpm modules
# uses: actions/cache@v3
# with:
# path: ~/.pnpm-store
# key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
# restore-keys: |
# ${{ runner.os }}-

# - uses: pnpm/action-setup@v2.4.0
# with:
# version: ^8.0.0
# run_install: true

# - name: Use latest version of Node.j
# uses: actions/setup-node@v3
# with:
# node-version: "*"
# cache: "pnpm"

# - name: Build packages
# run: "pnpm clean && pnpm -r emit && pnpm build --production --release --minify"

# - name: Build DnD React App
# run: pnpm -F dflex-dnd-playground build --mode CI

# - name: Upload Package Artifacts
# uses: actions/upload-artifact@v3
# with:
# name: build
# path: |
# packages/**/dist
# packages/**/types
# if-no-files-found: error

e2e-same-container-vertical:
name: One Container Vertically - Chrome
runs-on: ubuntu-latest
timeout-minutes: 20
if: github.repository_owner == 'dflex-js' && github.event.pull_request.draft != true
steps:
- name: Check out repository
Expand All @@ -136,56 +179,24 @@ jobs:
node-version: "*"
cache: "pnpm"

# - name: Download Build Artifacts
# uses: actions/download-artifact@v3
# with:
# name: build
# path: ./packages

# - name: Download Build Artifacts
# uses: actions/download-artifact@v3
# with:
# name: build
# path: ./packages

- name: Build packages
run: "pnpm clean && pnpm -r emit && pnpm build --production --release --minify"

- name: Build DnD React App
run: pnpm -F dflex-dnd-playground build --mode CI

- name: Upload Package Artifacts
uses: actions/upload-artifact@v3
with:
name: build
path: |
packages/**/dist
packages/**/types
if-no-files-found: error

e2e-same-container-vertical:
name: One Container Vertically - Chrome
runs-on: ubuntu-latest
needs: install-build
timeout-minutes: 20
if: github.repository_owner == 'dflex-js' && github.event.pull_request.draft != true
steps:
- name: Check out repository
uses: actions/checkout@v3

- name: Cache pnpm modules
uses: actions/cache@v3
with:
path: ~/.pnpm-store
key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-

- uses: pnpm/action-setup@v2.4.0
with:
version: ^8.0.0
run_install: true

- name: Use latest version of Node.j
uses: actions/setup-node@v3
with:
node-version: "*"
cache: "pnpm"

- name: Download Build Artifacts
uses: actions/download-artifact@v3
with:
name: build
path: ./packages

- name: Testing features for DnD with React APP - Chrome
run: pnpm test-e2e-vertical:chrome

Expand All @@ -194,7 +205,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 20
if: github.repository_owner == 'dflex-js' && github.event.pull_request.draft != true
needs: install-build
# needs: install-build
steps:
- name: Check out repository
uses: actions/checkout@v3
Expand All @@ -218,11 +229,17 @@ jobs:
node-version: "*"
cache: "pnpm"

- name: Download Build Artifacts
uses: actions/download-artifact@v3
with:
name: build
path: ./packages
# - name: Download Build Artifacts
# uses: actions/download-artifact@v3
# with:
# name: build
# path: ./packages

- name: Build packages
run: "pnpm clean && pnpm -r emit && pnpm build --production --release --minify"

- name: Build DnD React App
run: pnpm -F dflex-dnd-playground build --mode CI

- name: Testing features for DnD with React APP - Chrome
run: pnpm test-e2e-multi:chrome
Expand Down Expand Up @@ -412,7 +429,6 @@ jobs:
lint,
unit-test,
types,
install-build,
e2e-same-container-vertical,
e2e-multi-containers,
e2e-mac,
Expand Down Expand Up @@ -445,11 +461,8 @@ jobs:
node-version: "*"
cache: "pnpm"

- name: Download Build Artifacts
uses: actions/download-artifact@v3
with:
name: build
path: ./packages
- name: Build packages for production
run: "pnpm clean && pnpm -r emit && pnpm build --production --release --minify"

- name: Create Release Pull Request or Publish to npm
id: changesets
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,33 +41,33 @@
"size": "pnpm build-prod && pnpm size-limit"
},
"devDependencies": {
"@babel/preset-typescript": "^7.22.5",
"@babel/preset-typescript": "^7.22.11",
"@changesets/cli": "^2.26.2",
"@playwright/test": "^1.35.1",
"@playwright/test": "^1.37.1",
"@size-limit/preset-big-lib": "^8.2.6",
"@types/jest": "^29.5.2",
"@types/node": "^20.3.2",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@types/jest": "^29.5.4",
"@types/node": "^20.5.8",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react": "^4.0.1",
"@vitejs/plugin-react": "^4.0.4",
"cross-env": "^7.0.3",
"cypress": "^12.16.0",
"cypress": "^13.1.0",
"eslint-config-dflex": "workspace:*",
"istanbul-lib-instrument": "^5.2.1",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"prettier": "^2.8.8",
"istanbul-lib-instrument": "^6.0.0",
"jest": "^29.6.4",
"jest-environment-jsdom": "^29.6.4",
"prettier": "^3.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.14.0",
"react-router-dom": "^6.15.0",
"rimraf": "^5.0.1",
"size-limit": "^8.2.6",
"start-server-and-test": "^2.0.0",
"ts-jest": "^29.1.0",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"typescript": "^5.1.5",
"vite": "^4.3.9",
"typescript": "^5.2.2",
"vite": "^4.4.9",
"vite-plugin-replace": "^0.1.1"
},
"size-limit": [
Expand Down
Loading
Loading