Merge pull request #13 from edx/djoy/dist_magic

davidjoy · web-flow · commit 7eaa61aaadcf · 2019-11-22T14:36:38.000-05:00
fix: publish dist directory
diff --git a/.releaserc b/.releaserc
@@ -6,7 +6,7 @@
     {
       "path": "@semantic-release/github",
       "assets": {
-        "path": "dist/*"
+        "path": "*"
       }
     }
   ],
@@ -18,10 +18,18 @@
     {
       "path": "@semantic-release/github",
       "assets": {
-        "path": "dist/*"
+        "path": "*"
       }
     }
   ],
   "success": [],
-  "fail": []
+  "fail": [],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    ["@semantic-release/npm", {
+      "pkgRoot": "dist",
+    }],
+    "@semantic-release/git"
+  ]
 }
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,10 @@ node_js: 12
 script:
   - npm run lint
   - npm run test
+  - npm run build
 after_success:
-  - npx semantic-release
+  # Without explicitly installing all these packages (that's what -p does) first, the "plugins" config above causes semantic-release to fail saying it can't find the packages. ... This is odd because they're all supposedly shipped with semantic-release.
+  - npx -p semantic-release -p @semantic-release/git -p @semantic-release/npm -p @semantic-release/commit-analyzer -p @semantic-release/release-notes-generator semantic-release
   - codecov
 env:
   global:
diff --git a/Makefile b/Makefile
@@ -4,3 +4,6 @@ build:
 	@# --copy-files will bring in everything else that wasn't processed by babel. Remove what we don't want.
 	@find dist -name '*.test.js*' -delete
 	rm ./dist/setupTest.js
+	cp ./package.json ./dist/package.json
+	cp ./LICENSE ./dist/LICENSE
+	cp ./README.rst ./dist/README.rst
diff --git a/analytics.js b/analytics.js
diff --git a/auth.js b/auth.js
diff --git a/config.js b/config.js
diff --git a/i18n.js b/i18n.js
diff --git a/init.js b/init.js
diff --git a/logging.js b/logging.js
diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
   },
   "sideEffects": false,
   "scripts": {
+    "build": "make build",
     "docs": "npx jsdoc2md --global-index-format none ./src/**/* > ./docs/api.md",
     "lint": "fedx-scripts eslint --ext .js --ext .jsx .",
     "snapshot": "fedx-scripts jest --updateSnapshot",
diff --git a/pubSub.js b/pubSub.js
diff --git a/react.js b/react.js
diff --git a/src/auth/index.js b/src/auth/index.js
@@ -5,7 +5,7 @@ import addAuthenticationToHttpClient from './addAuthenticationToHttpClient';
 import getJwtToken from './getJwtToken';
 import { camelCaseObject, ensureDefinedConfig } from '../utils';
 
-import { publish } from '../../pubSub';
+import { publish } from '../pubSub';
 
 export const AUTHENTICATED_USER_TOPIC = 'AUTHENTICATED_USER';
 export const AUTHENTICATED_USER_CHANGED = `${AUTHENTICATED_USER_TOPIC}.CHANGED`;
diff --git a/src/config/interface.js b/src/config/interface.js
@@ -1,8 +1,8 @@
 import PropTypes from 'prop-types';
 import ProcessEnvConfigService from './ProcessEnvConfigService';
 
-import { APP_CONFIG_INITIALIZED } from '../../init';
-import { publish, subscribe } from '../../pubSub';
+import { APP_CONFIG_INITIALIZED } from '../init';
+import { publish, subscribe } from '../pubSub';
 
 export const CONFIG_TOPIC = 'CONFIG';
 export const CONFIG_CHANGED = `${CONFIG_TOPIC}.CHANGED`;
diff --git a/src/init/interface.js b/src/init/interface.js
@@ -1,15 +1,14 @@
 import { createBrowserHistory } from 'history';
 import {
   publish,
-} from '../../pubSub';
+} from '../pubSub';
 import {
   getConfigService,
-} from '../../config';
-import { configure as configureLogging, getLoggingService, NewRelicLoggingService, logError } from '../../logging';
-import { configure as configureAnalytics, SegmentAnalyticsService } from '../../analytics';
-import { getAuthenticatedHttpClient, configure as configureAuth, ensureAuthenticatedUser, fetchAuthenticatedUser, hydrateAuthenticatedUser, getAuthenticatedUser } from '../../auth';
-import { configure as configureI18n } from '../../i18n';
-
+} from '../config';
+import { configure as configureLogging, getLoggingService, NewRelicLoggingService, logError } from '../logging';
+import { configure as configureAnalytics, SegmentAnalyticsService } from '../analytics';
+import { getAuthenticatedHttpClient, configure as configureAuth, ensureAuthenticatedUser, fetchAuthenticatedUser, hydrateAuthenticatedUser, getAuthenticatedUser } from '../auth';
+import { configure as configureI18n } from '../i18n';
 
 export const APP_TOPIC = 'APP';
 export const APP_PUBSUB_INITIALIZED = `${APP_TOPIC}.PUBSUB_INITIALIZED`;
