Merge pull request #2309 from Automattic/update/remove-shared-dir

SSR: Remove shared directory
Automattic · Jan 15, 2016 · 0ed9283 · 0ed9283
2 parents c67aa87 + 8388bce
commit 0ed9283
Show file tree

Hide file tree

Showing 157 changed files with 163 additions and 168 deletions.
diff --git a/CREDITS.md b/CREDITS.md
@@ -61,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 #### client/components/tinymce/plugins/wptextpattern
 #### client/lib/media/constants.js
 #### client/post-editor/media-modal/markup.js
-#### shared/lib/formatting/index.js
+#### client/lib/formatting/index.js
 ```text
 WordPress - Web publishing software
 

diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,7 @@ RUN     wget https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x6
           ln -sf /usr/local/node/bin/node /usr/local/bin/ && \
           rm node-v$NODE_VERSION-linux-x64.tar.gz
 
-ENV     NODE_PATH /calypso/server:/calypso/shared
+ENV     NODE_PATH /calypso/server:/calypso/client
 
 # Install base npm packages to take advantage of the docker cache
 COPY    ./package.json /calypso/package.json

diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ NODE_BIN := $(THIS_DIR)/node_modules/.bin
 NODE ?= node
 NPM ?= $(NODE) $(shell which npm)
 BUNDLER ?= $(BIN)/bundler
-SASS ?= $(NODE_BIN)/node-sass --include-path 'client:shared'
+SASS ?= $(NODE_BIN)/node-sass --include-path 'client'
 RTLCSS ?= $(NODE_BIN)/rtlcss
 AUTOPREFIXER ?= $(NODE_BIN)/autoprefixer
 RECORD_ENV ?= $(BIN)/record-env
@@ -27,7 +27,7 @@ ALL_DEVDOCS_JS ?= $(THIS_DIR)/server/devdocs/bin/generate-devdocs-index
 
 # files used as prereqs
 SASS_FILES := $(shell \
-	find client shared assets \
+	find client assets \
 		-type f \
 		-name '*.scss' \
 )
@@ -58,7 +58,7 @@ CALYPSO_ENV ?= $(NODE_ENV)
 
 export NODE_ENV := $(NODE_ENV)
 export CALYPSO_ENV := $(CALYPSO_ENV)
-export NODE_PATH := server:shared:.
+export NODE_PATH := server:client:.
 
 .DEFAULT_GOAL := install
 
@@ -111,7 +111,7 @@ i18n-lint:
 
 # Skip files that are auto-generated
 mixedindentlint: node_modules/mixedindentlint
-	@echo "$(JS_FILES)\n$(SASS_FILES)" | xargs $(NODE_BIN)/mixedindentlint --ignore-comments --exclude="client/config/index.js" --exclude="shared/components/gridicon/index.jsx"
+	@echo "$(JS_FILES)\n$(SASS_FILES)" | xargs $(NODE_BIN)/mixedindentlint --ignore-comments --exclude="client/config/index.js" --exclude="client/components/gridicon/index.jsx"
 
 # keep track of the current CALYPSO_ENV so that it can be used as a
 # prerequisite for other rules

diff --git a/bin/gridiconFormatChecker b/bin/gridiconFormatChecker
@@ -44,7 +44,7 @@ fs.readFile( filename, 'utf8', function ( err, data ) {
 	if ( result !== '' ) {
 		console.error( result );
 		console.log( '\033[mValid gridiconsizes are ' + validIconSizes.join( 'px, ' ) + 'px' );
-		console.log( '\033[mIf you need any of those Gridicons to have a non-standard size, please, add \'nonStandardSize\' as a property. See https://github.com/Automattic/wp-calypso/tree/master/shared/components/gridicon#props \n' );
+		console.log( '\033[mIf you need any of those Gridicons to have a non-standard size, please, add \'nonStandardSize\' as a property. See https://github.com/Automattic/wp-calypso/tree/master/client/components/gridicon#props \n' );
 		process.exit( 1 );
 	} else {
 		process.exit( 0 );

diff --git a/bin/run-all-tests b/bin/run-all-tests
@@ -84,4 +84,4 @@ __cleanup() {
 trap __cleanup SIGINT SIGTERM
 
 # Run all tests
-find {$BASEDIR/../client,$BASEDIR/../server,$BASEDIR/../shared} -name Makefile | run_test_fast
+find {$BASEDIR/../client,$BASEDIR/../server} -name Makefile | run_test_fast
diff --git a/client/auth/Makefile b/client/auth/Makefile
@@ -2,6 +2,6 @@ REPORTER ?= spec
 MOCHA ?= ../../node_modules/.bin/mocha
 
 test:
-	@NODE_ENV=test NODE_PATH=test:../../client:../../shared $(MOCHA) --compilers jsx:babel/register --reporter $(REPORTER)
+	@NODE_ENV=test NODE_PATH=test:../../client $(MOCHA) --compilers jsx:babel/register --reporter $(REPORTER)
 
 .PHONY: test
diff --git a/client/components/bulk-select/Makefile b/client/components/bulk-select/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= ../../../node_modules/.bin/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 test:
 	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers jsx:babel/register --reporter $(REPORTER)

diff --git a/client/components/count/Makefile b/client/components/count/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= ../../../node_modules/.bin/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 test:
 	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers jsx:babel/register --reporter $(REPORTER)

diff --git a/client/components/forms/counted-textarea/Makefile b/client/components/forms/counted-textarea/Makefile
@@ -4,7 +4,7 @@ COMPILERS ?= jsx:babel/register
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/components/forms/form-phone-input/Makefile b/client/components/forms/form-phone-input/Makefile
@@ -4,7 +4,7 @@ COMPILERS ?= jsx:babel/register
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/shared/components/gridicon/README.md → client/components/gridicon/README.md b/shared/components/gridicon/README.md → client/components/gridicon/README.md
diff --git a/shared/components/gridicon/docs/example.jsx → client/components/gridicon/docs/example.jsx b/shared/components/gridicon/docs/example.jsx → client/components/gridicon/docs/example.jsx
diff --git a/shared/components/gridicon/index.jsx → client/components/gridicon/index.jsx b/shared/components/gridicon/index.jsx → client/components/gridicon/index.jsx
diff --git a/shared/components/gridicon/style.scss → client/components/gridicon/style.scss b/shared/components/gridicon/style.scss → client/components/gridicon/style.scss
diff --git a/client/components/theme/Makefile b/client/components/theme/Makefile
@@ -4,7 +4,7 @@ COMPILERS ?= jsx:babel/register
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/components/themes-list/Makefile b/client/components/themes-list/Makefile
@@ -4,7 +4,7 @@ COMPILERS ?= jsx:babel/register
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/shared:$(BASE_DIR)/client
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/components/tinymce/plugins/media/restrict-size/Makefile b/client/components/tinymce/plugins/media/restrict-size/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 test:
 	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers js:babel/register  --reporter $(REPORTER)

diff --git a/client/components/tinymce/plugins/wpcom-sourcecode/Makefile b/client/components/tinymce/plugins/wpcom-sourcecode/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 test:
 	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers js:babel/register  --reporter $(REPORTER)

diff --git a/client/components/token-field/Makefile b/client/components/token-field/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 test:
 	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers jsx:babel/register --reporter $(REPORTER)

diff --git a/client/devdocs/Makefile b/client/devdocs/Makefile
@@ -4,7 +4,7 @@ COMPILERS ?= jsx:babel/register
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/shared/layout/README.md → client/layout/README.md b/shared/layout/README.md → client/layout/README.md
diff --git a/shared/layout/community-translator/README.md → client/layout/community-translator/README.md b/shared/layout/community-translator/README.md → client/layout/community-translator/README.md
diff --git a/.../community-translator/invitation-utils.js → .../community-translator/invitation-utils.js b/.../community-translator/invitation-utils.js → .../community-translator/invitation-utils.js
diff --git a/...ayout/community-translator/invitation.jsx → ...ayout/community-translator/invitation.jsx b/...ayout/community-translator/invitation.jsx → ...ayout/community-translator/invitation.jsx
diff --git a/.../layout/community-translator/launcher.jsx → .../layout/community-translator/launcher.jsx b/.../layout/community-translator/launcher.jsx → .../layout/community-translator/launcher.jsx
diff --git a/...ed/layout/community-translator/style.scss → ...nt/layout/community-translator/style.scss b/...ed/layout/community-translator/style.scss → ...nt/layout/community-translator/style.scss
diff --git a/shared/layout/error.jsx → client/layout/error.jsx b/shared/layout/error.jsx → client/layout/error.jsx
diff --git a/shared/layout/index.jsx → client/layout/index.jsx b/shared/layout/index.jsx → client/layout/index.jsx
diff --git a/shared/layout/logged-out-design.jsx → client/layout/logged-out-design.jsx b/shared/layout/logged-out-design.jsx → client/layout/logged-out-design.jsx
diff --git a/shared/layout/logged-out-oauth.jsx → client/layout/logged-out-oauth.jsx b/shared/layout/logged-out-oauth.jsx → client/layout/logged-out-oauth.jsx
diff --git a/shared/layout/logged-out.jsx → client/layout/logged-out.jsx b/shared/layout/logged-out.jsx → client/layout/logged-out.jsx
diff --git a/shared/layout/masterbar/README.md → client/layout/masterbar/README.md b/shared/layout/masterbar/README.md → client/layout/masterbar/README.md
diff --git a/shared/layout/masterbar/item.jsx → client/layout/masterbar/item.jsx b/shared/layout/masterbar/item.jsx → client/layout/masterbar/item.jsx
diff --git a/shared/layout/masterbar/logged-in.jsx → client/layout/masterbar/logged-in.jsx b/shared/layout/masterbar/logged-in.jsx → client/layout/masterbar/logged-in.jsx
diff --git a/shared/layout/masterbar/logged-out.jsx → client/layout/masterbar/logged-out.jsx b/shared/layout/masterbar/logged-out.jsx → client/layout/masterbar/logged-out.jsx
diff --git a/shared/layout/masterbar/masterbar.jsx → client/layout/masterbar/masterbar.jsx b/shared/layout/masterbar/masterbar.jsx → client/layout/masterbar/masterbar.jsx
diff --git a/shared/layout/masterbar/notifications.jsx → client/layout/masterbar/notifications.jsx b/shared/layout/masterbar/notifications.jsx → client/layout/masterbar/notifications.jsx
diff --git a/shared/layout/masterbar/publish.jsx → client/layout/masterbar/publish.jsx b/shared/layout/masterbar/publish.jsx → client/layout/masterbar/publish.jsx
diff --git a/shared/layout/masterbar/stats.jsx → client/layout/masterbar/stats.jsx b/shared/layout/masterbar/stats.jsx → client/layout/masterbar/stats.jsx
diff --git a/shared/layout/masterbar/style.scss → client/layout/masterbar/style.scss b/shared/layout/masterbar/style.scss → client/layout/masterbar/style.scss
diff --git a/shared/layout/package.json → client/layout/package.json b/shared/layout/package.json → client/layout/package.json
diff --git a/client/lib/accept/Makefile b/client/lib/accept/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 test:
 	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers jsx:babel/register --reporter $(REPORTER)

diff --git a/client/lib/ads/Makefile b/client/lib/ads/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/lib/auth-code-request-store/Makefile b/client/lib/auth-code-request-store/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/lib/cart-values/Makefile b/client/lib/cart-values/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/lib/cart/store/Makefile b/client/lib/cart/store/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 
 # In order to simply stub modules, add test to the NODE_PATH

diff --git a/client/lib/comment-like-store/Makefile b/client/lib/comment-like-store/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/lib/comment-store/Makefile b/client/lib/comment-store/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/lib/credit-card-details/Makefile b/client/lib/credit-card-details/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/lib/domains/Makefile b/client/lib/domains/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/domains/email-forwarding/Makefile b/client/lib/domains/email-forwarding/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/domains/nameservers/Makefile b/client/lib/domains/nameservers/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/domains/whois/Makefile b/client/lib/domains/whois/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/email-followers/Makefile b/client/lib/email-followers/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/features-list/Makefile b/client/lib/features-list/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/feed-post-store/Makefile b/client/lib/feed-post-store/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/feed-store/Makefile b/client/lib/feed-store/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/feed-stream-store/Makefile b/client/lib/feed-stream-store/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/follow-list/Makefile b/client/lib/follow-list/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/client/lib/followers/Makefile b/client/lib/followers/Makefile
@@ -4,7 +4,7 @@ COMPILERS ?= js:babel/register
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/shared/lib/formatting/Makefile → client/lib/formatting/Makefile b/shared/lib/formatting/Makefile → client/lib/formatting/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/shared/lib/formatting/README.md → client/lib/formatting/README.md b/shared/lib/formatting/README.md → client/lib/formatting/README.md
diff --git a/...lib/formatting/decode-entities/browser.js → ...lib/formatting/decode-entities/browser.js b/...lib/formatting/decode-entities/browser.js → ...lib/formatting/decode-entities/browser.js
diff --git a/...ed/lib/formatting/decode-entities/node.js → ...nt/lib/formatting/decode-entities/node.js b/...ed/lib/formatting/decode-entities/node.js → ...nt/lib/formatting/decode-entities/node.js
diff --git a/...b/formatting/decode-entities/package.json → ...b/formatting/decode-entities/package.json b/...b/formatting/decode-entities/package.json → ...b/formatting/decode-entities/package.json
diff --git a/shared/lib/formatting/index.js → client/lib/formatting/index.js b/shared/lib/formatting/index.js → client/lib/formatting/index.js
diff --git a/shared/lib/formatting/test/test.js → client/lib/formatting/test/test.js b/shared/lib/formatting/test/test.js → client/lib/formatting/test/test.js
diff --git a/client/lib/geocoding/Makefile b/client/lib/geocoding/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := $(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := $(BASE_DIR)/client
 
 test:
 	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers jsx:babel/register,js:babel/register --reporter $(REPORTER)

diff --git a/client/lib/happiness-engineers/Makefile b/client/lib/happiness-engineers/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/client/lib/help-search/Makefile b/client/lib/help-search/Makefile
@@ -1,7 +1,7 @@
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 COMPILERS ?= js:babel/register
 REPORTER ?= spec
 UI ?= bdd

diff --git a/shared/lib/i18n-utils/Makefile → client/lib/i18n-utils/Makefile b/shared/lib/i18n-utils/Makefile → client/lib/i18n-utils/Makefile
@@ -4,7 +4,7 @@ COMPILERS ?= js:babel/register
 NODE_BIN := ../../../node_modules/.bin
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := test:$(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := test:$(BASE_DIR)/client
 
 # In order to simply stub modules, add test to the NODE_PATH
 test:

diff --git a/shared/lib/i18n-utils/README.md → client/lib/i18n-utils/README.md b/shared/lib/i18n-utils/README.md → client/lib/i18n-utils/README.md
diff --git a/shared/lib/i18n-utils/browser.js → client/lib/i18n-utils/browser.js b/shared/lib/i18n-utils/browser.js → client/lib/i18n-utils/browser.js
diff --git a/shared/lib/i18n-utils/node.js → client/lib/i18n-utils/node.js b/shared/lib/i18n-utils/node.js → client/lib/i18n-utils/node.js
diff --git a/shared/lib/i18n-utils/package.json → client/lib/i18n-utils/package.json b/shared/lib/i18n-utils/package.json → client/lib/i18n-utils/package.json
diff --git a/shared/lib/i18n-utils/test/utils-test.js → client/lib/i18n-utils/test/utils-test.js b/shared/lib/i18n-utils/test/utils-test.js → client/lib/i18n-utils/test/utils-test.js
diff --git a/shared/lib/i18n-utils/utils.js → client/lib/i18n-utils/utils.js b/shared/lib/i18n-utils/utils.js → client/lib/i18n-utils/utils.js
diff --git a/client/lib/interval/Makefile b/client/lib/interval/Makefile
@@ -2,7 +2,7 @@ REPORTER ?= spec
 NODE_BIN := $(shell npm bin)
 MOCHA ?= $(NODE_BIN)/mocha
 BASE_DIR := $(NODE_BIN)/../..
-NODE_PATH := $(BASE_DIR)/client:$(BASE_DIR)/shared
+NODE_PATH := $(BASE_DIR)/client
 
 test:
 	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers js:babel/register --reporter $(REPORTER) --ui bdd