Skip to content

Commit

Permalink
Remove modular
Browse files Browse the repository at this point in the history
  • Loading branch information
joshwooding committed Jul 25, 2024
1 parent e76e5b9 commit 0add5f1
Show file tree
Hide file tree
Showing 29 changed files with 1,385 additions and 10,271 deletions.
1 change: 1 addition & 0 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ jobs:
env:
LOG_LEVEL: "debug"
- name: Remove Chromatic label
if: ${{ steps.chromatic_branch.outputs.branchName != 'main' }}
uses: actions/github-script@v7
with:
script: |
Expand Down
100 changes: 0 additions & 100 deletions .yarn/patches/modular-scripts-npm-3.6.0-d967962075.patch

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The repo contains below packages under `/packages`

1. Add the icon to the `packages/icons/src/SVG` folder. The icon should be named using kebab casing e.g. `icon-name.svg`.
2. Navigate to `packages/icons` e.g. `cd packages/icons`.
3. Run `yarn build` to build the icons.
3. Run `yarn build:icons` to build the icons.
4. Write a changeset using `yarn changeset`, this should have the format:

```md
Expand Down
23 changes: 0 additions & 23 deletions eslint-local-rules.js

This file was deleted.

111 changes: 48 additions & 63 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,9 @@
"docs",
"site"
],
"modular": {
"type": "root"
},
"scripts": {
"start": "yarn storybook",
"build": "yarn build:core && yarn build:lab && yarn build:icons && yarn build:countries && yarn build:theme && yarn build:data-grid && yarn build:ag-grid-theme && yarn build:window && yarn build:styles && yarn bundle:css",
"build:core": "modular build @salt-ds/core",
"build:icons": "modular build @salt-ds/icons",
"build:countries": "modular build @salt-ds/countries",
"build:lab": "modular build @salt-ds/lab",
"build:theme": "yarn workspace @salt-ds/theme build",
"build:data-grid": "modular build @salt-ds/data-grid",
"build:window": "modular build @salt-ds/window",
"build:styles": "modular build @salt-ds/styles",
"build:ag-grid-theme": "yarn workspace @salt-ds/ag-grid-theme build",
"build": "yarn workspaces foreach --exclude @salt-ds/site -Apt run build && yarn bundle:css",
"bundle:css": "yarn bundle:core:css && yarn bundle:lab:css && yarn copy:icon:css && yarn copy:countries:css",
"bundle:core:css": "yarn workspace @salt-ds/core bundle:css",
"bundle:lab:css": "yarn workspace @salt-ds/lab bundle:css",
Expand All @@ -39,26 +27,49 @@
"lint": "biome check",
"lint:fix": "biome check --fix",
"lint:check:error": "biome check --diagnostic-level=error",
"lint:style": "yarn lint:style:core && yarn lint:style:icon && yarn lint:style:lab && yarn lint:style:ag-theme",
"lint:style:core": "yarn stylelint -f verbose \"packages/core/src/**/*.css\"",
"lint:style:icon": "yarn stylelint -f verbose \"packages/icons/src/**/*.css\"",
"lint:style:lab": "yarn stylelint -f verbose \"packages/lab/src/**/*.css\"",
"lint:style:ag-theme": "yarn stylelint -f verbose \"packages/ag-grid-theme/css/**/*.css\"",
"storybook": "storybook dev -p 6006",
"build-storybook": "yarn build:ag-grid-theme && yarn bundle:css && storybook build",
"typecheck": "tsc --noEmit",
"chromatic": "chromatic"
"lint:style": "yarn stylelint -f verbose \"packages/*/src/**/*.css\" --ignore-pattern \"packages/data-grid\"",
"storybook": "yarn storybook dev -p 6006",
"build-storybook": "yarn workspace @salt-ds/ag-grid-theme build && yarn bundle:css && storybook build",
"typecheck": "tsc --noEmit"
},
"resolutions": {
"@changesets/assemble-release-plan@npm:^6.0.3": "patch:@changesets/assemble-release-plan@npm%3A6.0.3#~/.yarn/patches/@changesets-assemble-release-plan-npm-6.0.3-29726de363.patch",
"@salt-ds/lab": "workspace:*",
"next": "^14.0.0",
"whatwg-url": "^14.0.0",
"@storybook/test@npm:8.2.4": "patch:@storybook/test@npm%3A8.2.4#~/.yarn/patches/@storybook-test-npm-8.2.4-0a53c854b7.patch"
},
"browserslist": {
"production": [
"chrome >= 86",
"firefox >= 86",
"edge >= 85",
"iOS >= 15.4",
"safari >= 15.4"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"packageManager": "[email protected]",
"msw": {
"workerDirectory": "docs/public"
},
"dependencies": {
"devDependencies": {
"@biomejs/biome": "1.8.3",
"@biomejs/js-api": "^0.6.2",
"@biomejs/wasm-nodejs": "^1.8.3",
"@changesets/cli": "^2.27.7",
"@cypress/code-coverage": "^3.12.35",
"@cypress/code-coverage": "^3.12.44",
"@faker-js/faker": "^8.0.0",
"@fontsource/open-sans": "^4.5.13",
"@fontsource/pt-mono": "^5.0.12",
"@mswjs/data": "^0.14.0",
"@rollup/plugin-commonjs": "^26.0.1",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^15.2.3",
"@storybook/addon-a11y": "^8.2.4",
"@storybook/addon-actions": "^8.2.4",
"@storybook/addon-docs": "^8.2.4",
Expand All @@ -77,9 +88,8 @@
"@storybook/theming": "^8.2.4",
"@storybook/types": "^8.2.4",
"@tanstack/react-query": "^4.28.0",
"@testing-library/cypress": "^10.0.0",
"@testing-library/dom": "^10.0.0",
"@testing-library/react": "^15.0.0",
"@testing-library/cypress": "^10.0.2",
"@testing-library/dom": "^10.4.0",
"@types/no-scroll": "^2.1.0",
"@types/node": "^20.0.0",
"@types/react": "^18.3.3",
Expand All @@ -91,60 +101,35 @@
"ag-grid-enterprise": "^31.3.0",
"ag-grid-react": "^31.3.0",
"axe-core": "^4.9.0",
"browserslist-to-esbuild": "^2.1.1",
"chromatic": "^11.3.2",
"ci-info": "^3.3.1",
"ci-info": "^4.0.0",
"clsx": "^2.0.0",
"cypress": "^13.8.0",
"cypress": "^13.13.1",
"cypress-axe": "^1.5.0",
"cypress-real-events": "^1.12.0",
"cypress-real-events": "^1.13.0",
"deepmerge": "^4.2.2",
"dom-accessibility-api": "^0.7.0",
"find-up": "^5.0.0",
"get-tsconfig": "^4.7.5",
"mockdate": "^3.0.5",
"modular-scripts": "patch:modular-scripts@npm:3.6.0#.yarn/patches/modular-scripts-npm-3.6.0-d967962075.patch",
"msw": "^1.2.1",
"msw-storybook-addon": "^1.8.0",
"prettier": "^3.3.3",
"react": "^18.3.1",
"react-docgen-typescript": "2.2.2",
"react-dom": "^18.3.1",
"rifm": "^0.12.0",
"sass": "^1.52.3",
"rollup": "^4.18.1",
"rollup-plugin-esbuild": "^6.1.1",
"rollup-plugin-postcss": "^4.0.2",
"storybook": "^8.2.4",
"stylelint": "^16.0.0",
"typescript": "4.6.4",
"vite": "^4.4.9",
"vite": "^5.0.0",
"vite-plugin-istanbul": "^6.0.0",
"vite-tsconfig-paths": "^4.2.0",
"vitest": "^1.0.0",
"webpack": "5.92.0",
"vitest": "^2.0.0",
"yup": "^1.0.2"
},
"resolutions": {
"@changesets/assemble-release-plan@npm:^6.0.3": "patch:@changesets/assemble-release-plan@npm%3A6.0.3#~/.yarn/patches/@changesets-assemble-release-plan-npm-6.0.3-29726de363.patch",
"@salt-ds/lab": "workspace:*",
"modular-scripts/rollup": "2.79.1",
"next": "^14.0.0",
"webpack-dev-server": "4.9.3",
"webpack": "5.92.0",
"recursive-readdir": "2.2.3",
"@storybook/test@npm:8.2.4": "patch:@storybook/test@npm%3A8.2.4#~/.yarn/patches/@storybook-test-npm-8.2.4-0a53c854b7.patch"
},
"browserslist": {
"production": [
"chrome 79",
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"chrome 79",
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"packageManager": "[email protected]",
"msw": {
"workerDirectory": "docs/public"
}
}
Loading

0 comments on commit 0add5f1

Please sign in to comment.