Skip to content
Merged
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
13 changes: 13 additions & 0 deletions .yarn/patches/@nrwl-js-npm-13.10.6-08130e9fbb.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/utils/check-dependencies.js b/src/utils/check-dependencies.js
index a217906583ac82d9e7881af4f02fc44f8afc04dc..ff5d6ea946c4c5b745d367f7070f00cfa166dcaa 100644
--- a/src/utils/check-dependencies.js
+++ b/src/utils/check-dependencies.js
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
function checkDependencies(context, tsConfigPath) {
const projectGraph = (0, devkit_1.readCachedProjectGraph)();
- const { target, dependencies, nonBuildableDependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
+ const { target, dependencies, nonBuildableDependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(projectGraph, context.root, context.projectName, context.targetName, context.configurationName, true);
const projectRoot = target.data.root;
if (nonBuildableDependencies.length > 0) {
throw new Error(`Buildable libraries can only depend on other buildable libraries. You must define the ${context.targetName} target for the following libraries: ${nonBuildableDependencies
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
diff --git a/src/executors/rollup/rollup.impl.js b/src/executors/rollup/rollup.impl.js
index b948c2e5f1228bb68fd820e396c332774322b13d..8d9f5d14aa57f8ec04d87394aa2c227533445d96 100644
index baca3a675716434819a482ace464c4afa9e51b5f..7861137cb48e7dbf09709dfbd09517ed898a7959 100644
--- a/src/executors/rollup/rollup.impl.js
+++ b/src/executors/rollup/rollup.impl.js
@@ -209,14 +209,14 @@ function createCompilerOptions(format, options, dependencies) {
paths: compilerOptionPaths,
};
if (format !== 'esm') {
- return Object.assign(Object.assign({}, compilerOptions), { target: 'es5' });
+ // return Object.assign(Object.assign({}, compilerOptions), { target: 'es5' });
}
return compilerOptions;
}
@@ -209,7 +209,7 @@ function createCompilerOptions(options, dependencies) {
function updatePackageJson(options, context, target, dependencies, packageJson) {
const entryFileTmpl = `./index.<%= extension %>.js`;
const typingsFile = (0, path_1.relative)(options.entryRoot, options.entryFile).replace(/\.[jt]sx?$/, '.d.ts');
Expand Down
26 changes: 0 additions & 26 deletions .yarn/patches/@nrwl-workspace-npm-13.4.5-233a3ec85c

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';

const InlineStylesProvider: React.FC = ({ children }) => {
const InlineStylesProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this relevant to the NX upgrade ? seems more like React 18 typings changed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh I see you bumped react types to 18 too

return <>{children}</>;
};

Expand Down
2 changes: 1 addition & 1 deletion apps/website/src/components/OutputTitle/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import { CogsIcon } from '../icons';
import styles from './styles.module.css';

const OutputTitle: React.FC = props => {
const OutputTitle: React.FC<{ children: React.ReactNode }> = props => {
return (
<div className={styles['container']}>
<CogsIcon />
Expand Down
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "lint", "test", "e2e", "build-storybook", "type-check"]
}
Expand Down
54 changes: 28 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,24 @@
"@docusaurus/module-type-aliases": "2.1.0",
"@docusaurus/preset-classic": "2.1.0",
"@emotion/css": "^11.9.0",
"@nrwl/cli": "13.4.5",
"@nrwl/eslint-plugin-nx": "13.4.5",
"@nrwl/jest": "13.4.5",
"@nrwl/js": "13.4.5",
"@nrwl/linter": "13.4.5",
"@nrwl/node": "13.4.5",
"@nrwl/react": "13.4.5",
"@nrwl/storybook": "13.4.5",
"@nrwl/tao": "13.4.5",
"@nrwl/web": "13.4.5",
"@nrwl/workspace": "13.4.5",
"@nrwl/cli": "13.10.6",
"@nrwl/eslint-plugin-nx": "13.10.6",
"@nrwl/jest": "13.10.6",
"@nrwl/js": "13.10.6",
"@nrwl/linter": "13.10.6",
"@nrwl/node": "13.10.6",
"@nrwl/react": "13.10.6",
"@nrwl/storybook": "13.10.6",
"@nrwl/web": "13.10.6",
"@nrwl/workspace": "13.10.6",
"@storybook/addon-essentials": "~6.4.5",
"@storybook/builder-webpack5": "~6.4.5",
"@storybook/core-server": "6.4.22",
"@storybook/manager-webpack5": "~6.4.5",
"@storybook/react": "~6.4.5",
"@svgr/webpack": "^5.4.0",
"@testing-library/jest-dom": "5.16.1",
"@testing-library/react": "12.1.2",
"@testing-library/react": "13.0.0",
"@testing-library/react-hooks": "7.0.2",
"@tsconfig/docusaurus": "^1.0.4",
"@types/babel__helper-plugin-utils": "7.10.0",
Expand All @@ -60,14 +60,14 @@
"@types/js-beautify": "^1.13.3",
"@types/mini-css-extract-plugin": "2.5.1",
"@types/node": "14.14.33",
"@types/react": "17.0.30",
"@types/react-dom": "17.0.9",
"@types/react": "18.0.0",
"@types/react-dom": "18.0.0",
"@types/stylis": "4.0.2",
"@types/tmp": "0.2.3",
"@types/webpack-env": "^1.17.0",
"@types/yargs": "^17.0.10",
"@typescript-eslint/eslint-plugin": "~5.3.0",
"@typescript-eslint/parser": "~5.3.0",
"@typescript-eslint/eslint-plugin": "5.18.0",
"@typescript-eslint/parser": "5.18.0",
"babel-jest": "27.2.3",
"babel-loader": "8.1.0",
"babel-plugin-annotate-pure-calls": "0.4.0",
Expand All @@ -79,14 +79,14 @@
"esbuild": "^0.14.43",
"esbuild-plugin-alias": "^0.2.1",
"esbuild-plugin-import-glob": "^0.1.1",
"eslint": "8.2.0",
"eslint": "8.12.0",
"eslint-config-prettier": "8.1.0",
"eslint-import-resolver-typescript": "2.5.0",
"eslint-plugin-import": "2.25.2",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jest": "^27.0.1",
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-react": "7.27.0",
"eslint-plugin-react-hooks": "4.3.0",
"eslint-plugin-react": "7.29.4",
"eslint-plugin-react-hooks": "4.4.0",
"highlight.js": "11.4.0",
"jest": "27.2.3",
"jest-chrome": "^0.7.2",
Expand All @@ -99,17 +99,19 @@
"monosize-storage-upstash": "0.0.8",
"nano-staged": "0.5.0",
"next": "12.2.4",
"prettier": "2.3.1",
"nx": "13.10.6",
"prettier": "2.8.2",
"prism-react-renderer": "1.2.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"react": "18.0.0",
"react-dom": "18.0.0",
"react-is": "18.0.0",
"react-test-renderer": "17.0.2",
"simple-git-hooks": "2.7.0",
"swc-node": "1.0.0",
"syncpack": "6.2.0",
"tmp": "0.2.1",
"ts-jest": "27.0.5",
"typescript": "~4.5.2",
"typescript": "4.7.4",
"url-loader": "^3.0.0",
"yargs": "^17.5.1"
},
Expand All @@ -135,8 +137,8 @@
},
"resolutions": {
"@docusaurus/[email protected]": "patch:@docusaurus/theme-common@npm:2.1.0#.yarn/patches/@docusaurus-theme-common-npm-2.1.0-d5ae2a9539.patch",
"@nrwl/web": "patch:@nrwl/web@npm:13.4.5#.yarn/patches/@nrwl-web-npm-13.4.5-d7e9ea40d2",
"@nrwl/workspace": "patch:@nrwl/workspace@npm:13.4.5#.yarn/patches/@nrwl-workspace-npm-13.4.5-233a3ec85c",
"@nrwl/[email protected]": "patch:@nrwl/js@npm:13.10.6#.yarn/patches/@nrwl-js-npm-13.10.6-08130e9fbb.patch",
"@nrwl/[email protected]": "patch:@nrwl/web@npm:13.10.6#.yarn/patches/@nrwl-web-npm-13.10.6-0fda8b81ed.patch",
"[email protected]": "patch:beachball@npm:2.31.5#.yarn/patches/beachball-npm-2.31.5-0e84ec4233.patch",
"[email protected]": "patch:source-map-js@npm:1.0.2#.yarn/patches/source-map-js-npm-1.0.2-ee4f9f9b30.patch"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-preset/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
},
"build": {
"executor": "@nrwl/node:package",
"executor": "@nrwl/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/packages/babel-preset",
Expand Down
8 changes: 6 additions & 2 deletions packages/eslint-plugin/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
},
"build": {
"executor": "@nrwl/node:package",
"executor": "@nrwl/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/packages/eslint-plugin",
Expand All @@ -40,7 +40,11 @@
"executor": "@nrwl/workspace:run-commands",
"options": {
"cwd": "packages/babel-preset",
"commands": [{ "command": "tsc -b --pretty" }],
"commands": [
{
"command": "tsc -b --pretty"
}
],
"outputPath": []
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-serializer/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
},
"build": {
"executor": "@nrwl/node:package",
"executor": "@nrwl/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/packages/jest-serializer",
Expand Down
4 changes: 3 additions & 1 deletion packages/jest-serializer/src/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ const TestResetComponent: React.FC<{ id?: string }> = ({ id }) => {
return <div data-testid={id} className={className} />;
};

const RtlWrapper: React.FC = ({ children }) => <TextDirectionProvider dir="rtl">{children}</TextDirectionProvider>;
const RtlWrapper: React.FC<{ children: React.ReactNode }> = ({ children }) => (
<TextDirectionProvider dir="rtl">{children}</TextDirectionProvider>
);

describe('serializer', () => {
it('should check styles', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/next-extraction-plugin/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
},
"build": {
"executor": "@nrwl/node:package",
"executor": "@nrwl/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/packages/next-extraction-plugin",
Expand Down
2 changes: 1 addition & 1 deletion packages/webpack-extraction-plugin/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
},
"build": {
"executor": "@nrwl/node:package",
"executor": "@nrwl/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/packages/webpack-extraction-plugin",
Expand Down
2 changes: 1 addition & 1 deletion packages/webpack-loader/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}
},
"build": {
"executor": "@nrwl/node:package",
"executor": "@nrwl/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/packages/webpack-loader",
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@griffel/jest-serializer": ["packages/jest-serializer/src/index.ts"],
"@griffel/next-extraction-plugin": ["packages/next-extraction-plugin/src/index.ts"],
"@griffel/react": ["packages/react/src/index.ts"],
"@griffel/webpack-loader": ["packages/webpack-loader/src/index.ts"],
"@griffel/webpack-extraction-plugin": ["packages/webpack-extraction-plugin/src/index.ts"]
"@griffel/webpack-extraction-plugin": ["packages/webpack-extraction-plugin/src/index.ts"],
"@griffel/webpack-loader": ["packages/webpack-loader/src/index.ts"]
},
"typeRoots": ["node_modules/@types", "./typings"]
},
Expand Down
6 changes: 3 additions & 3 deletions workspace.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"version": 2,
"projects": {
"@griffel/benchmark": "apps/benchmark",
"@griffel/babel-preset": "packages/babel-preset",
"@griffel/benchmark": "apps/benchmark",
"@griffel/core": "packages/core",
"@griffel/devtools": "packages/devtools",
"@griffel/e2e-nextjs": "e2e/nextjs",
"@griffel/e2e-utils": "e2e/utils",
"@griffel/e2e-typescript": "e2e/typescript",
"@griffel/e2e-utils": "e2e/utils",
"@griffel/eslint-plugin": "packages/eslint-plugin",
"@griffel/jest-serializer": "packages/jest-serializer",
"@griffel/next-extraction-plugin": "packages/next-extraction-plugin",
"@griffel/react": "packages/react",
"@griffel/webpack-loader": "packages/webpack-loader",
"@griffel/webpack-extraction-plugin": "packages/webpack-extraction-plugin",
"@griffel/webpack-loader": "packages/webpack-loader",
"@griffel/website": "apps/website"
}
}
Loading