fix css paths

Poolshark · Jan 28, 2020 · 58f6763 · 58f6763
1 parent 1e30d5a
commit 58f6763
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,8 +6,8 @@ server/config.json
 server/config.test.json
 coverage
 .env
-dist/*
-!dist/.gitkeep
+dist/*.js
+dist/assets/*.css
 tags
 TAGS
 data.json

diff --git a/build/bundle.js b/build/bundle.js
diff --git a/dist/assets/.gitkeep b/dist/assets/.gitkeep
diff --git a/lib/stylesheet.js b/lib/stylesheet.js
@@ -1,12 +1,12 @@
 const version = require('../package.json').version;
 
-const CDN_BASE = `https://cdn.auth0.com/extensions/auth0-account-link-extension/${version}`;
+const CDN_BASE = 'https://cdn.auth0.com/extensions/auth0-account-link-extension';
 const LOCAL_BASE = '/css';
 
 const getBase = useCDN => (useCDN ? CDN_BASE : LOCAL_BASE);
 
 const generateHelper = (useCDN = false) => {
-  const extension = useCDN ? 'min.css' : 'css';
+  const extension = useCDN ? `${version}.min.css` : 'css';
   const link = (filename) => {
     const name = (filename || '').trim();
 

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
     "test:integration": "mocha integration --recursive --timeout 50000",
     "lint": "eslint .",
     "serve:dev": "gulp run",
-    "client:build": "minify --clean public/css/link.css && minify --clean public/css/admin.css",
+    "client:build": "minify --clean --output dist/assets/link.$npm_package_version.min.css public/css/link.css && minify --clean --output dist/assets/admin.$npm_package_version.min.css public/css/admin.css",
     "extension:build": "a0-ext build:server ./webtask.js ./dist && cp ./dist/auth0-account-link.extension.$npm_package_version.js ./build/bundle.js",
     "build": "yarn run client:build && yarn run extension:build"
   },

diff --git a/public/css/admin.min.css b/public/css/admin.min.css
diff --git a/public/css/link.min.css b/public/css/link.min.css