Merge branch 'feature/pnpm' into 'develop'

🔧 Migrate to pnpm

See merge request NatoBoram/public-gateway-cacher!8
merge-requests/9/merge
Nato Boram 2022-03-11 03:40:16 +00:00
commit 71b337ce7d
9 changed files with 8692 additions and 8327 deletions

View File

@ -1,7 +1,9 @@
image: node:latest image: node:latest
before_script: before_script:
- yarn - curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
- pnpm config set store-dir .pnpm-store
- pnpm i
variables: variables:
# https://stackoverflow.com/a/69746937/5083247 # https://stackoverflow.com/a/69746937/5083247
@ -10,15 +12,14 @@ variables:
cache: cache:
key: key:
files: files:
- package.json - pnpm-lock.yaml
- yarn.lock
paths: paths:
- node_modules - .pnpm-store
build: build:
stage: build stage: build
script: script:
- yarn run build:prod - pnpm run build:prod
artifacts: artifacts:
paths: paths:
- dist/angular - dist/angular
@ -26,12 +27,12 @@ build:
test: test:
stage: test stage: test
script: script:
- yarn run lint - pnpm run lint
pages: pages:
stage: deploy stage: deploy
script: script:
- yarn run build:gitlab - pnpm run build:gitlab
- mv dist/angular public - mv dist/angular public
- cp public/index.html public/404.html - cp public/index.html public/404.html
artifacts: artifacts:

View File

@ -1,3 +1,3 @@
{ {
"packageManager": "yarn" "packageManager": "pnpm"
} }

View File

@ -1,6 +1,4 @@
{ {
"line-length": { "line_length": false,
"line_length": 140
},
"no-duplicate-heading": false "no-duplicate-heading": false
} }

View File

@ -14,7 +14,7 @@
".html" ".html"
] ]
}, },
"eslint.packageManager": "yarn", "eslint.packageManager": "pnpm",
"eslint.validate": [ "eslint.validate": [
"javascript", "javascript",
"javascriptreact", "javascriptreact",
@ -29,8 +29,8 @@
"html.format.maxPreserveNewLines": 1, "html.format.maxPreserveNewLines": 1,
"html.format.wrapAttributes": "auto", "html.format.wrapAttributes": "auto",
"html.format.wrapLineLength": 140, "html.format.wrapLineLength": 140,
"npm.packageManager": "yarn", "npm.packageManager": "pnpm",
"tslint.packageManager": "yarn", "tslint.packageManager": "pnpm",
"typescript.preferences.importModuleSpecifier": "relative", "typescript.preferences.importModuleSpecifier": "relative",
"typescript.tsdk": "node_modules\\typescript\\lib", "typescript.tsdk": "node_modules\\typescript\\lib",
"typescript.updateImportsOnFileMove.enabled": "always" "typescript.updateImportsOnFileMove.enabled": "always"

View File

@ -11,33 +11,4 @@ You can view this website on [GitLab Pages](https://natoboram.gitlab.io/public-g
**NOTE :** All of these (except `ipfs.io` and `dweb.link`) are hosted by third-parties and should be treated as such. **NOTE :** All of these (except `ipfs.io` and `dweb.link`) are hosted by third-parties and should be treated as such.
If you'd like to add a new public gateway, please go to If you'd like to add a new public gateway, please go to [github.com/ipfs/public-gateway-checker](https://github.com/ipfs/public-gateway-checker), submit a pull request then open an issue [here](https://gitlab.com/NatoBoram/public-gateway-cacher/issues/new).
[github.com/ipfs/public-gateway-checker](https://github.com/ipfs/public-gateway-checker), submit a pull request then open an issue [here](https://gitlab.com/NatoBoram/public-gateway-cacher/issues/new).
## Angular
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.3.20.
### 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.
### Code scaffolding
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
### Build
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
### Running unit tests
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
### Running end-to-end tests
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
### 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).

View File

@ -2,7 +2,7 @@
"$schema": "./node_modules/@angular/cli/lib/config/schema.json", "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1, "version": 1,
"cli": { "cli": {
"packageManager": "yarn", "packageManager": "pnpm",
"analytics": "10b848ad-8b81-4346-852f-5eff89573a85", "analytics": "10b848ad-8b81-4346-852f-5eff89573a85",
"defaultCollection": "@angular-eslint/schematics" "defaultCollection": "@angular-eslint/schematics"
}, },

View File

@ -33,7 +33,7 @@
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
"e2e": "ng e2e", "e2e": "ng e2e",
"publish:ipfs": "yarn run build:ipfs && ipfs add --recursive --chunker=buzhash --cid-version=1 dist/angular", "publish:ipfs": "pnpm run build:ipfs && ipfs add --recursive --chunker=buzhash --cid-version=1 dist/angular",
"postinstall": "ngcc" "postinstall": "ngcc"
}, },
"dependencies": { "dependencies": {
@ -50,7 +50,7 @@
"@angular/router": "~13.2.6", "@angular/router": "~13.2.6",
"bootstrap": "^5.1.3", "bootstrap": "^5.1.3",
"ipfs-css": "^1.3.0", "ipfs-css": "^1.3.0",
"rxjs": "~6.6.0", "rxjs": "~7.5.5",
"tslib": "^2.0.0", "tslib": "^2.0.0",
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
@ -64,22 +64,22 @@
"@angular/cli": "~13.2.6", "@angular/cli": "~13.2.6",
"@angular/compiler-cli": "~13.2.6", "@angular/compiler-cli": "~13.2.6",
"@angular/language-service": "~13.2.6", "@angular/language-service": "~13.2.6",
"@types/jasmine": "~3.6.0", "@types/jasmine": "~3.10.3",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1", "@types/node": "^17.0.21",
"@typescript-eslint/eslint-plugin": "5.11.0", "@typescript-eslint/eslint-plugin": "5.14.0",
"@typescript-eslint/parser": "5.11.0", "@typescript-eslint/parser": "5.14.0",
"eslint": "^8.2.0", "eslint": "^8.2.0",
"jasmine-core": "~3.6.0", "jasmine-core": "~4.0.1",
"jasmine-spec-reporter": "~5.0.0", "jasmine-spec-reporter": "~7.0.0",
"karma": "~6.3.17", "karma": "~6.3.17",
"karma-chrome-launcher": "~3.1.0", "karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2", "karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0", "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0", "karma-jasmine-html-reporter": "^1.5.0",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"ts-node": "~8.10.2", "ts-node": "~10.7.0",
"typescript": "~4.5.5" "typescript": "~4.5.5"
}, },
"private": true "private": true
} }

8667
pnpm-lock.yaml Normal file

File diff suppressed because it is too large Load Diff

8272
yarn.lock

File diff suppressed because it is too large Load Diff