Skip to content

Commit

Permalink
fix(universal): update dependencies to support universal enviro… (#2057)
Browse files Browse the repository at this point in the history
  • Loading branch information
denStrigo authored and yggg committed Nov 20, 2019
1 parent d84e76b commit 0b22c40
Show file tree
Hide file tree
Showing 24 changed files with 592 additions and 182 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ testem.log
/docs/output.json
/docs/assets/examples
/docs/dist
/packages-smoke/dist

# e2e
/e2e/*.js
Expand Down
4 changes: 0 additions & 4 deletions DEV_DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
- add the package into packages-smoke application dependencies to verify it works properly in isolation.
- add the package into change-prefix.ts which builds our packages with custom prefix.

# New Package Dependency Checklist
- run `npm run update-packages-smoke-lock` to update packages-smoke/package-lock.json and commit updated package lock

# Objectives
The aim of the project is to create a set of useful Angular modules which help to bootstrap the development.

Expand Down Expand Up @@ -393,7 +390,6 @@ To start a new release (publish the framework packages on NPM) you need:
2. `npm run release:validate` - this will create ready for publishing packages in src/.lib then build prod & AOT builds of the playground app using prepared packages and then run e2e tests again it.
3. MANUALLY update a version in main ./package.json to a new one
4.
* `npm run update-packages-smoke-lock` to update `packages-smoke/package-lock.json`
* `npm run version:bump`
* update version in `package-lock.json` and `packages-smoke/package-lock.json`
* when releasing current version (PR to master) also update [docs/versions.json](#docs-deploy):
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"release:dev": "npm-run-all release:prepare:dev publish",
"release": "npm-run-all release:validate publish",
"publish": "./scripts/publish.sh",
"update-packages-smoke-lock": "./scripts/update-packages-smoke-lock.sh",
"cli:firefox-fix": "rimraf node_modules/@angular-devkit/build-angular/node_modules/uglify-es && rimraf node_modules/@angular-devkit/build-angular/node_modules/uglifyjs-webpack-plugin",
"postinstall": "npm-run-all -p cli:firefox-fix build:dev-schematics",
"gen:playground": "ng g .:playground",
Expand Down Expand Up @@ -99,10 +98,10 @@
"core-js": "2.5.7",
"date-fns": ">=2.0.0-alpha.16 <=2.0.0-alpha.27",
"docsearch.js": "^2.5.2",
"eva-icons": "^1.1.1",
"eva-icons": "^1.1.2",
"gulp-bump": "2.7.0",
"highlight.js": "9.12.0",
"intersection-observer": "0.5.0",
"intersection-observer": "0.7.0",
"ionicons": "2.0.1",
"jasmine-fail-fast": "2.0.0",
"leaflet": "1.0.3",
Expand Down
13 changes: 13 additions & 0 deletions packages-smoke/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,16 @@

This project is used to verify all nebular packages were built properly.
We just install newly build packages in this app and build it in production mode.

# To run locally
1. Run `npm run release:prepare` in the project root.
2. Copy folder .lib from `src/.lib` to `packages-smoke/.lib`
3. Go to folder packages-smoke run `npm install`
4. Verifying application build:
- `npm run build -- --prod`
- `npm run build -- --configuration=production-2015`
- `npm run e2e`
- `npm run e2e -- --configuration=production-2015`
5. Run with ssr:
- `npm run build:ssr`
- `npm run serve:ssr`
25 changes: 24 additions & 1 deletion packages-smoke/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/packages-smoke",
"outputPath": "dist/browser",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
Expand Down Expand Up @@ -137,6 +137,29 @@
"**/node_modules/**"
]
}
},
"server": {
"builder": "@angular-devkit/build-angular:server",
"options": {
"outputPath": "dist/server",
"main": "src/main.server.ts",
"tsConfig": "src/tsconfig.server.json"
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"sourceMap": false,
"optimization": {
"scripts": false,
"styles": true
}
}
}
}
}
},
Expand Down
Loading

0 comments on commit 0b22c40

Please sign in to comment.