Merge pull request #103 from josemarluedke/bug/move-tailwind-file

Move tailwind/default-options to a new location
josemarluedke · Oct 21, 2020 · 5572bc9 · 5572bc9
2 parents ad76f9d + 582434d
commit 5572bc9
Show file tree

Hide file tree

Showing 15 changed files with 7 additions and 45 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -35,8 +35,7 @@ module.exports = {
         'packages/*/config/**/*.js',
         'packages/*/tests/dummy/config/**/*.js',
         'packages/**/tailwind.config.js',
-        'packages/**/tailwind.js',
-        'packages/*/addon/tailwind/*.js',
+        'packages/**/tailwind/*.js',
         'packages/tailwindcss-plugin-helpers/**/*.js'
       ],
       extends: ['@underline/eslint-config-node'],

diff --git a/...buttons/addon/tailwind/default-options.js → packages/buttons/tailwind/default-options.js b/...buttons/addon/tailwind/default-options.js → packages/buttons/tailwind/default-options.js
diff --git a/packages/buttons/tailwind.js → packages/buttons/tailwind/index.js b/packages/buttons/tailwind.js → packages/buttons/tailwind/index.js
@@ -5,7 +5,7 @@ module.exports = plugin.withOptions(function (userConfig) {
   return function ({ addComponents, theme }) {
     const { options } = resolve(
       '@frontile/buttons',
-      require('./addon/tailwind/default-options'),
+      require('.//default-options'),
       userConfig,
       theme
     );

diff --git a/packages/buttons/tests/dummy/app/styles/tailwind.config.js b/packages/buttons/tests/dummy/app/styles/tailwind.config.js
@@ -1,14 +1,5 @@
 /* eslint-disable node/no-extraneous-require */
 
-// Remove cache to allow rebuilds
-const path = require('path');
-delete require.cache[
-  path.join(
-    path.dirname(require.resolve('@frontile/buttons')),
-    'addon/tailwind/default-options.js'
-  )
-];
-
 module.exports = {
   future: {
     removeDeprecatedGapUtilities: true

diff --git a/...s/forms/addon/tailwind/default-options.js → packages/forms/tailwind/default-options.js b/...s/forms/addon/tailwind/default-options.js → packages/forms/tailwind/default-options.js
diff --git a/packages/forms/tailwind.js → packages/forms/tailwind/index.js b/packages/forms/tailwind.js → packages/forms/tailwind/index.js
@@ -15,7 +15,7 @@ module.exports = plugin.withOptions(function (userConfig) {
   return function ({ addComponents, theme }) {
     const { config, options } = resolve(
       '@frontile/forms',
-      require('./addon/tailwind/default-options'),
+      require('./default-options'),
       userConfig,
       theme
     );

diff --git a/packages/forms/tests/dummy/app/styles/tailwind.config.js b/packages/forms/tests/dummy/app/styles/tailwind.config.js
@@ -1,14 +1,5 @@
 /* eslint-disable node/no-extraneous-require */
 
-// Remove cache to allow rebuilds
-const path = require('path');
-delete require.cache[
-  path.join(
-    path.dirname(require.resolve('@frontile/forms')),
-    'addon/tailwind/default-options.js'
-  )
-];
-
 module.exports = {
   future: {
     removeDeprecatedGapUtilities: true

diff --git a/...cations/addon/tailwind/default-options.js → ...notifications/tailwind/default-options.js b/...cations/addon/tailwind/default-options.js → ...notifications/tailwind/default-options.js
diff --git a/packages/notifications/tailwind.js → packages/notifications/tailwind/index.js b/packages/notifications/tailwind.js → packages/notifications/tailwind/index.js
@@ -11,7 +11,7 @@ module.exports = plugin.withOptions(function (userConfig) {
   return function ({ addComponents, theme }) {
     const { options } = resolve(
       '@frontile/notifications',
-      require('./addon/tailwind/default-options'),
+      require('./default-options'),
       userConfig,
       theme
     );

diff --git a/packages/notifications/tests/dummy/app/styles/tailwind.config.js b/packages/notifications/tests/dummy/app/styles/tailwind.config.js
@@ -1,14 +1,5 @@
 /* eslint-disable node/no-extraneous-require */
 
-// Remove cache to allow rebuilds
-const path = require('path');
-delete require.cache[
-  path.join(
-    path.dirname(require.resolve('@frontile/notifications')),
-    'addon/tailwind/default-options.js'
-  )
-];
-
 module.exports = {
   future: {
     removeDeprecatedGapUtilities: true

diff --git a/packages/notifications/tsconfig.json b/packages/notifications/tsconfig.json
@@ -18,6 +18,6 @@
     "tests/**/*",
     "types/**/*",
     "test-support/**/*",
-    "addon-test-support/**/*"
+    "addon-test-support/**/*", "tailwind/default-options.js"
   ]
 }
diff --git a/packages/overlays/ember-cli-build.js b/packages/overlays/ember-cli-build.js
@@ -12,8 +12,7 @@ module.exports = function (defaults) {
       compile: {
         enabled: true,
         cacheExclude: [],
-        cacheInclude: [],
-        // cacheInclude: [/.*\.css$/, /.tailwind\.config\.js$/],
+        cacheInclude: [/.*\.css$/, /(.*?)tailwind(.*)?\.js$/],
         plugins: [
           require('tailwindcss')(
             path.join('tests', 'dummy', 'app', 'styles', 'tailwind.config.js')

diff --git a/...verlays/addon/tailwind/default-options.js → ...ages/overlays/tailwind/default-options.js b/...verlays/addon/tailwind/default-options.js → ...ages/overlays/tailwind/default-options.js
diff --git a/packages/overlays/tailwind.js → packages/overlays/tailwind/index.js b/packages/overlays/tailwind.js → packages/overlays/tailwind/index.js
@@ -11,7 +11,7 @@ module.exports = plugin.withOptions(function (userConfig) {
   return function ({ addComponents, theme }) {
     const { options } = resolve(
       '@frontile/overlays',
-      require('./addon/tailwind/default-options'),
+      require('./default-options'),
       userConfig,
       theme
     );

diff --git a/packages/overlays/tests/dummy/app/styles/tailwind.config.js b/packages/overlays/tests/dummy/app/styles/tailwind.config.js
@@ -1,14 +1,5 @@
 /* eslint-disable node/no-extraneous-require */
 
-// Remove cache to allow rebuilds
-const path = require('path');
-delete require.cache[
-  path.join(
-    path.dirname(require.resolve('@frontile/overlays')),
-    'addon/tailwind/default-options.js'
-  )
-];
-
 module.exports = {
   future: {
     removeDeprecatedGapUtilities: true