feat(angular-cli): prompt if using angular cli 11.2 or above

notiz-dev · Feb 11, 2021 · fbf4637 · fbf4637
1 parent cb01d12
commit fbf4637
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 src/**/*.js
 src/**/*.js.map
 src/**/*.d.ts
-!src/**/files/**/*.js
+!src/**/templates/**/*.js
 
 # IDEs
 .idea/

diff --git a/angular-workspace/webpack.config.js b/angular-workspace/webpack.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/ng-add/index.ts b/src/ng-add/index.ts
@@ -61,15 +61,26 @@ export function ngAdd(_options: Schema): Rule {
       (plugin) => `require('${plugin}')\n`,
     );
 
-    return chain([
-      addDependencies(_options),
-      addTailwindPlugins(tailwindPluginDependencies),
-      addNpmScripts(_options),
-      updateStyles(_options, workspace),
-      generateConfigs(_options, requireTailwindPlugins),
-      updateAngularJSON(_options, workspace),
-      install(),
-    ]);
+    if(_options.angularCliWithTailwindSupport) {
+      return chain([
+        addDependencies(_options),
+        addTailwindPlugins(tailwindPluginDependencies),
+        addNpmScripts(_options),
+        updateStyles(_options, workspace),
+        generateTailwindConfig(_options, requireTailwindPlugins),
+        install(),
+      ]);
+    } else {
+      return chain([
+        addDependencies(_options),
+        addTailwindPlugins(tailwindPluginDependencies),
+        addNpmScripts(_options),
+        updateStyles(_options, workspace),
+        generateTailwindAndWebpackConfig(_options, requireTailwindPlugins),
+        updateAngularJSON(_options, workspace),
+        install(),
+      ]);
+    }
   };
 }
 
@@ -173,12 +184,33 @@ function getTailwindImports(): string {
  *
  * @param options
  */
-function generateConfigs(
+function generateTailwindConfig(
+  options: Schema,
+  requireTailwindPlugins: string[],
+): Rule {
+  return async (_host: Tree) => {
+    const sourceTemplates = url(`./templates/tailwind`);
+    const sourceParametrizedTemplates = apply(sourceTemplates, [
+      template({
+        ...options,
+        requireTailwindPlugins: requireTailwindPlugins,
+        ...strings,
+      }),
+    ]);
+    return mergeWith(sourceParametrizedTemplates);
+  };
+}
+/**
+ * Generate webpack and tailwind config.
+ *
+ * @param options
+ */
+function generateTailwindAndWebpackConfig(
   options: Schema,
   requireTailwindPlugins: string[],
 ): Rule {
   return async (_host: Tree) => {
-    const sourceTemplates = url(`./files`);
+    const sourceTemplates = url(`./templates/configs`);
     const sourceParametrizedTemplates = apply(sourceTemplates, [
       template({
         ...options,

diff --git a/src/ng-add/schema.json b/src/ng-add/schema.json
@@ -10,6 +10,11 @@
       "description": "The autoprefixer version to be installed.",
       "default": "^10.2.3"
     },
+    "angularCliWithTailwindSupport": {
+      "description": "Angular CLI Version above 11.2 with Tailwind CSS support.",
+      "type": "boolean",
+      "x-prompt": "Are you using Angular CLI in version 11.2 or above?"
+    },
     "cssFormat": {
       "description": "The file extension or preprocessor to use for style files.",
       "type": "string",

diff --git a/src/ng-add/schema.ts b/src/ng-add/schema.ts
@@ -1,4 +1,9 @@
 export interface Schema {
+  /**
+   * Angular CLI Version above 11.2 with Tailwind CSS support.
+   */
+  angularCliWithTailwindSupport: boolean;
+
   /**
    * Autoprefixer version.
    */

diff --git a/src/ng-add/files/tailwind.config.js → ...-add/templates/configs/tailwind.config.js b/src/ng-add/files/tailwind.config.js → ...-add/templates/configs/tailwind.config.js
diff --git a/src/ng-add/files/webpack.config.js → ...g-add/templates/configs/webpack.config.js b/src/ng-add/files/webpack.config.js → ...g-add/templates/configs/webpack.config.js
diff --git a/angular-workspace/tailwind.config.js → ...add/templates/tailwind/tailwind.config.js b/angular-workspace/tailwind.config.js → ...add/templates/tailwind/tailwind.config.js
@@ -7,6 +7,5 @@ module.exports = {
   variants: {
     extend: {},
   },
-  plugins: [require('@tailwindcss/typography')
-],
+  plugins: [<%= requireTailwindPlugins %>],
 };