Add --skipInstall. Fix tests and typescript react-jsx (#299)

* Fix tests and typescript react-jsx * Add changeset
single-spa · Jun 27, 2021 · 6c8ca4e · 6c8ca4e
1 parent 0a485de
commit 6c8ca4e
Show file tree

Hide file tree

Showing 20 changed files with 1,703 additions and 330 deletions.
diff --git a/.changeset/lemon-crews-grab.md b/.changeset/lemon-crews-grab.md
@@ -0,0 +1,5 @@
+---
+"generator-single-spa": minor
+---
+
+Support --skipInstall option
diff --git a/jest.config.js b/jest.config.js
@@ -4,4 +4,5 @@ module.exports = {
   testTimeout: 120000,
   testRegex: "tests\\/e2e\\/.+test.js",
   watchPathIgnorePatterns: ["<rootDir>/tests/fixtures/"],
+  globalSetup: "<rootDir>/tests/create-fixtures.js",
 };
diff --git a/packages/generator-single-spa/src/generator-single-spa.js b/packages/generator-single-spa/src/generator-single-spa.js
@@ -25,6 +25,10 @@ module.exports = class SingleSpaGenerator extends Generator {
       type: String,
     });
 
+    this.option("skipInstall", {
+      type: Boolean,
+    });
+
     if (args.length > 0 && !this.options.dir) {
       this.options.dir = args[0];
     }

diff --git a/packages/generator-single-spa/src/react/generator-single-spa-react.js b/packages/generator-single-spa/src/react/generator-single-spa-react.js
@@ -195,12 +195,14 @@ module.exports = class SingleSpaReactGenerator extends PnpmGenerator {
     }
   }
   install() {
-    this.installDependencies({
-      npm: this.options.packageManager === "npm",
-      yarn: this.options.packageManager === "yarn",
-      pnpm: this.options.packageManager === "pnpm",
-      bower: false,
-    });
+    if (!this.skipInstall) {
+      this.installDependencies({
+        npm: this.options.packageManager === "npm",
+        yarn: this.options.packageManager === "yarn",
+        pnpm: this.options.packageManager === "pnpm",
+        bower: false,
+      });
+    }
   }
   finished() {
     this.on(`${this.options.packageManager}Install:end`, () => {

diff --git a/packages/generator-single-spa/src/react/templates/tsconfig.json b/packages/generator-single-spa/src/react/templates/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "ts-config-single-spa",
   "compilerOptions": {
-    "jsx": "react"
+    "jsx": "react-jsx"
   },
   "include": ["src/**/*", "node_modules/@types"],
   "exclude": ["src/**/*.test*"]

diff --git a/packages/generator-single-spa/src/root-config/generator-root-config.js b/packages/generator-single-spa/src/root-config/generator-root-config.js
@@ -185,12 +185,14 @@ module.exports = class SingleSpaRootConfigGenerator extends PnpmGenerator {
     }
   }
   install() {
-    this.installDependencies({
-      npm: this.options.packageManager === "npm",
-      yarn: this.options.packageManager === "yarn",
-      pnpm: this.options.packageManager === "pnpm",
-      bower: false,
-    });
+    if (!this.skipInstall) {
+      this.installDependencies({
+        npm: this.options.packageManager === "npm",
+        yarn: this.options.packageManager === "yarn",
+        pnpm: this.options.packageManager === "pnpm",
+        bower: false,
+      });
+    }
   }
   finished() {
     this.on(`${this.options.packageManager}Install:end`, () => {

diff --git a/packages/generator-single-spa/src/svelte/generator-single-spa-svelte.js b/packages/generator-single-spa/src/svelte/generator-single-spa-svelte.js
@@ -151,12 +151,14 @@ module.exports = class SingleSpaSvelteGenerator extends PnpmGenerator {
     }
   }
   install() {
-    this.installDependencies({
-      npm: this.options.packageManager === "npm",
-      yarn: this.options.packageManager === "yarn",
-      pnpm: this.options.packageManager === "pnpm",
-      bower: false,
-    });
+    if (!this.skipInstall) {
+      this.installDependencies({
+        npm: this.options.packageManager === "npm",
+        yarn: this.options.packageManager === "yarn",
+        pnpm: this.options.packageManager === "pnpm",
+        bower: false,
+      });
+    }
   }
   finished() {
     this.on(`${this.options.packageManager}Install:end`, () => {

diff --git a/packages/generator-single-spa/src/util-module/generator-single-spa-util-module.js b/packages/generator-single-spa/src/util-module/generator-single-spa-util-module.js
@@ -154,12 +154,14 @@ module.exports = class SingleSpaUtilModuleGenerator extends PnpmGenerator {
     }
   }
   install() {
-    this.installDependencies({
-      npm: this.options.packageManager === "npm",
-      yarn: this.options.packageManager === "yarn",
-      pnpm: this.options.packageManager === "pnpm",
-      bower: false,
-    });
+    if (!this.skipInstall) {
+      this.installDependencies({
+        npm: this.options.packageManager === "npm",
+        yarn: this.options.packageManager === "yarn",
+        pnpm: this.options.packageManager === "pnpm",
+        bower: false,
+      });
+    }
   }
   finished() {
     this.on(`${this.options.packageManager}Install:end`, () => {