Skip to content

Commit

Permalink
use lerna cli, remove nrwl plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
yuvalotem1 committed Dec 18, 2022
1 parent 38c32e3 commit 47084f1
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 47 deletions.
24 changes: 6 additions & 18 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,22 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"extends": [
"next",
"next/core-web-vitals"
],
"ignorePatterns": ["!**/*"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
"@next/next/no-html-link-for-pages": ["error", "apps/demo-saas/pages"]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
}
]
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ clean: ##@1 Global uninstall node modules, remove transpiled code & lock files

clean-%:
@rm -rf ./packages/${*}/dist
@rm -rf ./packages/${*}/.next
@rm -rf ./packages/${*}/node_modules
@rm -rf ./packages/${*}/package-lock.json
@rm -rf ./packages/${*}/yarn.lock
Expand Down Expand Up @@ -117,7 +118,7 @@ pretty:
@yarn prettier-hook

demo:
@cd ./packages/demo-saas && yarn start
@cd ./packages/demo-saas && yarn dev

publish-packages-next:
@cp ./.npmrc "./packages/nextjs/dist/.npmrc"
Expand Down
13 changes: 6 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
"license": "MIT",
"private": true,
"scripts": {
"start": "cd packages/demo-saas && yarn dev",
"start-next12": "cd packages/demo-saas-next12 && yarn dev",
"clean": "rm -rf ./node_modules",
"build": "cd packages/nextjs && yarn build:watch",
"build-demo-saas": "cd packages/demo-saas && yarn build",
"clean": "lerna run clean && rm -rf ./node_modules",
"dev": "lerna run build:watch --stream --scope '@frontegg/nextjs'",
"demo": "lerna run dev --stream --scope '@frontegg/demo-saas'",
"demo12": "lerna run dev --stream --scope '@frontegg/demo-saas-next12'",
"build": "lerna run build --stream --scope '@frontegg/nextjs'",
"prettier-hook": "prettier --config ./.prettierrc --write .",
"prettier-check-hook": "prettier --config ./.prettierrc --check .",
"prepublishOnly": "make move-package-json-to-dist"
"prettier-check-hook": "prettier --config ./.prettierrc --check ."
},
"devDependencies": {
"@rollup/plugin-node-resolve": "^8.0.1",
Expand Down
10 changes: 0 additions & 10 deletions packages/demo-saas-next12/jest.config.ts

This file was deleted.

3 changes: 2 additions & 1 deletion packages/demo-saas-next12/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "@frontegg/demo-saas-next-12",
"name": "@frontegg/demo-saas-next12",
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"clean": "rm -rf ./node_modules && rm -rf ./.next",
"lint": "next lint"
},
"dependencies": {
Expand Down
10 changes: 0 additions & 10 deletions packages/demo-saas/jest.config.ts

This file was deleted.

1 change: 1 addition & 0 deletions packages/demo-saas/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"clean": "rm -rf ./node_modules && rm -rf ./.next",
"lint": "next lint"
},
"dependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"scripts": {
"build": "rm -rf dist && mkdir dist && rollup -c ./rollup.config.js",
"build:watch": "rm -rf dist && mkdir dist && rollup -w -c ./rollup.config.js",
"clean": "rm -rf ./node_modules && rm -rf ./dist",
"test": "jest --runInBand --passWithNoTests -c ../../scripts/jest.config.json --rootDir ."
},
"dependencies": {
Expand Down

0 comments on commit 47084f1

Please sign in to comment.