Skip to content

Commit d2fc132

Browse files
authored
Merge pull request #3 from cssnano/fix-bug
fix: bug with dependencies
2 parents 283fd9c + 91d4865 commit d2fc132

File tree

2 files changed

+12
-48
lines changed

2 files changed

+12
-48
lines changed

dependenciesList.js

Lines changed: 9 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,10 @@ const version = "nightly";
22

33
module.exports = {
44
cssnano: {
5-
cosmiconfig: "^5.2.1",
65
"cssnano-preset-default": version,
7-
"is-resolvable": "^1.1.0",
8-
"opencollective-postinstall": "^2.0.2",
9-
postcss: "^7.0.16"
106
},
117
"cssnano-preset-default": {
12-
"css-declaration-sorter": "^5.1.2",
138
"cssnano-utils": version,
14-
postcss: "^7.0.16",
15-
"postcss-calc": "^7.0.1",
169
"postcss-colormin": version,
1710
"postcss-convert-values": version,
1811
"postcss-discard-comments": version,
@@ -41,7 +34,6 @@ module.exports = {
4134
"postcss-unique-selectors": version
4235
},
4336
"cssnano-preset-advanced": {
44-
autoprefixer: "^9.5.1",
4537
"cssnano-preset-default": version,
4638
"postcss-discard-unused": version,
4739
"postcss-merge-idents": version,
@@ -50,69 +42,38 @@ module.exports = {
5042
},
5143
"cssnano-preset-lite": {
5244
"cssnano-utils": version,
53-
postcss: "^7.0.16",
5445
"postcss-discard-comments": version,
5546
"postcss-normalize-whitespace": version,
5647
"postcss-discard-empty": version
5748
},
5849
"postcss-merge-longhand": {
59-
"css-color-names": "^1.0.1",
60-
postcss: "^7.0.16",
61-
"postcss-value-parser": "^3.3.1",
6250
stylehacks: version
6351
},
6452
"postcss-merge-idents": {
65-
"cssnano-utils": version,
66-
has: "^1.0.3",
67-
postcss: "^7.0.16",
68-
"postcss-value-parser": "^3.3.1"
53+
"cssnano-utils": version
6954
},
7055
"postcss-merge-rules": {
71-
browserslist: "^4.6.0",
72-
"caniuse-api": "^3.0.0",
73-
"cssnano-utils": version,
74-
postcss: "^7.0.16",
75-
"postcss-selector-parser": "^3.1.1",
76-
vendors: "^1.0.3"
56+
"cssnano-utils": version
7757
},
7858
"postcss-minify-gradients": {
79-
"cssnano-utils": version,
80-
"is-color-stop": "^1.1.0",
81-
postcss: "^7.0.16",
82-
"postcss-value-parser": "^3.3.1"
59+
"cssnano-utils": version
8360
},
8461
"postcss-minify-params": {
85-
"alphanum-sort": "^1.0.2",
86-
browserslist: "^4.6.0",
87-
"cssnano-utils": version,
88-
postcss: "^7.0.16",
89-
"postcss-value-parser": "^3.3.1",
90-
uniqs: "^2.0.0"
62+
"cssnano-utils": version
9163
},
9264
"postcss-normalize-display-values": {
93-
"cssnano-utils": version,
94-
postcss: "^7.0.16",
95-
"postcss-value-parser": "^3.3.1"
65+
"cssnano-utils": version
9666
},
9767
"postcss-normalize-repeat-style": {
98-
"cssnano-utils": version,
99-
postcss: "^7.0.16",
100-
"postcss-value-parser": "^3.3.1"
68+
"cssnano-utils": version
10169
},
10270
"postcss-normalize-timing-functions": {
103-
"cssnano-utils": version,
104-
postcss: "^7.0.16",
105-
"postcss-value-parser": "^3.3.1"
71+
"cssnano-utils": version
10672
},
10773
"postcss-ordered-values": {
108-
"cssnano-utils": version,
109-
postcss: "^7.0.16",
110-
"postcss-value-parser": "^3.3.1"
74+
"cssnano-utils": version
11175
},
11276
"postcss-reduce-transforms": {
113-
"cssnano-utils": version,
114-
has: "^1.0.3",
115-
postcss: "^7.0.16",
116-
"postcss-value-parser": "^3.3.1"
77+
"cssnano-utils": version
11778
}
11879
};

publish.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ module.exports = async function run(registryUrl = registry) {
4444

4545
const packagesList = shell.ls("packages/");
4646
const packagePath = cssnanoPath + "/packages";
47+
4748
packagesList.forEach(pkg => {
4849
if (ignore.has(pkg)) {
4950
rimraf.sync(path.resolve(packagePath, pkg));
@@ -80,13 +81,15 @@ module.exports = async function run(registryUrl = registry) {
8081
if (fs.existsSync(pkgPath + "/dist")) {
8182
shell.cd(pkgPath);
8283
let packageJson = editJsonFile(`${pkgPath}/package.json`);
84+
8385
packageJson.set("scripts.prepublish", "");
8486
packageJson.set("scripts.prebuild", "");
8587
packageJson.set("version", `${version}-nightly.${fullVersion}`);
8688
// packageJson.set("publishConfig.registry", registryUrl);
8789

8890
if (newdepList[pkg]) {
8991
packageJson.set("dependencies", {
92+
...packageJson.get("dependencies"),
9093
...newdepList[pkg]
9194
});
9295
}

0 commit comments

Comments
 (0)