Skip to content

Commit

Permalink
fix: detroit ui-component changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ludtkemorgan
ludtkemorgan committed Apr 7, 2023
1 parent 26067b7 commit 10eab3d
Show file tree
Hide file tree
Showing 4 changed files with 2,966 additions and 249 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
- redis-server
before_install:
- sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
- sudo systemctl restart postgresql@11-main
- sudo systemctl restart postgresql@12-main
- sleep 1
before_script:
- cp sites/public/.env.template sites/public/.env
Expand Down Expand Up @@ -51,11 +51,11 @@ jobs:
- kill $(jobs -p) || true
dist: focal
addons:
postgresql: "11"
postgresql: "12"
apt:
packages:
- postgresql-11
- postgresql-client-11
- postgresql-12
- postgresql-client-12
- libgconf-2-4
env:
global: PGPORT=5433
Expand Down
46 changes: 25 additions & 21 deletions detroit-ui-components/.storybook/main.js
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
const path = require("path")
const { resolve } = require("path")
const bloomTheme = require("../tailwind.config.js")
const tailwindVars = require("../tailwind.tosass.js")(bloomTheme)
const { NormalModuleReplacementPlugin } = require("webpack")
const bloomTheme = require("../tailwind.config.js");
const tailwindVars = require("../tailwind.tosass.js")(bloomTheme);

module.exports = {
stories: ["../src/**/*.stories.@(tsx|mdx)"],
stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
addons: [
"@storybook/addon-actions",
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-docs",
"@storybook/addon-a11y",
"@storybook/addon-viewport",
"@storybook/addon-knobs",
"@geometricpanda/storybook-addon-badges",
],
typescript: {
check: false,
checkOptions: {},
reactDocgen: "react-docgen-typescript",
reactDocgenTypescriptOptions: {
shouldExtractLiteralValuesFromEnum: true,
propFilter: (prop) => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true),
{
/**
* Fix Storybook issue with PostCSS@8
* @see https://github.com/storybookjs/storybook/issues/12668#issuecomment-773958085
*/
name: "@storybook/addon-postcss",
options: {
postcssLoaderOptions: {
implementation: require("postcss"),
},
},
},
],
core: {
builder: "webpack5",
},
// In trouble? try https://storybook.js.org/docs/configurations/custom-webpack-config/#debug-the-default-webpack-config
webpackFinal: async (config, { configType }) => {
// `configType` has a value of 'DEVELOPMENT' or 'PRODUCTION'
// You can change the configuration based on that.
Expand Down Expand Up @@ -51,7 +54,8 @@ module.exports = {
},
},
],
})
include: path.resolve(__dirname, "../"),
});

config.module.rules.push({
test: /\.(ts|tsx)$/,
Expand All @@ -63,9 +67,9 @@ module.exports = {
},
},
],
})
});

