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

Make client/ directory (Calypso app) a Lerna package #38190

Merged
merged 20 commits into from
Jan 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
be438ad
Move the validate-config-keys script (used in pre-commit hook) to bin/
jsnajdr Jan 9, 2020
a036784
Move webpack utility script for extensions aliases to client/webpack/
jsnajdr Jan 9, 2020
6553390
Remove lodash dependency from webpack configs
jsnajdr Jan 9, 2020
87a80e4
Server analytics: improve imports from client dir
jsnajdr Jan 9, 2020
b0a41c1
Move dev dependencies to top-level devDependencies
jsnajdr Jan 9, 2020
5b20b1c
calypso-build: call npx with no-install, make enzyme a peer dependency
jsnajdr Jan 9, 2020
6bb0ef2
FSE: call wp-scripts with npx so that the bin location doesn't matter
jsnajdr Jan 9, 2020
b44be89
Dockerfile: disable the separate npm ci layer
jsnajdr Jan 9, 2020
6f24de0
FSE: don't npm ci before FSE build. There's only one global npm ci
jsnajdr Jan 9, 2020
01710c2
Remove separate apps/ lockfiles. There is only one global one
jsnajdr Jan 9, 2020
f2d2e2f
Simplify imports from client/directory (use the short form)
jsnajdr Jan 9, 2020
8565cd9
Move server/ to client/server/, update paths
jsnajdr Jan 9, 2020
b899dbd
Add client/ package to lerna config
jsnajdr Jan 9, 2020
b881c78
Create client/package.json, move non-dev dependencies there
jsnajdr Jan 9, 2020
e2446f7
Fixup paths for ICFY stats
jsnajdr Jan 10, 2020
cb47348
Fixup path in devdocs/selectors
jsnajdr Jan 13, 2020
f52ea3d
Devdocs: fixup import and externalizing of the search-index module
jsnajdr Jan 13, 2020
25f72bf
ESLint: fixup the configuration of the import/no-extraneous-modules
jsnajdr Jan 13, 2020
b195f48
Update the (unified) lockfile
jsnajdr Jan 9, 2020
9e9de37
Update the npm-package-json-lint configuration and runner
jsnajdr Jan 14, 2020
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
6 changes: 1 addition & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -338,10 +338,6 @@ jobs:
working_directory: ~/wp-calypso/apps/full-site-editing
steps:
- prepare
- run:
name: Install Full Site Editing specific test deps
command: |
npm ci
- run:
name: Run Full Site Editing client tests
command: |
Expand Down Expand Up @@ -468,7 +464,7 @@ jobs:
npm run build-css \
&& npm run preanalyze-bundles \
&& node bin/icfy-analyze.js \
&& mv stats.json chart.json style.json "$CIRCLE_ARTIFACTS/icfy" \
&& mv client/stats.json client/chart.json client/style.json "$CIRCLE_ARTIFACTS/icfy" \
|| rm -fr build/.babel-client-cache # In case of failure do not save a potentially bad cache
exit 0
- save_cache: *save-terser-cache
Expand Down
5 changes: 4 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ Dockerfile
/server/devdocs/components-usage-stats.json
/server/devdocs/proptypes-index.json
/server/devdocs/search-index.js
/client/server/bundler/*.json
/client/server/devdocs/components-usage-stats.json
/client/server/devdocs/proptypes-index.json
/client/server/devdocs/search-index.js

# Tests do not need to be included in build
/server/**/test/**
/client/**/test/**

# Monorepo output
Expand Down
9 changes: 9 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
node_modules/
!.eslintrc.js
/server/devdocs/search-index.js
/client/server/devdocs/search-index.js
/packages/calypso-codemods/tests

# Built packages
Expand All @@ -16,7 +17,15 @@ node_modules/
# Don't operate on these files
#
/stats.json
/chart.json
/style.json
/server/devdocs/components-usage-stats.json
/server/devdocs/proptypes-index.json
/server/bundler/assets.json
/client/stats.json
/client/chart.json
/client/style.json
/client/server/devdocs/components-usage-stats.json
/client/server/devdocs/proptypes-index.json
/client/server/bundler/assets.json
/cached-requests.json
4 changes: 2 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { merge } = require( 'lodash' );
const reactVersion = require( './package.json' ).dependencies.react;
const reactVersion = require( './client/package.json' ).dependencies.react;

module.exports = {
root: true,
Expand Down Expand Up @@ -174,6 +174,6 @@ module.exports = {

// Disallow importing or requiring packages that are not listed in package.json
// This prevents us from depending on transitive dependencies, which could break in unexpected ways.
'import/no-extraneous-dependencies': [ 'error', { packageDir: './' } ],
'import/no-extraneous-dependencies': 'error',
},
};
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ node_modules
.eslintcache
test-results*.xml
/stats.json
/chart.json
/style.json
/client/stats.json
/client/chart.json
/client/style.json
spec-xunit-reporter-0.0.1.tgz
*xunit_*.xml
lerna-debug.log
Expand All @@ -40,6 +45,10 @@ lerna-debug.log
/server/devdocs/components-usage-stats.json
/server/devdocs/proptypes-index.json
/server/bundler/assets*.json
/client/server/devdocs/search-index.js
/client/server/devdocs/components-usage-stats.json
/client/server/devdocs/proptypes-index.json
/client/server/bundler/assets*.json

*.rdb
*.db
Expand Down
13 changes: 3 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,13 @@ ENV PROGRESS=true
COPY ./env-config.sh /tmp/env-config.sh
RUN bash /tmp/env-config.sh

# Build a node_modules layer
#
# This one builds out our node_modules tree. Since we use
# file: references, we have to copy over our
# package.json, lockfiles, and the contents of packages/*
COPY package.json package-lock.json /calypso/
COPY packages /calypso/packages
RUN npm ci

# Build a "source" layer
#
# This layer is populated with up-to-date files from
# Calypso development.
COPY . /calypso/
COPY . /calypso/
RUN npm ci


# Build the final layer
#
Expand Down
Loading