Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Parcel fixes #171

Merged
merged 8 commits into from
Apr 18, 2020
Merged

Parcel fixes #171

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
89d37cc
fix(parcel): fixing the parcel build and other small changes
joeldenning Apr 17, 2020
f695362
fix(docs): fix contributing docs
joeldenning Apr 17, 2020
4b36380
fix(build): fixing build
joeldenning Apr 17, 2020
2f0e983
fix: build single-spa-angular b4 other packages
arturovt Apr 18, 2020
d9ecc22
fix(parcel): moving parcel to main lib
joeldenning Apr 18, 2020
8bb78dc
fix(docs): update docs
joeldenning Apr 18, 2020
86489ad
fix: parcel typings
arturovt Apr 18, 2020
6de53cf
fix: set unmounted to true initially
arturovt Apr 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 14 additions & 8 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,29 @@ To test out the angular schematics locally, run the following commands:
```sh
# First, fork the single-spa-angular repo and clone it.
# Then run the following commands inside of the single-spa-angular directory.
npm install
npm run build
npm link
yarn install
yarn build

## Now link the built files
cd lib
yarn link

# Now navigate to a new directory where we'll create an angular application to test this with
cd ..
cd ../..

## Now create an angular app
ng new

## This project uses yarn, so it's easiest to use yarn in your example project, too
yarn install

## Now install single-spa-angular from local file instead of npm, including running the schematics
npm link single-spa-angular
yarn link single-spa-angular
ng g single-spa-angular:ng-add
# Relink single-spa-angular (yes, it's necessary)
npm link single-spa-angular
yarn link single-spa-angular

## Now try things out!
ng build
ng serve
yarn build
yarn start
```
26 changes: 12 additions & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,35 @@
"private": true,
"scripts": {
"prepublishOnly": "yarn build && yarn test",
"clean": "rimraf lib pacel",
"build": "run-s clean build:single-spa-angular build:webpack build:schematics",
"test": "yarn clean && yarn jest",
"lint": "eslint ./src/**/*.ts",
":copy-schematic-files": "cpx \"src/**/_files/**/**\" lib",
"parcel": "ngc -p tsconfig.parcel.json",
"clean": "rimraf lib parcel",
"build": "yarn clean && concurrently yarn:build:parcel yarn:build:single-spa-angular yarn:build:webpack yarn:build:schematics",
"test": "yarn clean && jest",
"lint": "eslint src --ext ts",
"build:parcel": "ngc -p tsconfig.parcel.json",
"// - SINGLE-SPA-ANGULAR": "Scripts for building single-spa-angular",
"build:single-spa-angular": "yarn ts-node tools/build",
"// - WEBPACK": "Scripts for building Webpack config transformer",
"prebuild:webpack": "rimraf lib/lib",
"build:webpack": "tsc -p tsconfig.webpack.json",
"// - SCHEMATICS": "Scripts for building schematics and copying its files",
"prebuild:schematics": "rimraf lib/schematics",
"build:schematics": "tsc -p tsconfig.schematics.json && run-s copy:schematics:*",
"build:schematics": "tsc -p tsconfig.schematics.json && concurrently yarn:copy:schematics:*",
"copy:schematics:json": "cpx schematics/schematics.json lib/schematics",
"copy:schematics:schema": "cpx \"schematics/ng-add/schema*\" lib/schematics/ng-add",
"copy:schematics:files": "cpx \"schematics/ng-add/_files/**/**\" lib/schematics/ng-add/_files",
"format": "prettier './**/*' --write",
"// - INTEGRATION INSTALLS": "Install packages for integration apps",
"install:integration:shop": "yarn --cwd integration/shop install",
"install:integration:portal": "yarn --cwd integration/portal install",
"install:integration": "run-s install:integration:shop install:integration:portal",
"install:integration": "concurrently yarn:install:integration:shop yarn:install:integration:portal",
"// - INTEGRATION BUILDS": "Build apps that are required for E2E testing #requires yarn install:integration",
"build:integration:shop": "yarn --cwd integration/shop build:single-spa",
"build:integration:portal": "yarn --cwd integration/portal build:prod",
"build:integration": "run-s build:integration:shop build:integration:portal",
"build:integration": "concurrently yarn:build:integration:shop yarn:build:integration:portal",
"// - APPS": "Serve apps that are required for E2E testing #requires yarn build:integration",
"start:integration": "concurrently -n w: yarn:start:integration:*",
"start:integration:shop": "yarn serve integration/shop/dist -s -l 4200 --cors",
"start:integration:portal": "yarn serve integration/portal/dist -s -l 8080",
"start:integration:shop": "serve integration/shop/dist -s -l 4200 --cors",
"start:integration:portal": "serve integration/portal/dist -s -l 8080",
"// - E2E": "E2E testing",
"cy:open": "cypress open --config integrationFolder=cypress/integration",
"cy:run": "cypress run --config integrationFolder=cypress/integration",
Expand Down Expand Up @@ -95,20 +94,19 @@
"jest": "^24.5.0",
"lint-staged": "^10.1.3",
"ng-packagr": "^9.1.0",
"npm-run-all": "^4.1.5",
arturovt marked this conversation as resolved.
Show resolved Hide resolved
"prettier": "^2.0.4",
"rimraf": "^2.6.2",
"rxjs": "~6.5.5",
"serve": "^11.3.0",
"start-server-and-test": "^1.10.11",
"start-server-and-test": "^1.11.0",
"ts-jest": "^24.0.0",
"tsickle": "^0.38.1",
"tslib": "^1.11.1",
"typescript": "3.7.5",
"zone.js": "~0.10.3"
},
"dependencies": {
"single-spa": ">= 5.1.1"
"single-spa": ">= 4"
arturovt marked this conversation as resolved.
Show resolved Hide resolved
},
"prettier": {
"semi": true,
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.parcel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"compilerOptions": {
"target": "es2015",
"outDir": "./parcel",
"rootDir": "src/browser-lib/parcel-lib"
"rootDir": "src/src/parcel-lib"
},
"include": ["src/browser-lib/parcel-lib/**/*"],
"include": ["src/src/parcel-lib/index.ts"],
arturovt marked this conversation as resolved.
Show resolved Hide resolved
"angularCompilerOptions": {
"skipTemplateCodegen": true
}
Expand Down
49 changes: 8 additions & 41 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7435,11 +7435,6 @@ memory-fs@^0.5.0:
errno "^0.1.3"
readable-stream "^2.0.1"

memorystream@^0.3.1:
version "0.3.1"
resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=

meow@5.0.0, meow@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
Expand Down Expand Up @@ -8023,21 +8018,6 @@ npm-registry-fetch@^8.0.0:
minizlib "^2.0.0"
npm-package-arg "^8.0.0"

npm-run-all@^4.1.5:
version "4.1.5"
resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
dependencies:
ansi-styles "^3.2.1"
chalk "^2.4.1"
cross-spawn "^6.0.5"
memorystream "^0.3.1"
minimatch "^3.0.4"
pidtree "^0.3.0"
read-pkg "^3.0.0"
shell-quote "^1.6.1"
string.prototype.padend "^3.0.0"

npm-run-path@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
Expand Down Expand Up @@ -8594,11 +8574,6 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.0.7:
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==

pidtree@^0.3.0:
version "0.3.1"
resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==

pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
Expand Down Expand Up @@ -10142,10 +10117,10 @@ simple-swizzle@^0.2.2:
dependencies:
is-arrayish "^0.3.1"

"single-spa@>= 5.1.1":
version "5.3.1"
resolved "https://registry.yarnpkg.com/single-spa/-/single-spa-5.3.1.tgz#ca11d7070d4fd8148f97f59adfdb0135db619a1e"
integrity sha512-UgoLq0Dl3Up5tgR1F/CBbY76eVZKeg/rH3dFf/MoL6NT+jYkgvpujb1LRL1bnShInZGMBPSiz7NW7FgtC6SuUQ==
"single-spa@>= 4":
version "5.3.2"
resolved "https://registry.yarnpkg.com/single-spa/-/single-spa-5.3.2.tgz#dfc0b97145819a77e7c2777ddcc9fb8fe639c234"
integrity sha512-3FKoXRkWbluoHI9eZ05KecsJqfXHaSSYeh3+Z0WlSwzm8YCpZYIyr8RM4U+5sp+q69X9wrY7+wEmnarvaiyO4A==

sisteransi@^1.0.4:
version "1.0.5"
Expand Down Expand Up @@ -10451,10 +10426,10 @@ stack-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==

start-server-and-test@^1.10.11:
version "1.10.11"
resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.10.11.tgz#24290ee8a5ed15f4a34e9bb45a5d6ff93c93c83e"
integrity sha512-CZilaj293uQWdD4vgOxTOuzlCWxOyBm6bzmH1r6OGLG/q5zcBmGYevLfOimkg0kSn9jLHwYSXLuoKG/DDQJhww==
start-server-and-test@^1.11.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.11.0.tgz#1b1a83d062b0028ee6e296bb4e0231f2d8b2f4af"
integrity sha512-FhkJFYL/lvbd0tKWvbxWNWjtFtq3Zpa09QDjA8EUH88AsgNL4hkAAKYNmbac+fFM8/GIZoJ1Mj4mm3SMI0X1bA==
dependencies:
bluebird "3.7.2"
check-more-types "2.24.0"
Expand Down Expand Up @@ -10574,14 +10549,6 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.0"

string.prototype.padend@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz#dc08f57a8010dc5c153550318f67e13adbb72ac3"
integrity sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==
dependencies:
define-properties "^1.1.3"
es-abstract "^1.17.0-next.1"

string.prototype.trimend@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz#ee497fd29768646d84be2c9b819e292439614373"
Expand Down