Skip to content

Commit

Permalink
chore: swtich to npm (#150)
Browse files Browse the repository at this point in the history
* chore: switch to npm

* chore: update gh actions

* chore: fix deps

* chore: npm latest

* chore: rm .yarn

* chore: fix build failing

* chore: fix docs build failing

* chore: fix failing tests

bundled regeneratorRuntime has been changed as rollup bump.
  • Loading branch information
aladdin-add committed Jun 10, 2022
1 parent 7da5de4 commit 9e91fcb
Show file tree
Hide file tree
Showing 12 changed files with 866 additions and 2,009 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,14 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 16.x
- name: npm latest
run: npm i -g npm@latest

- name: Install deps and build (with cache)
run: yarn install && yarn build
run: npm install && npm run build

- name: Lint codebase
run: yarn lint:post-build

# - name: Deduplicate dependencies
# run: yarn deduplicate:check
run: npm run lint:post-build

test:
name: Test on Node ${{ matrix.node }} and ${{ matrix.os }}
Expand All @@ -54,8 +53,11 @@ jobs:
with:
node-version: ${{ matrix.node }}

- name: npm latest
run: npm i -g npm@latest

- name: Install deps and build (with cache)
run: yarn install && yarn build
run: npm install && npm run build

- name: Test package
run: yarn test:post-build
run: npm run test:post-build
4 changes: 2 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn build
yarn lint-staged
npm run build
npx lint-staged
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
363 changes: 0 additions & 363 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

785 changes: 0 additions & 785 deletions .yarn/releases/yarn-3.2.0.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarnrc.yml

This file was deleted.

51 changes: 26 additions & 25 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{
"name": "docs",
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"export": "next export && touch out/.nojekyll"
},
"dependencies": {
"@chakra-ui/react": "latest",
"@emotion/react": "latest",
"@emotion/styled": "latest",
"dokz": "latest",
"framer-motion": "latest",
"markdown-to-jsx": "^7.1.5",
"next": "^12.0.4",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"devDependencies": {
"@next/eslint-plugin-next": "^12.0.4",
"compose-function": "^3.0.3",
"eslint-config-next": "^12.0.4"
}
"name": "docs",
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"export": "next export && touch out/.nojekyll"
},
"dependencies": {
"@chakra-ui/react": "1",
"@emotion/react": "11",
"@emotion/styled": "11",
"@mdx-js/react": "^1.6.22",
"dokz": "2",
"framer-motion": "6",
"markdown-to-jsx": "^7.1.5",
"next": "^12.0.4",
"react": "^17.0.2",
"react-dom": "^17.0.2"
},
"devDependencies": {
"@next/eslint-plugin-next": "^12.0.4",
"compose-function": "^3.0.3",
"eslint-config-next": "^12.0.4"
}
}
Loading

0 comments on commit 9e91fcb

Please sign in to comment.