Skip to content
Open
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
CHANGES.md merge=union
*.enc binary
/.yarn/releases/** binary
/.yarn/plugins/** binary
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
- run: npm install -g yarn@^1.19.0 && yarn install
- run: yarn install --immutable

- name: Check formatting with prettier
run: yarn prettier-check
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,9 @@ jobs:
registry-url: "https://registry.npmjs.org"
node-version-file: ".nvmrc"

- name: Install yarn
if: steps.detect.outputs.previous-version != steps.detect.outputs.current-version
run: npm install -g yarn@^1.19.0

- name: Install dependencies
if: steps.detect.outputs.previous-version != steps.detect.outputs.current-version
run: yarn install --ignore-engines
run: yarn install --ignore-engines --immutable
env:
NODE_OPTIONS: "--max_old_space_size=8192"

Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,11 @@ ts-out/

# Catalog index generation files
catalog-index*.json
# https://v3.yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
49 changes: 49 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-licenses.cjs

Large diffs are not rendered by default.

934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.6.0.cjs

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
nodeLinker: node-modules

plugins:
- checksum: 374f735053958b77583ef7b70e56a59540d1d9c681f04b8ab7a600f4325301d2e1fb67c51d34ba75bbbc4e71f8c003fbc52b1f22d7daa30dca655f1a1bf205a1
path: .yarn/plugins/@yarnpkg/plugin-licenses.cjs
spec: "https://raw.githubusercontent.com/mhassan1/yarn-plugin-licenses/v0.15.0/bundles/@yarnpkg/plugin-licenses.js"

yarnPath: .yarn/releases/yarn-4.6.0.cjs
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,8 @@
"yaml": "^1.10.0"
},
"scripts": {
"prepublish": "gulp post-npm-install",
"prepack": "gulp post-npm-install",
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renamed to prepack according to my understanding of the big warning box in the documentation: https://yarnpkg.com/advanced/lifecycle-scripts#prepublish

"postpublish": "bash -c \"if [ -z \"$GITHUB_ACTION\" ]; then git tag -a ${npm_package_version} -m \"${npm_package_version}\" && git push origin ${npm_package_version}; fi \"",
"postinstall": "gulp post-npm-install",
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think gulp post-npm-install is always run after building, so removed the hook since the warning box in the documentation is quite strongly worded against this hook: https://yarnpkg.com/advanced/lifecycle-scripts#postinstall

"gulp": "gulp",
"start": "terriajs-server --port 3002",
"hot": "webpack-dev-server --inline --config buildprocess/webpack.config.hot.js --hot --host 0.0.0.0",
Expand All @@ -234,5 +233,6 @@
"prettier-check": "prettier --check .",
"build-for-node": "tsc -b tsconfig-node.json",
"prepare": "yarn build-for-node && husky install"
}
},
"packageManager": "yarn@4.6.0"
}
29,253 changes: 17,110 additions & 12,143 deletions yarn.lock

Large diffs are not rendered by default.