Skip to content

Commit

Permalink
refactor: move venia components to separate UI lib
Browse files Browse the repository at this point in the history
  • Loading branch information
zetlen committed Jul 31, 2019
1 parent 984ef97 commit 7974942
Show file tree
Hide file tree
Showing 708 changed files with 558 additions and 396 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Add any ideas about possible solutions to the problem here.
<!-- Complete the following sections to help us apply appropriate labels! -->
**Please let us know what packages this bug is in regards to:**
- [ ] `venia-concept`
- [ ] `venia-ui`
- [ ] `pwa-buildpack`
- [ ] `peregrine`
- [ ] `pwa-devdocs`
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Add any other context or screenshots about the feature request here.

**Please let us know what packages this feature is in regards to:**
- [ ] `venia-concept`
- [ ] `venia-ui`
- [ ] `pwa-buildpack`
- [ ] `peregrine`
- [ ] `pwa-devdocs`
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ COPY packages/peregrine/package.json ./packages/peregrine/package.json
COPY packages/pwa-buildpack/package.json ./packages/pwa-buildpack/package.json
COPY packages/upward-js/package.json ./packages/upward-js/package.json
COPY packages/upward-spec/package.json ./packages/upward-spec/package.json
COPY packages/venia-ui/package.json ./packages/venia-ui/package.json
COPY packages/venia-concept/package.json ./packages/venia-concept/package.json
COPY package.json yarn.lock babel.config.js magento-compatibility.js ./
COPY scripts/monorepo-introduction.js ./scripts/monorepo-introduction.js
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ COPY packages/peregrine/package.json ./packages/peregrine/package.json
COPY packages/pwa-buildpack/package.json ./packages/pwa-buildpack/package.json
COPY packages/upward-js/package.json ./packages/upward-js/package.json
COPY packages/upward-spec/package.json ./packages/upward-spec/package.json
COPY packages/venia-ui/package.json ./packages/venia-ui/package.json
COPY packages/venia-concept/package.json ./packages/venia-concept/package.json
COPY package.json yarn.lock babel.config.js magento-compatibility.js ./
COPY scripts/monorepo-introduction.js ./scripts/monorepo-introduction.js
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@ services:
- ./packages/pwa-buildpack/lib:/usr/src/app/packages/pwa-buildpack/lib:rw
- ./packages/pwa-buildpack/bin:/usr/src/app/packages/pwa-buildpack/bin:rw
- ./packages/upward-js/lib:/usr/src/app/packages/upward-js/lib:rw
- ./packages/venia-concept/.storybook:/usr/src/app/packages/venia-concept/.storybook:rw
- ./packages/venia-concept/src:/usr/src/app/packages/venia-concept/src:rw
- ./packages/venia-concept/static:/usr/src/app/packages/venia-concept/static:rw
- ./packages/venia-ui/.storybook:/usr/src/app/packages/venia-ui/.storybook:rw
- ./packages/venia-ui/lib:/usr/src/app/packages/venia-ui/lib:rw
- ./packages/venia-ui/templates:/usr/src/app/packages/venia-ui/templates:rw
links:
- nginx-proxy
environment:
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const jestConfig = {
configureProject('upward-js', 'Upward JS', () => ({
testEnvironment: 'node'
})),
configureProject('venia-concept', 'Venia Concept', inPackage => ({
configureProject('venia-ui', 'Venia UI', inPackage => ({
// Expose jsdom to tests.
browser: true,
moduleNameMapper: {
Expand Down
1 change: 1 addition & 0 deletions now.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"package.json",
".env",
"upward.yml",
"node_modules/@magento/venia-ui/lib/queries/*",
"static/*",
"templates/*"
],
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
"packages/graphql-cli-validate-magento-pwa-queries",
"packages/peregrine",
"packages/pwa-buildpack",
"packages/venia-concept",
"packages/upward-js",
"packages/upward-spec"
"packages/upward-spec",
"packages/venia-concept",
"packages/venia-ui"
],
"author": "Magento Commerce",
"license": "SEE LICENSE IN LICENSE.txt",
Expand Down
16 changes: 16 additions & 0 deletions packages/venia-concept/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[{package.json,*.yml,*.md}]
indent_size = 2
indent_style = space

[*.md]
trim_trailing_whitespace = false
12 changes: 12 additions & 0 deletions packages/venia-concept/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
.idea
.vscode
coverage
node_modules
storybook-dist
test-results
dist
.DS_Store
.env
build-stats.json
npm-debug.log
lastCachedGraphQLSchema.json
test-report.xml
test-results.json
yarn-error.log
26 changes: 0 additions & 26 deletions packages/venia-concept/CHANGELOG.md

This file was deleted.

10 changes: 8 additions & 2 deletions packages/venia-concept/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,17 @@
"buildpack": "buildpack",
"clean": "rimraf dist",
"download-schema": "graphql get-schema --project venia --insecure",
"lint": "eslint --ignore-path .gitignore 'src/**/{*.js,package.json}'",
"now-build": "../../now-build.sh",
"prettier": "prettier --loglevel warn --single-quote --ignore-path .gitignore 'src/**/*.@(js|css)' '*.js'",
"prettier:check": "yarn run -s prettier -- --check",
"prettier:fix": "yarn run -s prettier -- --write",
"start": "node server.js",
"start:debug": "node --inspect-brk ./node_modules/.bin/webpack-dev-server --progress --color --env.mode development",
"stats": "webpack-bundle-analyzer dist/build-stats.json",
"storybook": "start-storybook -p 9001 -c .storybook",
"storybook:build": "build-storybook -c .storybook -o storybook-dist",
"storybook": "echo 'Venia component stories have moved to @magento/venia-library. Trying to run in sibling directory...' && (cd ../venia-library && yarn run storybook:build)",
"storybook:build": "yarn run storybook",
"test": "yarn run -s prettier:check && yarn run -s lint && jest",
"validate-queries": "yarn run download-schema && graphql validate-magento-pwa-queries --project venia",
"watch": "webpack-dev-server --progress --color --env.mode development"
},
Expand All @@ -49,6 +54,7 @@
"@magento/peregrine": "~3.0.0",
"@magento/pwa-buildpack": "~3.0.0",
"@magento/upward-js": "~2.2.0",
"@magento/venia-ui": "~1.0.0",
"@storybook/react": "~4.1.13",
"apollo-cache-inmemory": "~1.4.3",
"apollo-cache-persist": "~0.1.1",
Expand Down
11 changes: 11 additions & 0 deletions packages/venia-concept/src/drivers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export {
connect,
Link,
Redirect,
Route,
Query,
Switch,
withRouter
} from '@magento/venia-ui/lib/drivers';
export { default as resourceUrl } from '@magento/venia-ui/lib/util/makeUrl';
export { default as Adapter } from '@magento/venia-ui/lib/drivers/adapter';
6 changes: 3 additions & 3 deletions packages/venia-concept/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { setContext } from 'apollo-link-context';
import { Util } from '@magento/peregrine';
import { Adapter } from '@magento/venia-drivers';
import store from './store';
import app from './actions/app';
import App, { AppContextProvider } from './components/App';
import app from '@magento/venia-ui/lib/actions/app';
import App, { AppContextProvider } from '@magento/venia-ui/lib/components/App';
import './index.css';

const { BrowserPersistence } = Util;
Expand Down Expand Up @@ -49,7 +49,7 @@ if (
) {
window.addEventListener('load', () =>
navigator.serviceWorker
.register('sw.js')
.register('/sw.js')
.then(registration => {
console.log('Service worker registered: ', registration);
})
Expand Down
8 changes: 4 additions & 4 deletions packages/venia-concept/src/store.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { createStore } from 'redux';

import middleware from './middleware';
import errorHandler from './middleware/errorHandler';
import reducer from './reducers';
import composeEnhancers from './util/composeEnhancers';
import middleware from '@magento/venia-ui/lib/middleware';
import errorHandler from '@magento/venia-ui/lib/middleware/errorHandler';
import reducer from '@magento/venia-ui/lib/reducers';
import composeEnhancers from '@magento/venia-ui/lib/util/composeEnhancers';

export default createStore(reducer, composeEnhancers(middleware, errorHandler));
Loading

0 comments on commit 7974942

Please # to comment.