create-nocobase-app 2.1.0-beta.9 → 2.2.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/generator.js +8 -1
- package/package.json +3 -3
- package/src/generator.js +8 -1
- package/templates/app/package.json +11 -11
package/lib/generator.js
CHANGED
|
@@ -131,10 +131,17 @@ const _AppGenerator = class _AppGenerator extends Generator {
|
|
|
131
131
|
name: context.name,
|
|
132
132
|
...await fs.readJSON(join(this.cwd, "package.json"), "utf8")
|
|
133
133
|
};
|
|
134
|
-
json["dependencies"]["@nocobase/
|
|
134
|
+
json["dependencies"]["@nocobase/app"] = context.version;
|
|
135
135
|
if (!this.args.skipDevDependencies) {
|
|
136
136
|
json["devDependencies"] = json["devDependencies"] || {};
|
|
137
137
|
json["devDependencies"]["@nocobase/devtools"] = context.version;
|
|
138
|
+
} else {
|
|
139
|
+
delete json["resolutions"]["antd"];
|
|
140
|
+
delete json["resolutions"]["@types/react"];
|
|
141
|
+
delete json["resolutions"]["@types/react-dom"];
|
|
142
|
+
delete json["resolutions"]["react-router-dom"];
|
|
143
|
+
delete json["resolutions"]["react-router"];
|
|
144
|
+
delete json["resolutions"]["rollup"];
|
|
138
145
|
}
|
|
139
146
|
await fs.writeJSON(join(this.cwd, "package.json"), json, { encoding: "utf8", spaces: 2 });
|
|
140
147
|
console.log("");
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "create-nocobase-app",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2.0-beta.1",
|
|
4
4
|
"main": "src/index.js",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"dependencies": {
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"chalk": "^4.1.1",
|
|
10
10
|
"commander": "^9.2.0",
|
|
11
11
|
"fs-extra": "^11.3.0",
|
|
12
|
-
"tar": "^7.
|
|
12
|
+
"tar": "^7.5.15"
|
|
13
13
|
},
|
|
14
14
|
"bin": {
|
|
15
15
|
"create-nocobase-app": "./bin/index.js"
|
|
@@ -19,5 +19,5 @@
|
|
|
19
19
|
"url": "git+https://github.com/nocobase/nocobase.git",
|
|
20
20
|
"directory": "packages/core/create-nocobase-app"
|
|
21
21
|
},
|
|
22
|
-
"gitHead": "
|
|
22
|
+
"gitHead": "f82fa9d0c3aa8e00e53dd94e404a312483b4866b"
|
|
23
23
|
}
|
package/src/generator.js
CHANGED
|
@@ -144,11 +144,18 @@ class AppGenerator extends Generator {
|
|
|
144
144
|
...(await fs.readJSON(join(this.cwd, 'package.json'), 'utf8')),
|
|
145
145
|
};
|
|
146
146
|
|
|
147
|
-
json['dependencies']['@nocobase/
|
|
147
|
+
json['dependencies']['@nocobase/app'] = context.version;
|
|
148
148
|
|
|
149
149
|
if (!this.args.skipDevDependencies) {
|
|
150
150
|
json['devDependencies'] = json['devDependencies'] || {};
|
|
151
151
|
json['devDependencies']['@nocobase/devtools'] = context.version;
|
|
152
|
+
} else {
|
|
153
|
+
delete json['resolutions']['antd'];
|
|
154
|
+
delete json['resolutions']['@types/react'];
|
|
155
|
+
delete json['resolutions']['@types/react-dom'];
|
|
156
|
+
delete json['resolutions']['react-router-dom'];
|
|
157
|
+
delete json['resolutions']['react-router'];
|
|
158
|
+
delete json['resolutions']['rollup'];
|
|
152
159
|
}
|
|
153
160
|
|
|
154
161
|
await fs.writeJSON(join(this.cwd, 'package.json'), json, { encoding: 'utf8', spaces: 2 });
|
|
@@ -8,17 +8,17 @@
|
|
|
8
8
|
"node": ">=18"
|
|
9
9
|
},
|
|
10
10
|
"scripts": {
|
|
11
|
-
"nocobase": "nocobase",
|
|
12
|
-
"pm": "nocobase pm",
|
|
13
|
-
"pm2": "nocobase pm2",
|
|
14
|
-
"dev": "nocobase dev",
|
|
15
|
-
"start": "nocobase start",
|
|
16
|
-
"clean": "nocobase clean",
|
|
17
|
-
"build": "nocobase build",
|
|
18
|
-
"test": "nocobase test",
|
|
19
|
-
"e2e": "nocobase e2e",
|
|
20
|
-
"tar": "nocobase tar",
|
|
21
|
-
"postinstall": "nocobase postinstall",
|
|
11
|
+
"nocobase": "nocobase-v1",
|
|
12
|
+
"pm": "nocobase-v1 pm",
|
|
13
|
+
"pm2": "nocobase-v1 pm2",
|
|
14
|
+
"dev": "nocobase-v1 app-dev",
|
|
15
|
+
"start": "nocobase-v1 start",
|
|
16
|
+
"clean": "nocobase-v1 clean",
|
|
17
|
+
"build": "nocobase-v1 build",
|
|
18
|
+
"test": "nocobase-v1 test",
|
|
19
|
+
"e2e": "nocobase-v1 e2e",
|
|
20
|
+
"tar": "nocobase-v1 tar",
|
|
21
|
+
"postinstall": "nocobase-v1 postinstall",
|
|
22
22
|
"lint": "eslint ."
|
|
23
23
|
},
|
|
24
24
|
"resolutions": {
|