Skip to content

Commit f4868ed

Browse files
B4nanB4nan
committed
fix(core): pin all internal dependencies
Closes mikro-orm#4764
1 parent 62740d1 commit f4868ed

File tree

18 files changed

+75
-73
lines changed

18 files changed

+75
-73
lines changed

‎.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ jobs:
135135
GIT_USER: "[email protected]:${{ secrets.GH_TOKEN }}"
136136
GH_TOKEN: ${{ secrets.GH_TOKEN }}
137137

138-
- name: Use tilde in internal dependencies
138+
- name: Pin versions in internal dependencies and update lockfile
139139
run: |
140-
yarn release:tilde
140+
yarn release:pin-versions
141141
yarn install --no-immutable
142142
git add .
143-
git commit -m 'chore(release): update internal dependencies to use tilde [skip ci]'
143+
git diff-index --quiet HEAD || git commit -m 'chore(release): update internal dependencies [skip ci]'
144144
git push
145145
146146
- name: Publish packages

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"release:prod": "yarn build && yarn publish:prod",
4848
"publish:next": "lerna publish from-package --contents dist --dist-tag next --force-publish",
4949
"release:next": "lerna run compile && yarn publish:next",
50-
"release:tilde": "lerna run copy -- -- --tilde",
50+
"release:pin-versions": "lerna run copy -- -- --pin-versions",
5151
"test": "jest",
5252
"tsc-check-tests": "tsc --noEmit --project tests/tsconfig.json",
5353
"coverage": "rimraf temp tests/generated-entities && yarn test --coverage",