config.resolve.extensions.push(".ts", ".tsx")
return config
config.resolve.extensions.push(".ts", ".tsx");
return config;
},
}
};
90 changes: 62 additions & 28 deletions detroit-ui-components/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,53 +22,82 @@
"devDependencies": {
"@babel/core": "^7.15.5",
"@babel/preset-env": "^7.15.4",
"@emotion/core": "^10.0.35",
"@emotion/styled": "^10.0.27",
"@geometricpanda/storybook-addon-badges": "^0.2.1",
"@storybook/addon-a11y": "^6.5.16",
"@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^13.1.0",
"@geometricpanda/storybook-addon-badges": "^1.1.1",
"@storybook/addon-actions": "^6.5.16",
"@storybook/addon-docs": "^6.5.16",
"@storybook/addon-a11y": "^6.5.16",
"@storybook/addon-essentials": "^6.5.16",
"@storybook/addon-interactions": "^6.5.16",
"@storybook/addon-links": "^6.5.16",
"@storybook/addon-knobs": "^6.4.0",
"@storybook/addon-storyshots": "^6.5.16",
"@storybook/addon-storyshots-puppeteer": "^6.5.16",
"@storybook/addon-viewport": "^6.5.16",
"@storybook/addons": "^6.5.16",
"@storybook/api": "^6.5.16",
"@storybook/components": "^6.5.16",
"@storybook/core-events": "^6.5.16",
"@storybook/addon-storyshots": "^6.3.8",
"@storybook/addon-storyshots-puppeteer": "^6.3.8",
"@storybook/addon-postcss": "^2.0.0",
"@storybook/builder-webpack5": "^6.5.16",
"@storybook/manager-webpack5": "^6.5.16",
"@storybook/node-logger": "^6.5.16",
"@storybook/preset-create-react-app": "^4.1.2",
"@storybook/react": "^6.5.16",
"@storybook/theming": "^6.5.16",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/react": "^14.0.0",
"@storybook/testing-library": "^0.0.13",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "14.0.0",
"@types/dompurify": "^2.3.3",
"@types/jest": "^26.0.14",
"@types/jwt-decode": "^2.2.1",
"@types/mdx": "^2.0.1",
"@types/node": "18.14.6",
"@types/node-polyglot": "^2.4.1",
"@types/pretty": "2.0.1",
"@types/react-beautiful-dnd": "^13.1.1",
"@types/react-dom": "^16.9.5",
"@types/react-map-gl": "^5.2.10",
"@types/react-tabs": "^2.3.2",
"@types/react-test-renderer": "18.0.0",
"@types/webpack": "^4.41.22",
"@types/react-test-renderer": "^16.9.3",
"@types/react-text-mask": "^5.4.6",
"@types/react-transition-group": "^4.4.0",
"@types/webpack": "5.28.0",
"@typescript-eslint/parser": "^5.12.1",
"@typescript-eslint/eslint-plugin": "^5.12.1",
"autoprefixer": "^10.3.4",
"babel-loader": "^8.2.2",
"babel-plugin-require-context-hook": "^1.0.0",
"dotenv": "^8.2.0",
"eslint": "^7.11.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "6.5.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.21.4",
"eslint-plugin-react-hooks": "^4.1.2",
"husky": "^4.3.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^26.5.3",
"jest-environment-jsdom": "^26.5.3",
"lint-staged": "^10.4.0",
"mockdate": "^3.0.2",
"node-sass": "^7.0.0",
"postcss": "^8.3.6",
"postcss-loader": "^4.3",
"postcss": "8.4.19",
"postcss-import": "^14.1.0",
"postcss-load-config": "^3.1.4",
"postcss-loader": "7.0.1",
"postcss-nested": "6.0.0",
"preact": "^10.5.14",
"prettier": "^2.1.0",
"pretty": "2.0.0",
"puppeteer": "^10.1.0",
"react-dom-server": "0.0.5",
"react-is": "^17.0.2",
"react-test-renderer": "^17.0.2",
"regenerator-runtime": "^0.13.7",
"sass": "^1.32.1",
"require-from-string": "2.0.2",
"sass": "1.52.1",
"sass-loader": "^10.0.3",
"semantic-release": "19.0.5",
"style-loader": "^1.1.3",
"tailwindcss-rtl": "^0.7.3",
"ts-jest": "^26.4.1",
"ts-loader": "^8.0.4",
"typescript": "4.6.4",
"webpack": "^4.44.2"
"typescript": "^4.9.4",
"webpack": "5.76.0"
},
"dependencies": {
"@bloom-housing/backend-core": "^4.4.0",
Expand All @@ -80,32 +109,37 @@
"@fortawesome/react-fontawesome": "^0.1.18",
"@mapbox/mapbox-sdk": "^0.13.0",
"@types/jwt-decode": "^2.2.1",
"@types/markdown-to-jsx": "7.0.1",
"@types/mdx": "^2.0.1",
"@types/node": "^12.12.67",
"@types/node-polyglot": "^2.4.1",
"@types/react": "^18.0.32",
"@types/react-beautiful-dnd": "^13.1.1",
"@types/react-dom": "^16.9.5",
"@types/react-text-mask": "^5.4.6",
"@types/react-transition-group": "^4.4.0",
"ag-grid-community": "^26.0.0",
"ag-grid-react": "^26.0.0",
"aria-autocomplete": "^1.4.0",
"axios": "0.21.2",
"dayjs": "^1.10.7",
"jwt-decode": "^2.2.0",
"markdown-to-jsx": "7.1.8",
"nanoid": "^3.1.12",
"node-polyglot": "^2.4.0",
"react": "18.2.0",
"react-accessible-accordion": "^3.3.5",
"react-accessible-accordion": "5.0.0",
"react-beautiful-dnd": "^13.1.0",
"react-dom": "^17.0.2",
"react-dom": "18.2.0",
"react-dropzone": "^11.3.2",
"react-focus-lock": "^2.5.2",
"react-hook-form": "^6.15.5",
"react-map-gl": "^6.1.16",
"react-media": "^1.10.0",
"react-remove-scroll": "2.5.4",
"react-tabs": "^3.2.2",
"react-text-mask": "^5.4.3",
"react-transition-group": "^4.4.1",
"tailwindcss": "2.2.10",
"tailwindcss-rtl": "^0.9.0",
"ts-jest": "^26.4.1",
"typesafe-actions": "^5.1.0"
},
Expand Down
Loading

0 comments on commit 10eab3d

Please sign in to comment.