diff --git a/src/init/interface.test.js b/src/init/interface.test.js
@@ -10,19 +10,19 @@ import {
   initialize,
   APP_INIT_ERROR,
 } from './interface';
-import { subscribe } from '../../pubSub';
+import { subscribe } from '../pubSub';
 
-import { configure as configureLogging, NewRelicLoggingService, getLoggingService, logError } from '../../logging';
-import { configure as configureAuth, getAuthenticatedHttpClient, ensureAuthenticatedUser, fetchAuthenticatedUser, hydrateAuthenticatedUser, getAuthenticatedUser } from '../../auth';
-import { configure as configureAnalytics, SegmentAnalyticsService } from '../../analytics';
-import { configure as configureI18n } from '../../i18n';
-import { getConfigService } from '../../config';
+import { configure as configureLogging, NewRelicLoggingService, getLoggingService, logError } from '../logging';
+import { configure as configureAuth, getAuthenticatedHttpClient, ensureAuthenticatedUser, fetchAuthenticatedUser, hydrateAuthenticatedUser, getAuthenticatedUser } from '../auth';
+import { configure as configureAnalytics, SegmentAnalyticsService } from '../analytics';
+import { configure as configureI18n } from '../i18n';
+import { getConfigService } from '../config';
 
 
-jest.mock('../../logging');
-jest.mock('../../auth');
-jest.mock('../../analytics');
-jest.mock('../../i18n');
+jest.mock('../logging');
+jest.mock('../auth');
+jest.mock('../analytics');
+jest.mock('../i18n');
 
 let configService = null;
 describe('initialize', () => {
diff --git a/src/react/AppProvider.jsx b/src/react/AppProvider.jsx
@@ -7,11 +7,11 @@ import OptionalReduxProvider from './OptionalReduxProvider';
 import ErrorBoundary from './ErrorBoundary';
 import AppContext from './AppContext';
 import { useAppEvent } from './hooks';
-import { identifyAnonymousUser, identifyAuthenticatedUser } from '../../analytics';
-import { getAuthenticatedUser, AUTHENTICATED_USER_CHANGED } from '../../auth';
-import { getConfig, CONFIG_CHANGED } from '../../config';
-import { history } from '../../init';
-import { getLocale, getMessages, IntlProvider, LOCALE_CHANGED } from '../../i18n';
+import { identifyAnonymousUser, identifyAuthenticatedUser } from '../analytics';
+import { getAuthenticatedUser, AUTHENTICATED_USER_CHANGED } from '../auth';
+import { getConfig, CONFIG_CHANGED } from '../config';
+import { history } from '../init';
+import { getLocale, getMessages, IntlProvider, LOCALE_CHANGED } from '../i18n';
 
 const AppProvider = ({ store, children }) => {
   const [config, setConfig] = useState(getConfig());
diff --git a/src/react/AppProvider.test.jsx b/src/react/AppProvider.test.jsx
@@ -2,17 +2,17 @@ import React from 'react';
 import { createStore } from 'redux';
 import { mount } from 'enzyme';
 import AppProvider from './AppProvider';
-import { initialize } from '../../init';
+import { initialize } from '../init';
 
-jest.mock('../../auth', () => ({
+jest.mock('../auth', () => ({
   configure: () => {},
   getAuthenticatedUser: () => null,
   fetchAuthenticatedUser: () => null,
   getAuthenticatedHttpClient: () => ({}),
   AUTHENTICATED_USER_CHANGED: 'user_changed',
 }));
 
-jest.mock('../../analytics', () => ({
+jest.mock('../analytics', () => ({
   configure: () => {},
   identifyAnonymousUser: jest.fn(),
   identifyAuthenticatedUser: jest.fn(),
diff --git a/src/react/AuthenticatedPageRoute.test.jsx b/src/react/AuthenticatedPageRoute.test.jsx
@@ -2,14 +2,14 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { Router, Route } from 'react-router-dom';
 import { createBrowserHistory } from 'history';
-import { getAuthenticatedUser, redirectToLogin } from '../../auth';
+import { getAuthenticatedUser, redirectToLogin } from '../auth';
 import AuthenticatedPageRoute from './AuthenticatedPageRoute';
 import AppContext from './AppContext';
-import { getConfig } from '../../config';
-import { sendPageEvent } from '../../analytics';
+import { getConfig } from '../config';
+import { sendPageEvent } from '../analytics';
 
-jest.mock('../../analytics');
-jest.mock('../../auth');
+jest.mock('../analytics');
+jest.mock('../auth');
 
 describe('AuthenticatedPageRoute', () => {
   let history;
diff --git a/src/react/ErrorBoundary.jsx b/src/react/ErrorBoundary.jsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 
-import { logError } from '../../logging';
+import { logError } from '../logging';
 
 import ErrorPage from './ErrorPage';
 
diff --git a/src/react/ErrorBoundary.test.jsx b/src/react/ErrorBoundary.test.jsx
@@ -3,9 +3,9 @@ import { mount } from 'enzyme';
 
 import ErrorBoundary from './ErrorBoundary';
 
-import { logError } from '../../logging';
+import { logError } from '../logging';
 
-jest.mock('../../logging');
+jest.mock('../logging');
 
 describe('ErrorBoundary', () => {
   beforeEach(() => {
diff --git a/src/react/ErrorPage.jsx b/src/react/ErrorPage.jsx
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Button } from '@edx/paragon';
 
-import { FormattedMessage } from '../../i18n';
+import { FormattedMessage } from '../i18n';
 
 export default class ErrorPage extends Component {
   /* istanbul ignore next */
diff --git a/src/react/LoginRedirect.jsx b/src/react/LoginRedirect.jsx
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { redirectToLogin } from '../../auth';
+import { redirectToLogin } from '../auth';
 /**
  * Wraps the call to redirectToLogin in a Component.
  */
diff --git a/src/react/PageRoute.jsx b/src/react/PageRoute.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Route } from 'react-router-dom';
-import { sendPageEvent } from '../../analytics';
+import { sendPageEvent } from '../analytics';
 
 // eslint-disable-next-line react/prop-types
 export default function PageRoute({ component: Component, ...props }) {
diff --git a/src/react/hooks.js b/src/react/hooks.js
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { subscribe, unsubscribe } from '../../pubSub';
+import { subscribe, unsubscribe } from '../pubSub';
 
 // eslint-disable-next-line import/prefer-default-export
 export const useAppEvent = (type, callback) => {
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
@@ -9,7 +9,7 @@ module.exports = createConfig('webpack-dev', {
   },
   resolve: {
     alias: {
-      '@edx/frontend-platform': path.resolve(__dirname),
+      '@edx/frontend-platform': path.resolve(__dirname, 'src'),
     },
   },
 });

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`{`
`7`	`7`	`"path": "@semantic-release/github",`
`8`	`8`	`"assets": {`
`9`		`- "path": "dist/*"`
	`9`	`+ "path": "*"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`],`
`@@ -18,10 +18,18 @@`
`18`	`18`	`{`
`19`	`19`	`"path": "@semantic-release/github",`
`20`	`20`	`"assets": {`
`21`		`- "path": "dist/*"`
	`21`	`+ "path": "*"`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`],`
`25`	`25`	`"success": [],`
`26`		`- "fail": []`
	`26`	`+ "fail": [],`
	`27`	`+ "plugins": [`
	`28`	`+ "@semantic-release/commit-analyzer",`
	`29`	`+ "@semantic-release/release-notes-generator",`
	`30`	`+ ["@semantic-release/npm", {`
	`31`	`+ "pkgRoot": "dist",`
	`32`	`+ }],`
	`33`	`+ "@semantic-release/git"`
	`34`	`+ ]`
`27`	`35`	`}`