‎packages/better-sqlite/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
"access": "public"
5959
},
6060
"dependencies": {
61-
"@mikro-orm/knex": "~5.8.4",
61+
"@mikro-orm/knex": "5.8.4",
6262
"better-sqlite3": "8.6.0",
6363
"fs-extra": "11.1.1",
6464
"sqlstring-sqlite": "0.1.1"
6565
},
6666
"devDependencies": {
67-
"@mikro-orm/core": "^5.8.4"
67+
"@mikro-orm/core": "5.8.4"
6868
},
6969
"peerDependencies": {
7070
"@mikro-orm/core": "^5.0.0",

‎packages/cli/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@
6363
},
6464
"dependencies": {
6565
"@jercle/yargonaut": "1.1.5",
66-
"@mikro-orm/core": "~5.8.4",
67-
"@mikro-orm/knex": "~5.8.4",
66+
"@mikro-orm/core": "5.8.4",
67+
"@mikro-orm/knex": "5.8.4",
6868
"fs-extra": "11.1.1",
6969
"tsconfig-paths": "4.2.0",
7070
"yargs": "17.7.2"
7171
},
7272
"devDependencies": {
73-
"@mikro-orm/entity-generator": "^5.8.4",
74-
"@mikro-orm/migrations": "^5.8.4",
75-
"@mikro-orm/seeder": "^5.8.4"
73+
"@mikro-orm/entity-generator": "5.8.4",
74+
"@mikro-orm/migrations": "5.8.4",
75+
"@mikro-orm/seeder": "5.8.4"
7676
},
7777
"peerDependencies": {
7878
"@mikro-orm/better-sqlite": "^5.0.0",

‎packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"dotenv": "16.3.1",
6565
"fs-extra": "11.1.1",
6666
"globby": "11.1.0",
67-
"mikro-orm": "~5.8.4",
67+
"mikro-orm": "5.8.4",
6868
"reflect-metadata": "0.1.13"
6969
},
7070
"peerDependencies": {

‎packages/entity-generator/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
"access": "public"
5959
},
6060
"dependencies": {
61-
"@mikro-orm/knex": "~5.8.4",
61+
"@mikro-orm/knex": "5.8.4",
6262
"fs-extra": "11.1.1"
6363
},
6464
"devDependencies": {
65-
"@mikro-orm/core": "^5.8.4"
65+
"@mikro-orm/core": "5.8.4"
6666
},
6767
"peerDependencies": {
6868
"@mikro-orm/core": "^5.0.0"

‎packages/knex/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"sqlstring": "2.3.3"
6464
},
6565
"devDependencies": {
66-
"@mikro-orm/core": "^5.8.4"
66+
"@mikro-orm/core": "5.8.4"
6767
},
6868
"peerDependencies": {
6969
"@mikro-orm/core": "^5.0.0",

‎packages/mariadb/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
"access": "public"
5959
},
6060
"dependencies": {
61-
"@mikro-orm/knex": "~5.8.4",
61+
"@mikro-orm/knex": "5.8.4",
6262
"mariadb": "2.5.6"
6363
},
6464
"devDependencies": {
65-
"@mikro-orm/core": "^5.8.4"
65+
"@mikro-orm/core": "5.8.4"
6666
},
6767
"peerDependencies": {
6868
"@mikro-orm/core": "^5.0.0",

‎packages/migrations-mongodb/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
"access": "public"
5959
},
6060
"dependencies": {
61-
"@mikro-orm/mongodb": "~5.8.4",
61+
"@mikro-orm/mongodb": "5.8.4",
6262
"fs-extra": "11.1.1",
6363
"mongodb": "5.8.1",
6464
"umzug": "3.3.1"
6565
},
6666
"devDependencies": {
67-
"@mikro-orm/core": "^5.8.4"
67+
"@mikro-orm/core": "5.8.4"
6868
},
6969
"peerDependencies": {
7070
"@mikro-orm/core": "^5.0.0"

‎packages/migrations/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
"access": "public"
5959
},
6060
"dependencies": {
61-
"@mikro-orm/knex": "~5.8.4",
61+
"@mikro-orm/knex": "5.8.4",
6262
"fs-extra": "11.1.1",
6363
"knex": "2.5.1",
6464
"umzug": "3.3.1"
6565
},
6666
"devDependencies": {
67-
"@mikro-orm/core": "^5.8.4"
67+
"@mikro-orm/core": "5.8.4"
6868
},
6969
"peerDependencies": {
7070
"@mikro-orm/core": "^5.0.0"

‎packages/mongodb/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"mongodb": "5.8.1"
6363
},
6464
"devDependencies": {
65-
"@mikro-orm/core": "^5.8.4"
65+
"@mikro-orm/core": "5.8.4"
6666
},
6767
"peerDependencies": {
6868
"@mikro-orm/core": "^5.0.0",

‎packages/mysql/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
"access": "public"
5959
},
6060
"dependencies": {
61-
"@mikro-orm/knex": "~5.8.4",
61+
"@mikro-orm/knex": "5.8.4",
6262
"mysql2": "3.6.1"
6363
},
6464
"devDependencies": {
65-
"@mikro-orm/core": "^5.8.4"
65+
"@mikro-orm/core": "5.8.4"
6666
},
6767
"peerDependencies": {
6868
"@mikro-orm/core": "^5.0.0",

‎packages/postgresql/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
"access": "public"
5959
},
6060
"dependencies": {
61-
"@mikro-orm/knex": "~5.8.4",
61+
"@mikro-orm/knex": "5.8.4",
6262
"pg": "8.11.3"
6363
},
6464
"devDependencies": {
65-
"@mikro-orm/core": "^5.8.4"
65+
"@mikro-orm/core": "5.8.4"
6666
},
6767
"peerDependencies": {
6868
"@mikro-orm/core": "^5.0.0",

‎packages/reflection/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"ts-morph": "20.0.0"
6363
},
6464
"devDependencies": {
65-
"@mikro-orm/core": "^5.8.4"
65+
"@mikro-orm/core": "5.8.4"
6666
},
6767
"peerDependencies": {
6868
"@mikro-orm/core": "^5.0.0"

‎packages/seeder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"globby": "11.1.0"
5454
},
5555
"devDependencies": {
56-
"@mikro-orm/core": "^5.8.4"
56+
"@mikro-orm/core": "5.8.4"
5757
},
5858
"peerDependencies": {
5959
"@mikro-orm/core": "^5.0.0"

‎packages/sqlite/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
"access": "public"
5959
},
6060
"dependencies": {
61-
"@mikro-orm/knex": "~5.8.4",
61+
"@mikro-orm/knex": "5.8.4",
6262
"fs-extra": "11.1.1",
6363
"sqlite3": "5.1.6",
6464
"sqlstring-sqlite": "0.1.1"
6565
},
6666
"devDependencies": {
67-
"@mikro-orm/core": "^5.8.4"
67+
"@mikro-orm/core": "5.8.4"
6868
},
6969
"peerDependencies": {
7070
"@mikro-orm/core": "^5.0.0",

‎scripts/copy.mjs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,19 @@ function rewrite(path, replacer) {
3434

3535
let rootVersion;
3636

37-
async function getRootVersion(increment = true) {
37+
async function getRootVersion(bump = true) {
3838
if (rootVersion) {
3939
return rootVersion;
4040
}
4141

4242
const pkg = require(resolve(root, './lerna.json'));
4343
rootVersion = pkg.version.replace(/^(\d+\.\d+\.\d+)-?.*$/, '$1');
4444

45-
const parts = rootVersion.split('.');
46-
parts[2] = `${+parts[2] + (increment ? 1 : 0)}`;
47-
rootVersion = parts.join('.');
45+
if (bump) {
46+
const parts = rootVersion.split('.');
47+
parts[2] = `${+parts[2] + 1}`;
48+
rootVersion = parts.join('.');
49+
}
4850

4951
return rootVersion;
5052
}
@@ -88,14 +90,14 @@ if (options.canary) {
8890

8991
for (const dep of Object.keys(pkgJson.dependencies ?? {})) {
9092
if (dep.startsWith('@mikro-orm/') || dep === 'mikro-orm') {
91-
const prefix = pkgJson.dependencies[dep].startsWith('^') ? '^' : (pkgJson.dependencies[dep].startsWith('~') ? '~' : '');
93+
const prefix = pkgJson.dependencies[dep].startsWith('^') ? '^' : '';
9294
pkgJson.dependencies[dep] = prefix + nextVersion;
9395
}
9496
}
9597

9698
for (const dep of Object.keys(pkgJson.peerDependencies ?? {})) {
9799
if (dep.startsWith('@mikro-orm/') || dep === 'mikro-orm') {
98-
pkgJson.peerDependencies[dep] = '~' + nextVersion;
100+
pkgJson.peerDependencies[dep] = nextVersion;
99101
}
100102
}
101103

@@ -105,18 +107,18 @@ if (options.canary) {
105107
writeFileSync(pkgPath, `${JSON.stringify(pkgJson, null, 2)}\n`);
106108
}
107109

108-
if (options.tilde) {
110+
if (options['pin-versions']) {
109111
const pkgJson = require(pkgPath);
110112
const version = await getRootVersion(false);
111113

112114
for (const dep of Object.keys(pkgJson.dependencies ?? {})) {
113-
if (dep.startsWith('@mikro-orm/') || dep === 'mikro-orm' && pkgJson.dependencies[dep].startsWith('^')) {
114-
pkgJson.dependencies[dep] = '~' + version;
115+
if (dep.startsWith('@mikro-orm/') || dep === 'mikro-orm') {
116+
pkgJson.dependencies[dep] = version;
115117
}
116118
}
117119

118120
// eslint-disable-next-line no-console
119-
console.info(`tilde: changing ^ to ~ in dependencies for version ${version}`, pkgJson.dependencies);
121+
console.info(`pin-versions: version ${version}`, pkgJson.dependencies);
120122

121123
writeFileSync(pkgPath, `${JSON.stringify(pkgJson, null, 2)}\n`);
122124
}

0 commit comments

Comments
 (0)