Skip to content

fix: Issue with example-app compilation, script rework, minor cleanup #71

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

Merged
merged 3 commits into from
Jan 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 18 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
{
"name": "platform",
"private": true,
"workspaces": [
"packages/*"
],
"workspaces": {
"packages": [
"packages/*"
],
"nohoist": [
"example-app/@angular-redux/store",
"example-app/@angular-redux/form",
"example-app/@angular-redux/router",
"example-app/ng-packagr"
]
},
"scripts": {
"build": "npm-run-all build:*",
"build:store": "ng-packagr -p packages/store",
"build:form": "ng-packagr -p packages/form",
"build:router": "ng-packagr -p packages/router",
"release:canary": "lerna publish --canary --npm-tag next --npm-client npm",
"build:store": "yarn workspace @angular-redux/store build",
"build:form": "yarn workspace @angular-redux/form build",
"build:router": "yarn workspace @angular-redux/router build",
"release:canary": "lerna publish --canary --contents dist --dist-tag next",
"release:stable": "lerna version",
"release:stable:ci": "lerna publish from-git",
"release:stable:ci": "lerna publish from-git --contents dist",
"clean": "npm-run-all -p clean:*",
"clean:deps": "npm-run-all -p clean:deps:*",
"clean:deps:workspace": "rimraf node_modules",
Expand All @@ -26,7 +34,8 @@
"test:ci": "jest --coverage --ci --maxWorkers=2",
"test:watch": "jest --watch",
"commit": "commit",
"prettier": "prettier --write \"**/*.*(ts|js|css|scss|json|md)\""
"prettier": "prettier --write \"**/*.*(ts|js|css|scss|json|md)\"",
"run:app": "yarn workspace example-app bootstrap && yarn workspace example-app start"
},
"lint-staged": {
"*.{ts,js,css,scss,json,md}": [
Expand Down
8 changes: 8 additions & 0 deletions packages/example-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ application.
- [@angular-redux/form](/packages/form) Time travel with Angular forms
- [Redux DevTools Chrome Extension](https://github.com/zalmoxisus/redux-devtools-extension)

## Bootstrapping

Before being able to run the app, you will need to bootstrap the workspace dependencies linked by yarn. This can be done using the command `yarn bootstrap`.

## Development server

Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
Expand All @@ -31,6 +35,10 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
Before running the tests make sure you are serving the app via `ng serve`.

## Using the folder as a standalone

The versions included in `package.json` for the `@angular-redux` dependencies are linked using **yarn workspaces** and will need to be changed to a _latest_ or _next_ version if you want to detach the app as a standalone.

## Further help

To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
6 changes: 5 additions & 1 deletion packages/example-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e"
"e2e": "ng e2e",
"bootstrap": "npm-run-all bootstrap:*",
"bootstrap:store": "npm explore @angular-redux/store -- npm run build",
"bootstrap:form": "npm explore @angular-redux/form -- npm run build",
"bootstrap:router": "npm explore @angular-redux/router -- npm run build"
},
"engines": {
"node": ">=8"
Expand Down
3 changes: 1 addition & 2 deletions packages/example-app/src/app/store/reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ import { combineReducers } from 'redux';
import { createAnimalAPIReducer } from '../animals/api/reducer';
import { ANIMAL_TYPES } from '../animals/model';

const elephant = createAnimalAPIReducer(ANIMAL_TYPES.ELEPHANT);
// Define the global store shape by combining our application's
// reducers together into a given structure.
export const rootReducer = composeReducers(
defaultFormReducer<unknown>(),
combineReducers({
elephant,
elephant: createAnimalAPIReducer(ANIMAL_TYPES.ELEPHANT),
lion: createAnimalAPIReducer(ANIMAL_TYPES.LION),
router: routerReducer,
}),
Expand Down
22 changes: 2 additions & 20 deletions packages/example-app/src/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,8 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"lib": ["es2016", "dom"],
"outDir": "../out-tsc/app",
"target": "es5",
"module": "es2015",
"baseUrl": ".",
"types": [],
"paths": {
"@angular/*": ["../node_modules/@angular/*"]
},

// Causes problems for @Outputs. See https://github.com/angular/angular/issues/17131.
// "noUnusedParameters": true,
// "noUnusedLocals": true,

"forceConsistentCasingInFileNames": true,
"pretty": true
"types": []
},
"exclude": ["test.ts", "**/*.spec.ts"]
}
3 changes: 1 addition & 2 deletions packages/example-app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
"experimentalDecorators": true,
"importHelpers": true,
"target": "es5",
"typeRoots": ["node_modules/@types"],
"lib": ["es2018", "dom"],
"paths": {
"@angular/*": ["../node_modules/@angular/*"]
"@angular-redux/*": ["node_modules/@angular-redux/*/dist"]
},

// Causes problems for @Outputs with AoT.
Expand Down
7 changes: 5 additions & 2 deletions packages/form/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"author": "Chris Bond",
"license": "MIT",
"homepage": "https://github.com/angular-redux/platform",
"main": "src/index.ts",
"scripts": {
"build": "ng-packagr -p ."
},
"repository": {
"type": "git",
"url": "git+https://github.com/angular-redux/platform.git"
Expand Down Expand Up @@ -33,6 +37,5 @@
},
"dependencies": {
"immutable": "^4.0.0-rc.12"
},
"main": "src/index.ts"
}
}
7 changes: 5 additions & 2 deletions packages/router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"author": "Dag Stuan",
"license": "MIT",
"homepage": "https://github.com/angular-redux/platform",
"main": "src/index.ts",
"scripts": {
"build": "ng-packagr -p ."
},
"repository": {
"type": "git",
"url": "git+https://github.com/angular-redux/platform.git"
Expand Down Expand Up @@ -32,6 +36,5 @@
"@angular/router": "^7.0.0",
"redux": "^4.0.0",
"rxjs": "^6.0.0"
},
"main": "src/index.ts"
}
}
1 change: 0 additions & 1 deletion packages/router/src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export class NgReduxRouter {
constructor(
private router: Router,
private ngRedux: NgRedux<any>,
// private applicationRef: ApplicationRef,
private location: Location,
) {}

Expand Down
7 changes: 5 additions & 2 deletions packages/store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"author": "William Buchwalter <[email protected]> (http://github.com/wbuchwalter)",
"license": "MIT",
"homepage": "https://github.com/angular-redux/platform",
"main": "src/index.ts",
"scripts": {
"build": "ng-packagr -p ."
},
"repository": {
"type": "git",
"url": "git+https://github.com/angular-redux/platform.git"
Expand Down Expand Up @@ -32,6 +36,5 @@
},
"devDependencies": {
"redux-devtools-extension": "^2.13.7"
},
"main": "src/index.ts"
}
}