upstndr - npm Package Compare versions

Comparing version 0.0.11 to 0.0.12

dist/app/configureStore.js

@@ -28,4 +28,4 @@ "use strict";
     if (module.hot) {
-        module.hot.accept('containers/App/reducers', () => {
-            store.replaceReducer(reducerInjectors_1.createReducer(store.injectedReducers));
+        module.hot.accept('./', () => {
+            store.replaceReducer(reducerInjectors_1.createReducer(store));
         });
@@ -32,0 +32,0 @@ }

dist/app/utils/reducerInjectors.d.ts

 import { Reducer } from 'redux';
 import { Store } from '../configureStore';
-export declare function createReducer(injectedReducers?: {
-    [key: string]: Reducer;
-}): Reducer<{
+export declare function createReducer(store: Store): Reducer<{
     router: {
@@ -18,3 +16,5 @@ location: object | null;
 }, import("redux").AnyAction>;
-export declare function getReducer(state: object): Reducer<{
+export declare function getReducer(state: {
+    [key: string]: any;
+}): Reducer<{
     router: {
@@ -21,0 +21,0 @@ location: object | null;

dist/app/utils/reducerInjectors.js

@@ -9,13 +9,17 @@ "use strict";
 const entities_1 = __importDefault(require("../reducers/entities"));
-function createReducer(injectedReducers) {
-    return redux_1.combineReducers(Object.assign({ router: router_1.default,
-        entities: entities_1.default }, injectedReducers));
+// Mock reducers instantly before they will be replaced by real reducers
+// Because we don't know about server state on client side on startup
+const makeReducersFromState = (state) => Object.keys(state).reduce((a, b) => (Object.assign({}, a, { [b]: () => state[b] })), {});
+function createReducer(store) {
+    const state = store.getState();
+    const stateReducers = makeReducersFromState(state);
+    const { injectedReducers } = store;
+    return redux_1.combineReducers(Object.assign({}, stateReducers, injectedReducers, { router: router_1.default,
+        entities: entities_1.default }));
 }
 exports.createReducer = createReducer;
 function getReducer(state) {
-    // Mock reducers instantly before they will be replaced by real reducers
-    // Because we don't know about server state on client side on startup
-    const stateReducers = Object.keys(state).reduce((a, b) => (Object.assign({}, a, { [b]: (c) => c || null })), {});
-    return redux_1.combineReducers(Object.assign({ router: router_1.default,
-        entities: entities_1.default }, stateReducers));
+    const stateReducers = makeReducersFromState(state);
+    return redux_1.combineReducers(Object.assign({}, stateReducers, { router: router_1.default,
+        entities: entities_1.default }));
 }
@@ -30,3 +34,3 @@ exports.getReducer = getReducer;
         store.injectedReducers[key] = reducer;
-        store.replaceReducer(createReducer(store.injectedReducers));
+        store.replaceReducer(createReducer(store));
     };
@@ -33,0 +37,0 @@ }

dist/bin/upstndr.js

@@ -10,4 +10,4 @@ #!/usr/bin/env node
 const projectTsConfig = cwd + '/' + tsConfigFile;
-if (!fs.existsSync(projectTsConfig))
-    fs.copyFileSync(`${__dirname}/../../src/app/${tsConfigFile}`, projectTsConfig);
+// if (!fs.existsSync(projectTsConfig))
+//   fs.copyFileSync(`${__dirname}/../../src/app/${tsConfigFile}`, projectTsConfig)
 require('tsconfig-paths').register({
@@ -14,0 +14,0 @@ baseUrl: cwd + '/app',

dist/server/middlewares/react.js

@@ -16,2 +16,3 @@ "use strict";
 const debug_1 = __importDefault(require("debug"));
+const fs_1 = __importDefault(require("fs"));
 const server_1 = require("react-dom/server");
@@ -25,3 +26,5 @@ const react_router_1 = require("react-router");
 const index_html_1 = __importDefault(require("../index.html"));
-const App = require(process.cwd() + '/app/containers/App').default;
+const App = fs_1.default.existsSync(`${process.cwd()}/app/server/App`)
+    ? require(`${process.cwd()}/app/server/App`).default
+    : require(`${process.cwd()}/app/containers/App`).default;
 const render = ({ url, context, js }) => (store, preloadedState) => emotion_server_1.renderStylesToString(server_1.renderToString(react_1.default.createElement(index_html_1.default, { body: react_1.default.createElement(react_redux_1.Provider, { store: store },
@@ -28,0 +31,0 @@ react_1.default.createElement(react_router_1.StaticRouter, { location: url, context: context },

dist/server/serverDev.js

@@ -6,2 +6,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
@@ -12,7 +13,11 @@ const koa_1 = __importDefault(require("koa"));
 const koa_webpack_1 = __importDefault(require("koa-webpack"));
+const koa_static_cache_1 = __importDefault(require("koa-static-cache"));
+const koa_json_1 = __importDefault(require("koa-json"));
 const api_1 = __importDefault(require("./middlewares/api"));
 const react_1 = __importDefault(require("./middlewares/react"));
 const webpackStats_1 = __importDefault(require("./middlewares/webpackStats"));
-const development_config_1 = __importDefault(require("../webpack/development.config"));
-const compiler = webpack_1.default(development_config_1.default);
+const importer_1 = __importDefault(require("../webpack/importer"));
+const { PORT = 3000 } = process.env;
+const config = importer_1.default('development.config');
+const compiler = webpack_1.default(config);
 const app = new koa_1.default();
@@ -23,13 +28,15 @@ const router = new koa_router_1.default();
     app
+        .use(koa_static_cache_1.default(path_1.default.join(process.cwd(), '/app/static'), { maxAge: 0, gzip: true, dynamic: true, prefix: '/static' }))
         .use(router.routes())
         .use(router.allowedMethods())
+        .use(koa_json_1.default())
         .use(koaWebpackMiddleware)
         .use(webpackStats_1.default())
         .use(react_1.default)
-        .listen(3000);
-    debug_1.default('server')('Ready. Listen on http://localhost:3000');
+        .listen(PORT);
+    debug_1.default('server')(`Ready. Listen on http://localhost:${PORT}`);
 };
 koa_webpack_1.default({
     compiler,
-    config: development_config_1.default,
+    config,
     devMiddleware: {
@@ -36,0 +43,0 @@ serverSideRender: true,

dist/server/serverProd.js

@@ -11,2 +11,3 @@ "use strict";
 const koa_static_cache_1 = __importDefault(require("koa-static-cache"));
+const koa_json_1 = __importDefault(require("koa-json"));
 const webpack_1 = __importDefault(require("webpack"));
@@ -16,6 +17,8 @@ const api_1 = __importDefault(require("./middlewares/api"));
 const webpackStats_1 = __importDefault(require("./middlewares/webpackStats"));
-const production_config_1 = __importDefault(require("../webpack/production.config"));
+const importer_1 = __importDefault(require("../webpack/importer"));
+const { PORT = 3000 } = process.env;
+const config = importer_1.default('production.config');
 const app = new koa_1.default();
 const router = new koa_router_1.default();
-webpack_1.default(production_config_1.default, (err, stats) => {
+webpack_1.default(config, (err, stats) => {
     if (err)
@@ -28,7 +31,8 @@ throw err;
         .use(router.allowedMethods())
+        .use(koa_json_1.default())
         .use(webpackStats_1.default(stats))
         .use(react_1.default)
-        .listen(3000);
-    debug_1.default('server')('Ready. Listen on http://localhost:3000');
+        .listen(PORT);
+    debug_1.default('server')(`Ready. Listen on http://localhost:${PORT}`);
 });
 //# sourceMappingURL=serverProd.js.map

package.json

 {
   "name": "upstndr",
   "description": "A full-stack ReactJS framework. Written on TypeScript.",
-  "version": "0.0.11",
-  "main": "dist/lib/index.js",
-  "types": "dist/lib/index.d.ts",
+  "version": "0.0.12",
+  "main": "src/lib/index.ts",
+  "types": "src/lib/index.d.ts",
   "author": "MaxSvargal <[e-mail]>",
@@ -15,3 +15,3 @@ "license": "MIT",
   "bin": {
-    "upstndr": "dist/bin/upstndr.js"
+    "upstndr": "src/bin/upstndr.ts"
   },
@@ -29,2 +29,3 @@ "files": [
     "@types/koa": "^2.0.46",
+    "@types/koa-json": "^2.0.18",
     "@types/koa-router": "^7.0.30",
@@ -37,2 +38,3 @@ "@types/koa-static-cache": "^5.1.0",
     "@types/react-redux": "^6.0.5",
+    "@types/react-router": "^4.0.31",
     "@types/react-router-dom": "^4.3.0",
@@ -43,3 +45,3 @@ "@types/webpack": "^4.4.8",
     "connected-react-router": "^4.3.0",
-    "debug": "^3.1.0",
+    "debug": "^4.0.1",
     "emotion": "^9.2.6",
@@ -52,2 +54,3 @@ "emotion-server": "^9.2.6",
     "koa": "^2.5.2",
+    "koa-json": "^2.0.2",
     "koa-router": "^7.4.0",
@@ -62,2 +65,3 @@ "koa-static-cache": "^5.1.2",
     "react-redux": "^5.0.7",
+    "react-router": "^4.3.1",
     "react-router-dom": "^4.3.1",
@@ -70,3 +74,3 @@ "redux": "^4.0.0",
     "svg-url-loader": "^2.3.2",
-    "ts-loader": "^4.4.2",
+    "ts-loader": "^5.1.1",
     "ts-node": "^7.0.0",
@@ -73,0 +77,0 @@ "tsconfig-paths": "^3.5.0",

src/app/configureStore.ts

@@ -49,4 +49,4 @@ import { composeWithDevTools } from 'redux-devtools-extension/developmentOnly'
   if (module.hot) {
-    module.hot.accept('containers/App/reducers', () => {
-      store.replaceReducer(createReducer(store.injectedReducers));
+    module.hot.accept('./', () => {
+      store.replaceReducer(createReducer(store))
     })
@@ -53,0 +53,0 @@ }

src/app/utils/reducerInjectors.ts

@@ -7,19 +7,27 @@ import { combineReducers, Reducer } from 'redux'
 
-export function createReducer(injectedReducers?: { [key: string]: Reducer }) {
+// Mock reducers instantly before they will be replaced by real reducers
+// Because we don't know about server state on client side on startup
+const makeReducersFromState = (state: { [key: string]: Function }) =>
+  Object.keys(state).reduce((a, b) => ({ ...a, [b]: () => state[b] }), {})
+
+export function createReducer(store: Store) {
+  const state = store.getState()
+  const stateReducers = makeReducersFromState(state)
+  const { injectedReducers } = store
+
   return combineReducers({
+    ...stateReducers,
+    ...injectedReducers,
     router,
     entities,
-    ...injectedReducers,
   })
 }
 
-export function getReducer(state: object) {
-  // Mock reducers instantly before they will be replaced by real reducers
-  // Because we don't know about server state on client side on startup
-  const stateReducers = Object.keys(state).reduce((a, b) => ({ ...a, [b]: (c: any) => c || null }), {})
+export function getReducer(state: { [key: string]: any }) {
+  const stateReducers = makeReducersFromState(state)
 
   return combineReducers({
+    ...stateReducers,
     router,
     entities,
-    ...stateReducers
   })
@@ -37,3 +45,3 @@ }
     store.injectedReducers[key] = reducer
-    store.replaceReducer(createReducer(store.injectedReducers))
+    store.replaceReducer(createReducer(store))
   }
@@ -40,0 +48,0 @@ }

src/bin/upstndr.ts

@@ -12,4 +12,4 @@ #!/usr/bin/env node
 
-if (!fs.existsSync(projectTsConfig))
-  fs.copyFileSync(`${__dirname}/../../src/app/${tsConfigFile}`, projectTsConfig)
+// if (!fs.existsSync(projectTsConfig))
+//   fs.copyFileSync(`${__dirname}/../../src/app/${tsConfigFile}`, projectTsConfig)
 
@@ -16,0 +16,0 @@ require('tsconfig-paths').register({

src/server/serverDev.ts

@@ -0,1 +1,2 @@
+import path from 'path'
 import debug from 'debug'
@@ -6,2 +7,4 @@ import Koa, { Middleware } from 'koa'
 import koaWebpack, { Options } from 'koa-webpack'
+import staticCache from 'koa-static-cache'
+import json from 'koa-json'
 
@@ -12,4 +15,7 @@ import initApi from './middlewares/api'
 
-import config from '../webpack/development.config'
+import configImporter from '../webpack/importer'
 
+const { PORT = 3000 } = process.env
+
+const config = configImporter('development.config')
 const compiler = webpack(config) as Compiler
@@ -22,10 +28,12 @@ const app = new Koa()
   app
+    .use(staticCache(path.join(process.cwd(), '/app/static'), { maxAge: 0, gzip: true, dynamic: true, prefix: '/static' }))
     .use(router.routes())
     .use(router.allowedMethods())
+    .use(json())
     .use(koaWebpackMiddleware)
     .use(webpackStats())
     .use(react)
-    .listen(3000)
+    .listen(PORT)
 
-    debug('server')('Ready. Listen on http://localhost:3000')
+    debug('server')(`Ready. Listen on http://localhost:${PORT}`)
 }
@@ -32,0 +40,0 @@

src/server/serverProd.ts

@@ -6,2 +6,3 @@ import path from 'path'
 import staticCache from 'koa-static-cache'
+import json from 'koa-json'
 import webpack, { Stats }  from 'webpack'
@@ -13,4 +14,7 @@
 
-import config from '../webpack/production.config'
+import configImporter from '../webpack/importer'
 
+const { PORT = 3000 } = process.env
+
+const config = configImporter('production.config')
 const app = new Koa()
@@ -26,7 +30,8 @@ const router = new Router()
     .use(router.allowedMethods())
+    .use(json())
     .use(webpackStats(stats))
     .use(react)
-    .listen(3000)
+    .listen(PORT)
 
-  debug('server')('Ready. Listen on http://localhost:3000')
+  debug('server')(`Ready. Listen on http://localhost:${PORT}`)
 })

New alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Filesystem access

Supply chain risk

Accesses the file system, and could potentially read sensitive data.

Found 1 instance in 1 package

Fixed alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

102355

increased by5.79%

Number of package files

135

increased by6.3%

Lines of code

1865

increased by4.83%

Worsened metrics

Dependency count

52

increased by8.33%

Number of low supply chain risk alerts

21

increased by90.91%

Dependency changes

• + Added@types/koa-json@^2.0.18

• + Added@types/react-router@^4.0.31

• + Addedkoa-json@^2.0.2

• + Addedreact-router@^4.3.1

• + Added@types/koa-json@2.0.23(transitive)

• + Added@types/react-router@4.4.5(transitive)

• + Addedkoa-is-json@1.0.0(transitive)

• + Addedkoa-json@2.0.2(transitive)

• + Addedstreaming-json-stringify@3.1.0(transitive)

• + Addedts-loader@5.4.5(transitive)

• - Removed@types/history@4.7.11(transitive)

• - Removed@types/react-router@5.1.20(transitive)

• - Removedms@2.1.3(transitive)

• - Removedts-loader@4.5.0(transitive)

• Updateddebug@^4.0.1

• Updatedts-loader@^5.1.1