diff --git a/.eslintrc b/.eslintrc index 2ba1af32..a0b7f172 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,6 +1,9 @@ { "root": true, "extends": "@1stg", + "rules": { + "react/react-in-jsx-scope": "off" + }, "overrides": [ { "files": "*.mdx", diff --git a/.markuplintrc b/.markuplintrc new file mode 100644 index 00000000..d0f82ef5 --- /dev/null +++ b/.markuplintrc @@ -0,0 +1,3 @@ +{ + "extends": "@1stg/markuplint-config/angular" +} diff --git a/.markuplintrc.js b/.markuplintrc.js deleted file mode 100644 index 0677f594..00000000 --- a/.markuplintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@1stg/markuplint-config/angular') diff --git a/.npmrc b/.npmrc index 0f255843..7a4b7218 100644 --- a/.npmrc +++ b/.npmrc @@ -1,8 +1,10 @@ auto-install-peers=true +prefer-workspace-packages=true public-hoist-pattern[]=@1stg/* public-hoist-pattern[]=*babel* public-hoist-pattern[]=@commitlint/* public-hoist-pattern[]=@pkgr/* +public-hoist-pattern[]=@types/* public-hoist-pattern[]=browserslist public-hoist-pattern[]=cross-env public-hoist-pattern[]=*eslint* @@ -15,5 +17,4 @@ public-hoist-pattern[]=simple-git-hooks public-hoist-pattern[]=*stylelint* public-hoist-pattern[]=*svelte* public-hoist-pattern[]=tslib -prefer-workspace-packages=true strict-peer-dependencies=false diff --git a/.remarkrc b/.remarkrc index 63d195b5..f9f36579 100644 --- a/.remarkrc +++ b/.remarkrc @@ -1,5 +1,5 @@ { "plugins": [ - "@1stg/remark-config" + "@1stg/config" ] } diff --git a/CHANGELOG.md b/CHANGELOG.md index 985a8254..6496fd16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# CHANGELOG +# Change Log All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. diff --git a/package.json b/package.json index de2961ef..b69ef7d5 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "lint:es": "eslint . --cache -f friendly", "lint:style": "stylelint . --cache", "lint:tsc": "tsc --noEmit", - "prepare": "simple-git-hooks || exit 0", + "prepare": "simple-git-hooks", "release": "changeset publish", "test": "jest", "typecov": "type-coverage" @@ -36,6 +36,7 @@ "@1stg/remark-config": "workspace:*", "@1stg/simple-git-hooks": "workspace:*", "@1stg/stylelint-config": "workspace:*", + "@1stg/tsconfig": "workspace:*", "@angular/compiler": "^14.0.5", "@angular/compiler-cli": "^14.0.5", "@angular/core": "^14.0.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 45c85a36..6d261af2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,6 +18,7 @@ importers: '@1stg/remark-config': workspace:* '@1stg/simple-git-hooks': workspace:* '@1stg/stylelint-config': workspace:* + '@1stg/tsconfig': workspace:* '@angular/compiler': ^14.0.5 '@angular/compiler-cli': ^14.0.5 '@angular/core': ^14.0.5 @@ -49,6 +50,7 @@ importers: '@1stg/remark-config': link:packages/remark-config '@1stg/simple-git-hooks': link:packages/simple-git-hooks '@1stg/stylelint-config': link:packages/stylelint-config + '@1stg/tsconfig': link:packages/tsconfig '@angular/compiler': 14.0.5_@angular+core@14.0.5 '@angular/compiler-cli': 14.0.5_zpefgt72khwrbcajczg5cki5ui '@angular/core': 14.0.5_rxjs@7.5.5+zone.js@0.11.6 diff --git a/tests/test1.jsx b/tests/test1.jsx index bf58871b..9fbec586 100644 --- a/tests/test1.jsx +++ b/tests/test1.jsx @@ -1,6 +1,6 @@ -import React, { useState } from 'react' +import { useState, PureComponent } from 'react' -export default class Test extends React.PureComponent { +export default class Test extends PureComponent { render() { return
Hello
} diff --git a/tests/test3.tsx b/tests/test3.tsx index 3fbfd4af..a0a30475 100644 --- a/tests/test3.tsx +++ b/tests/test3.tsx @@ -1,6 +1,6 @@ -import React, { useState } from 'react' +import { PureComponent, useState } from 'react' -export default class Test extends React.PureComponent { +export default class Test extends PureComponent { static a = 1 b?: string diff --git a/tsconfig.json b/tsconfig.json index 0008955b..b20e6711 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,3 @@ { - "extends": "./packages/tsconfig/angular", - "compilerOptions": { - "baseUrl": "." - } + "extends": "@1stg/tsconfig/ng-lib" }