Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
cshawaus committed Jul 14, 2023
2 parents 01847cf + 2d71162 commit 077eb19
Show file tree
Hide file tree
Showing 9 changed files with 4,232 additions and 5,073 deletions.
20 changes: 13 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,30 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
name: Install Node.js
with:
node-version: "14"
node-version: 16

- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8.6.7

- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm i --frozen-lockfile

- name: Lint our source code
run: yarn lint
run: pnpm lint

- name: Build
run: yarn build
run: pnpm build

- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HUSKY: "0"
HUSKY: '0'
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: yarn semantic-release
run: pnpm semantic-release
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
Expand Down Expand Up @@ -65,9 +62,6 @@ typings/
# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test
Expand Down
2 changes: 1 addition & 1 deletion .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn commitlint --edit $1
pnpm commitlint --edit $1
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

46 changes: 25 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
},
"version": "7.0.0",
"engines": {
"node": ">= 14"
"node": ">= 16",
"pnpm": ">= 8.5"
},
"keywords": [
"aem",
Expand Down Expand Up @@ -41,8 +42,8 @@
},
"scripts": {
"clean": "rimraf lib/*",
"dev": "yarn bundle --watch",
"build": "yarn clean && yarn bundle",
"dev": "pnpm bundle --watch",
"build": "pnpm clean && pnpm bundle",
"bundle": "tsup src/index.ts --sourcemap --dts --format cjs,esm --outDir lib",
"lint": "eslint --ext .ts src/**",
"prepare": "husky install",
Expand All @@ -62,32 +63,35 @@
},
"dependencies": {
"debug": "^4.3.4",
"es-module-lexer": "^1.1.0",
"magic-string": "^0.26.7",
"es-module-lexer": "^1.3.0",
"magic-string": "^0.30.1",
"rollup": "^3.26.2",
"rollup-pluginutils": "^2.8.2",
"vite": "^2.9.15"
"vite": "^4.4.4"
},
"devDependencies": {
"@commitlint/cli": "^17.3.0",
"@commitlint/config-conventional": "^17.3.0",
"@semantic-release/changelog": "^6.0.2",
"@commitlint/cli": "^17.6.6",
"@commitlint/config-conventional": "^17.6.6",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@types/debug": "^4.1.7",
"@types/node": "^14.18.33",
"@typescript-eslint/eslint-plugin": "^5.45.0",
"@typescript-eslint/parser": "^5.45.0",
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"@types/debug": "^4.1.8",
"@types/node": "^16.18.38",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"husky": "^8.0.2",
"prettier": "^2.8.0",
"eslint-plugin-prettier": "^5.0.0",
"husky": "^8.0.3",
"prettier": "^3.0.0",
"rimraf": "^5.0.1",
"semantic-release": "^19.0.5",
"tsup": "^6.5.0",
"typescript": "^4.9.3"
"tsup": "^7.1.0",
"typescript": "^5.1.6"
},
"peerDependencies": {
"vite": "^2.6.0 || ^3.0.0"
"rollup": "^2.0.0 || ^3.0.0",
"vite": "^3.0.0 || ^4.0.0"
},
"optionalDependencies": {
"fsevents": "~2.3.2"
Expand Down

0 comments on commit 077eb19

Please sign in to comment.