Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Experiment: Monorepo refactor #30247

Open
wants to merge 37 commits into
base: next
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1617cd1
just moving some core around
ndelangen Jan 10, 2025
a2f0a32
install
ndelangen Jan 10, 2025
9c79233
fix references to ../scripts
ndelangen Jan 10, 2025
8edfc4c
adjust scripts paths
ndelangen Jan 10, 2025
ac06f03
adjust scripts paths
ndelangen Jan 10, 2025
fd8cb1f
cleanup
ndelangen Jan 11, 2025
f6b8958
working check in core
ndelangen Jan 11, 2025
b1a229e
successful compile of core
ndelangen Jan 11, 2025
cd778e1
working compile
ndelangen Jan 11, 2025
36160bd
linting config fixes
ndelangen Jan 11, 2025
557433b
fix linting config file
ndelangen Jan 11, 2025
e518577
apply linting fixes
ndelangen Jan 11, 2025
bf7c88f
linting fixes
ndelangen Jan 11, 2025
35d38b5
fix markdown linting
ndelangen Jan 11, 2025
53be741
cleanup
ndelangen Jan 11, 2025
c19b85c
fix mocks paths
ndelangen Jan 11, 2025
df79790
Merge branch 'next' into norbert/monorepo-unsplit
ndelangen Jan 11, 2025
a62eed4
improve CI config
ndelangen Jan 11, 2025
d54794c
fix CI config
ndelangen Jan 11, 2025
b84e002
fix lockfile
ndelangen Jan 11, 2025
91a2c33
use --immutable
ndelangen Jan 11, 2025
ba4f0f5
fixes
ndelangen Jan 11, 2025
ee883be
fix for CI config
ndelangen Jan 11, 2025
53ffc20
fix CI config
ndelangen Jan 11, 2025
d26420a
somehow not available in CI, but is locally
ndelangen Jan 11, 2025
46a4f51
cleanup
ndelangen Jan 11, 2025
1514a11
fix verdaccio paths
ndelangen Jan 11, 2025
6b31bde
rename
ndelangen Jan 11, 2025
46326b2
overhaul workspace restore
ndelangen Jan 11, 2025
f8b352f
fix paths in package.json
ndelangen Jan 11, 2025
a1dea9d
fix knip config file paths
ndelangen Jan 11, 2025
d19f5aa
do not detect our monorepo as nx project
ndelangen Jan 11, 2025
355608e
dedupe typescript lib
ndelangen Jan 11, 2025
21c6c19
fix problem with addon docs not getting detected by nx
ndelangen Jan 11, 2025
74fab79
disable catch-all story pattern in main.ts
ndelangen Jan 11, 2025
af32484
fix path
ndelangen Jan 11, 2025
1a15887
fix a few tests
ndelangen Jan 12, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Next Next commit
just moving some core around
  • Loading branch information
ndelangen committed Jan 10, 2025
commit 1617cd12023a91b997ccd7e8065b8bf0b267ce33
The diff you're trying to view is too large. We only load the first 3000 changed files.
File renamed without changes.
File renamed without changes.
File renamed without changes.
47 changes: 44 additions & 3 deletions code/.eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
const path = require('path');

const scriptPath = path.join(__dirname, '..', 'scripts');


