Skip to content

Commit

Permalink
build: support pnpm and update yarn to 4 (#1678)
Browse files Browse the repository at this point in the history
  • Loading branch information
cipchk authored Nov 1, 2023
1 parent 4d2d25c commit b904b9a
Show file tree
Hide file tree
Showing 8 changed files with 918 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 18.10.0
node-version: 18.12.0
- run: yarn install

- name: build
Expand Down
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
node_modules
npm-debug.log
# package-lock.json
yarn.lock
yarn-error.log
pnpm-lock.yaml
/coverage
/coverage-report
/junit
Expand Down Expand Up @@ -32,3 +31,14 @@ src/assets/style.dark.css
/integration
scripts/build/var.less
/schematics/plugin/files/rtl

# Yarn
yarn.lock
yarn-error.log
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
.pnp.*
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# https://pnpm.io/npmrc#node-linker
node-linker=hoisted
893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.1.cjs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
enableImmutableInstalls: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.1.cjs
7 changes: 3 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: '18.10.0'
versionSpec: '18.12.0'
displayName: 'Install Node.js'

- stage: build
Expand All @@ -22,12 +22,11 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: '18.10.0'
versionSpec: '18.12.0'
displayName: 'Install Node.js'
- script: |
node --version
yarn --version
yarn config list
yarn install
displayName: 'Install'
- task: Bash@3
Expand Down Expand Up @@ -126,4 +125,4 @@ stages:
- script: yarn install
displayName: 'Install'
- script: yarn run lint
dependsOn: env
dependsOn: env
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
},
"homepage": "https://ng-alain.com",
"engines": {
"node": "^16.13.0 || ^18.10.0",
"yarn": ">=1.21.1 <2",
"npm": "Please use yarn instead of NPM to install dependencies"
"node": "^18.10.0"
},
"scripts": {
"ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng",
Expand Down
1 change: 1 addition & 0 deletions scripts/ci/build-schematics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ copyFiles() {
"${1}.prettierignore|${2}application/files/root/.prettierignore"
"${1}.prettierrc.js|${2}application/files/root/.prettierrc.js"
"${1}.stylelintrc.js|${2}application/files/root/.stylelintrc.js"
"${1}.npmrc|${2}application/files/root"
"${1}.nvmrc|${2}application/files/root"
"${1}proxy.conf.js|${2}application/files/root"
"${1}.husky|${2}application/files/root/.husky"
Expand Down

0 comments on commit b904b9a

Please sign in to comment.