module.exports = {
root: true,
extends: [path.join(scriptPath, '.eslintrc.cjs')],
extends: [
//
'@storybook/eslint-config-storybook',
'plugin:storybook/recommended',
'plugin:depend/recommended'
],

parserOptions: {
tsconfigRootDir: __dirname,
project: ['./tsconfig.json'],
},
plugins: ['local-rules'],
rules: {
// remove as shared eslint has jest rules removed
'@typescript-eslint/ban-ts-comment': 'error',
'@typescript-eslint/consistent-type-imports': ['error', { disallowTypeAnnotations: false }],
'no-use-before-define': 'off',
'eslint-comments/disable-enable-pair': ['error', { allowWholeFile: true }],
"depend/ban-dependencies": ["error", {
"modules": ["lodash", "chalk", "qs", "handlebars", "fs-extra"]
}],

'import/no-extraneous-dependencies': [
'error',
{ devDependencies: true, peerDependencies: true },
Expand Down Expand Up @@ -42,6 +56,33 @@ module.exports = {
'@typescript-eslint/default-param-last': 'off',
},
overrides: [
{
files: ['*.mjs'],
rules: {
'import/extensions': ['error', 'always'],
},
},
{
files: [
'*.js',
'*.jsx',
'*.json',
'*.html',
'**/.storybook/*.ts',
'**/.storybook/*.tsx',
],
parserOptions: {
project: null,
},
rules: {
// '@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/dot-notation': 'off',
'@typescript-eslint/no-implied-eval': 'off',
'@typescript-eslint/no-throw-literal': 'off',
'@typescript-eslint/return-await': 'off',
},
},

{
files: ['**/templates/virtualModuleModernEntry.js'],
rules: {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/handle-release-branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- id: next-version
uses: notiz-dev/github-action-json-property@release
with:
path: ${{ github.workspace }}/next/code/package.json
path: ${{ github.workspace }}/next/package.json
prop_path: version

- run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ jobs:
- name: Apply deferred version bump and commit
working-directory: .
run: |
CURRENT_VERSION=$(cat ./code/package.json | jq '.version')
DEFERRED_NEXT_VERSION=$(cat ./code/package.json | jq '.deferredNextVersion')
CURRENT_VERSION=$(cat ./package.json | jq '.version')
DEFERRED_NEXT_VERSION=$(cat ./package.json | jq '.deferredNextVersion')

if [[ "$DEFERRED_NEXT_VERSION" == "null" ]]; then
echo "No deferred version set, not bumping versions"
Expand Down
36 changes: 18 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
vite.config.*.timestamp*

node_modules
*.log
.idea
Expand All @@ -12,20 +14,18 @@ test-results
/repros
/sandbox
/bench
/code/bench
.verdaccio-cache
.next
/.npmrc

# Yarn stuff
/**/.yarn/*
!/**/.yarn/releases
!/**/.yarn/plugins
!/**/.yarn/sdks
!/**/.yarn/versions
!/**/.yarn/patches
/.yarn/*
!/.yarn/releases
!/.yarn/plugins
!/.yarn/sdks
!/.yarn/versions
!/.yarn/patches
/**/.pnp.*
!/node_modules

# test-storybooks
test-storybooks/ember-cli/ember-output
Expand All @@ -38,7 +38,7 @@ npm-shrinkwrap.json
coverage/
*.lerna_backup
/**/LICENSE
code/docs/public
docs/public
package-lock.json
storybook-static
.jest-test-results.json
Expand All @@ -47,19 +47,19 @@ storybook-static
/addons/docs/common/config-*
tsconfig.tsbuildinfo

code/test-results/
code/playwright-results/
code/playwright-report/
code/playwright/.cache/
code/bench-results/
test-results/
playwright-results/
playwright-report/
playwright/.cache/
bench-results/

/packs
code/.nx/cache
code/.nx/workspace-data
code/.vite-inspect
.nx/cache
.nx/workspace-data
.vite-inspect
.nx/cache
.nx/workspace-data
!**/fixtures/**/yarn.lock
code/core/report
core/report

*storybook.log
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
"javascript.preferences.importModuleSpecifier": "relative",
"javascript.preferences.quoteStyle": "single",
"js/ts.implicitProjectConfig.target": "ESNext",
"prettier.ignorePath": "./code/.prettierignore",
"storyExplorer.storybookConfigDir": "./code/.storybook",
"prettier.ignorePath": "./.prettierignore",
"storyExplorer.storybookConfigDir": "./.storybook",
"typescript.format.enable": false,
"typescript.preferences.importModuleSpecifier": "relative",
"typescript.preferences.preferTypeOnlyAutoImports": true,
"typescript.preferences.quoteStyle": "single",
"typescript.preferGoToSourceDefinition": true,
"typescript.tsdk": "./code/node_modules/typescript/lib",
"vitest.workspaceConfig": "./code/vitest.workspace.ts"
"typescript.tsdk": "./node_modules/typescript/lib",
"vitest.workspaceConfig": "./vitest.workspace.ts"
}
File renamed without changes.
40 changes: 35 additions & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,41 @@
compressionLevel: mixed
compressionLevel: 0

enableGlobalCache: false
enableGlobalCache: true

installStatePath: ./.yarn/root-install-state.gz
installStatePath: ./.yarn/root.gz

logFilters:
- code: YN0005
level: discard
- code: YN0076
level: discard

nodeLinker: node-modules

npmPublishAccess: public
npmRegistryServer: 'https://registry.yarnpkg.com'

plugins:
- path: ./.yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: '@yarnpkg/plugin-typescript'
- path: ./.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: '@yarnpkg/plugin-interactive-tools'
- path: ./.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'

# See https://github.com/nrwl/nx/issues/22177
supportedArchitectures:
cpu:
- current
- x64
- arm64
os:
- current
- linux
- darwin

unsafeHttpWhitelist:
- localhost

yarnPath: .yarn/releases/yarn-4.3.0.cjs
yarnPath: ./.yarn/releases/yarn-4.3.0.cjs
# Sometimes you get a "The remote archive doesn't match the expected checksum" error, uncommenting this line will fix it
# checksumBehavior: 'update'
136 changes: 68 additions & 68 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -13,85 +13,85 @@
# /scripts/release/ @jreinhold @ndelangen @kasperpeulen

# Addons
# /code/addons/a11y/ @ndelangen @yannbf
# /code/addons/actions/ @ndelangen @yannbf
# /code/addons/backgrounds/ @yannbf @ndelangen
# /code/addons/controls/ @kasperpeulen @ndelangen
# /code/addons/docs/ @JReinhold @kasperpeulen
# /code/addons/essentials/ @valentinpalkovic @ndelangen
# /code/addons/gfm/ @ndelangen @valentinpalkovic
# /code/addons/highlight/ @yannbf @valentinpalkovic
# /code/addons/interactions/ @yannbf @ndelangen
# /code/addons/jest/ @ndelangen
# /code/addons/links/ @yannbf @JReinhold
# /code/addons/measure/ @yannbf @valentinpalkovic
# /code/addons/outline/ @yannbf @valentinpalkovic
# /code/addons/storysource/ @ndelangen
# /code/addons/themes/ @JReinhold @yannbf
# /code/addons/toolbars/ @ndelangen @JReinhold
# /code/addons/viewport/ @yannbf @ndelangen
# /addons/a11y/ @ndelangen @yannbf
# /addons/actions/ @ndelangen @yannbf
# /addons/backgrounds/ @yannbf @ndelangen
# /addons/controls/ @kasperpeulen @ndelangen
# /addons/docs/ @JReinhold @kasperpeulen
# /addons/essentials/ @valentinpalkovic @ndelangen
# /addons/gfm/ @ndelangen @valentinpalkovic
# /addons/highlight/ @yannbf @valentinpalkovic
# /addons/interactions/ @yannbf @ndelangen
# /addons/jest/ @ndelangen
# /addons/links/ @yannbf @JReinhold
# /addons/measure/ @yannbf @valentinpalkovic
# /addons/outline/ @yannbf @valentinpalkovic
# /addons/storysource/ @ndelangen
# /addons/themes/ @JReinhold @yannbf
# /addons/toolbars/ @ndelangen @JReinhold
# /addons/viewport/ @yannbf @ndelangen

# Builder
# /code/builders/builder-manager/ @ndelangen @valentinpalkovic
# /code/builders/builder-vite/ @JReinhold @valentinpalkovic @IanVS
# /code/builders/builder-webpack5/ @ndelangen @valentinpalkovic
# /builders/builder-manager/ @ndelangen @valentinpalkovic
# /builders/builder-vite/ @JReinhold @valentinpalkovic @IanVS
# /builders/builder-webpack5/ @ndelangen @valentinpalkovic

# Frameworks
# /code/frameworks/angular/ @valentinpalkovic @yannbf
# /code/frameworks/html-vite/ @kasperpeulen @JReinhold
# /code/frameworks/html-webpack5/ @kasperpeulen @JReinhold
# /code/frameworks/nextjs/ @valentinpalkovic @kasperpeulen @yannbf
# /code/frameworks/react-vite/ @valentinpalkovic @kasperpeulen
# /code/frameworks/react-webpack5/ @valentinpalkovic @kasperpeulen
# /code/frameworks/svelte-vite/ @kasperpeulen @JReinhold
# /code/frameworks/svelte-webpack5/ @kasperpeulen @JReinhold
# /code/frameworks/sveltekit/ @kasperpeulen @JReinhold
# /code/frameworks/vue3-vite/ @kasperpeulen @yannbf @JReinhold
# /code/frameworks/vue3-webpack5/ @kasperpeulen @yannbf @JReinhold
# /code/frameworks/web-components-vite/ @kasperpeulen @JReinhold
# /code/frameworks/web-components-webpack5/ @kasperpeulen @JReinhold
# /frameworks/angular/ @valentinpalkovic @yannbf
# /frameworks/html-vite/ @kasperpeulen @JReinhold
# /frameworks/html-webpack5/ @kasperpeulen @JReinhold
# /frameworks/nextjs/ @valentinpalkovic @kasperpeulen @yannbf
# /frameworks/react-vite/ @valentinpalkovic @kasperpeulen
# /frameworks/react-webpack5/ @valentinpalkovic @kasperpeulen
# /frameworks/svelte-vite/ @kasperpeulen @JReinhold
# /frameworks/svelte-webpack5/ @kasperpeulen @JReinhold
# /frameworks/sveltekit/ @kasperpeulen @JReinhold
# /frameworks/vue3-vite/ @kasperpeulen @yannbf @JReinhold
# /frameworks/vue3-webpack5/ @kasperpeulen @yannbf @JReinhold
# /frameworks/web-components-vite/ @kasperpeulen @JReinhold
# /frameworks/web-components-webpack5/ @kasperpeulen @JReinhold

# Lib
# /code/lib/channels/ @ndelangen @kasperpeulen
# /code/lib/cli/ @yannbf @valentinpalkovic @ndelangen
# /code/lib/cli-sb/ @yannbf @valentinpalkovic @ndelangen
# /code/lib/cli-storybook/ @yannbf @valentinpalkovic @ndelangen
# /code/lib/client-logger/ @ndelangen @yannbf
# /code/lib/codemod/ @kasperpeulen @ndelangen
# /code/lib/core-common/ @ndelangen @yannbf
# /code/lib/core-events/ @ndelangen @kasperpeulen
# /code/lib/core-server/ @ndelangen @JReinhold @tmeasday @shilman
# /code/lib/core-webpack/ @valentinpalkovic @ndelangen
# /code/lib/csf-plugin/ @ndelangen @valentinpalkovic
# /code/lib/csf-tools/ @kasperpeulen @shilman
# /code/lib/docs-tools/ @JReinhold @shilman
# /code/lib/instrumenter/ @yannbf @kasperpeulen
# /code/lib/manager-api/ @ndelangen @valentinpalkovic @kasperpeulen
# /code/lib/node-logger/ @yannbf @ndelangen
# /code/lib/preview/ @ndelangen @kasperpeulen
# /code/lib/preview-api/ @yannbf @ndelangen @tmeasday
# /code/lib/react-dom-shim/ @ndelangen @valentinpalkovic @tmeasday
# /code/lib/router/ @ndelangen @JReinhold
# /code/lib/telemetry/ @shilman @yannbf @ndelangen
# /code/lib/theming/ @cdedreuille @ndelangen @JReinhold
# /code/lib/types/ @kasperpeulen @ndelangen
# /lib/channels/ @ndelangen @kasperpeulen
# /lib/cli/ @yannbf @valentinpalkovic @ndelangen
# /lib/cli-sb/ @yannbf @valentinpalkovic @ndelangen
# /lib/cli-storybook/ @yannbf @valentinpalkovic @ndelangen
# /lib/client-logger/ @ndelangen @yannbf
# /lib/codemod/ @kasperpeulen @ndelangen
# /lib/core-common/ @ndelangen @yannbf
# /lib/core-events/ @ndelangen @kasperpeulen
# /lib/core-server/ @ndelangen @JReinhold @tmeasday @shilman
# /lib/core-webpack/ @valentinpalkovic @ndelangen
# /lib/csf-plugin/ @ndelangen @valentinpalkovic
# /lib/csf-tools/ @kasperpeulen @shilman
# /lib/docs-tools/ @JReinhold @shilman
# /lib/instrumenter/ @yannbf @kasperpeulen
# /lib/manager-api/ @ndelangen @valentinpalkovic @kasperpeulen
# /lib/node-logger/ @yannbf @ndelangen
# /lib/preview/ @ndelangen @kasperpeulen
# /lib/preview-api/ @yannbf @ndelangen @tmeasday
# /lib/react-dom-shim/ @ndelangen @valentinpalkovic @tmeasday
# /lib/router/ @ndelangen @JReinhold
# /lib/telemetry/ @shilman @yannbf @ndelangen
# /lib/theming/ @cdedreuille @ndelangen @JReinhold
# /lib/types/ @kasperpeulen @ndelangen

# Presets
# /code/presets/create-react-app/ @valentinpalkovic @ndelangen
# /presets/create-react-app/ @valentinpalkovic @ndelangen

# Renderers
# /code/renderers/html/ @kasperpeulen @JReinhold
# /code/renderers/react/ @valentinpalkovic @kasperpeulen
# /code/renderers/server/ @shilman @valentinpalkovic
# /code/renderers/svelte/ @JReinhold @kasperpeulen
# /code/renderers/vue3/ @kasperpeulen @JReinhold
# /code/renderers/web-components/ @kasperpeulen @JReinhold
# /renderers/html/ @kasperpeulen @JReinhold
# /renderers/react/ @valentinpalkovic @kasperpeulen
# /renderers/server/ @shilman @valentinpalkovic
# /renderers/svelte/ @JReinhold @kasperpeulen
# /renderers/vue3/ @kasperpeulen @JReinhold
# /renderers/web-components/ @kasperpeulen @JReinhold

# UI
# /code/ui/.storybook/ @JReinhold @cdedreuille
# /code/ui/blocks/ @JReinhold @cdedreuille
# /code/ui/components/ @cdedreuille @JReinhold
# /code/ui/manager/ @ndelangen @JReinhold @cdedreuille @tmeasday
# /ui/.storybook/ @JReinhold @cdedreuille
# /ui/blocks/ @JReinhold @cdedreuille
# /ui/components/ @cdedreuille @JReinhold
# /ui/manager/ @ndelangen @JReinhold @cdedreuille @tmeasday

# E2E
# /code/e2e-tests/ @yannbf @valentinpalkovic
# /e2e-tests/ @yannbf @valentinpalkovic
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading