ember-freestyle 0.12.9 → 0.13.2

package/lib/ast-transform.js

@@ -1,5 +1,5 @@
-/* eslint-disable no-console */
 'use strict';
+
 const stripIndent = require('strip-indent');
 
 function hasNamedBlocksPolyfillSyntax(node) {
@@ -47,30 +47,28 @@ function cleanupNamedBlocksPolyfillSyntax(sourceString) {
   return sourceString;
 }
 
-class FreestyleSourceExtractionAstPlugin {
-  constructor(env) {
-    this.originalSource = env.contents;
-  }
+function extractSource(nodes, contents) {
+  // nodes should be a contiguous collection of ast nodes
+  let startNode = nodes[0];
+  let endNode = nodes[nodes.length - 1];
+  let start = startNode.loc.start;
+  let end = endNode.loc.end;
+  let lines = contents.split('\n').slice(start.line - 1, end.line);
+  lines[0] = new Array(start.column).join(' ') + lines[0].slice(start.column);
+  lines[lines.length - 1] = lines[lines.length - 1].slice(0, end.column);
+  return stripIndent(lines.join('\n'));
+}
 
-  extractSource(nodes) {
-    // nodes should be a contiguous collection of ast nodes
-    let startNode = nodes[0];
-    let endNode = nodes[nodes.length - 1];
-    let start = startNode.loc.start;
-    let end = endNode.loc.end;
-    let lines = this.originalSource.split('\n').slice(start.line - 1, end.line);
-    lines[0] = new Array(start.column).join(' ') + lines[0].slice(start.column);
-    lines[lines.length - 1] = lines[lines.length - 1].slice(0, end.column);
-    return stripIndent(lines.join('\n'));
-  }
+module.exports = function ({ contents, syntax }) {
+  const { builders: b } = syntax;
+
+  return {
+    name: 'component-freestyle-source-extracter',
 
-  transform(ast) {
-    const plugin = this;
-    const { builders: b } = this.syntax;
-    const visitor = {
+    visitor: {
       ElementNode(node) {
         if (['FreestyleUsage', 'FreestyleDynamic'].includes(node.tag)) {
-          const sourceString = plugin.extractSource(node.children);
+          const sourceString = extractSource(node.children, contents);
           node.attributes.push(b.attr('@source', b.text(sourceString)));
         }
         if (['Freestyle::Usage'].includes(node.tag)) {
@@ -80,15 +78,15 @@ class FreestyleSourceExtractionAstPlugin {
           let exampleNode = node.children.find((n) => n.tag === ':example');
           let sourceString;
           if (exampleNode) {
-            sourceString = plugin.extractSource(exampleNode.children);
+            sourceString = extractSource(exampleNode.children, contents);
           } else if (hasNamedBlocksPolyfillSyntax(node)) {
             // Unfortunately, we may still run after the named-blocks-polyfill when in an Ember Addon, so we do the best we can here.
             exampleNode = extractFromNamedBlocksPolyfillSyntax(node);
-            sourceString = plugin.extractSource(exampleNode.body);
+            sourceString = extractSource(exampleNode.body, contents);
             sourceString = cleanupNamedBlocksPolyfillSyntax(sourceString);
           } else {
             exampleNode = node; // not using named blocks
-            sourceString = plugin.extractSource(exampleNode.children);
+            sourceString = extractSource(exampleNode.children, contents);
           }
           node.attributes.push(b.attr('@source', b.text(sourceString)));
         }
@@ -103,15 +101,10 @@ class FreestyleSourceExtractionAstPlugin {
               'templates/components/freestyle-dynamic.hbs'
             ))
         ) {
-          const sourceString = plugin.extractSource(node.program.body);
+          const sourceString = extractSource(node.program.body, contents);
           node.hash.pairs.push(b.pair('source', b.string(sourceString)));
         }
       },
-    };
-
-    this.syntax.traverse(ast, visitor);
-    return ast;
-  }
-}
-
-module.exports = FreestyleSourceExtractionAstPlugin;
+    },
+  };
+};

package/package.json

@@ -1,14 +1,10 @@
 {
   "name": "ember-freestyle",
-  "version": "0.12.9",
+  "version": "0.13.2",
   "description": "Create a living styleguide for your Ember app.",
   "keywords": [
     "ember-addon"
   ],
-  "volta": {
-    "node": "12.20.1",
-    "yarn": "1.22.10"
-  },
   "repository": "https://github.com/chrislopresto/ember-freestyle.git",
   "license": "MIT",
   "author": "Chris LoPresto",
@@ -18,12 +14,16 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
-    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
+    "compile-styles": "node ./script/compile-styles.js",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
+    "lint:css": "stylelint \"./**/*.scss\"",
+    "lint:css:fix": "stylelint \"./**/*.scss\" --fix",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
     "lint:hbs": "ember-template-lint .",
     "lint:hbs:fix": "ember-template-lint . --fix",
     "lint:js": "eslint . --cache",
     "lint:js:fix": "eslint . --fix",
+    "prepare": "husky install",
     "start": "ember serve",
     "test": "npm-run-all lint test:*",
     "test:ember": "ember test",
@@ -35,70 +35,72 @@
     "contributors:generate": "all-contributors generate"
   },
   "dependencies": {
-    "@ember/render-modifiers": "^1.0.2",
-    "ember-auto-import": "^1.10.1",
-    "ember-cli-babel": "^7.23.0",
-    "ember-cli-htmlbars": "^5.3.1",
-    "ember-cli-sass": "^10.0.0",
-    "ember-json-viewer": "^0.6.0",
-    "ember-modifier": "^2.1.0",
+    "@ember/render-modifiers": "^2.0.0",
+    "@glimmer/component": "^1.0.4",
+    "@glimmer/tracking": "^1.0.4",
+    "ember-auto-import": "^1.11.3",
+    "ember-cli-babel": "^7.26.6",
+    "ember-cli-htmlbars": "^6.0.0",
+    "ember-modifier": "^2.1.2",
     "ember-named-blocks-polyfill": "^0.2.4",
-    "ember-runtime-enumerable-includes-polyfill": "^2.0.0",
     "ember-truth-helpers": "^3.0.0",
-    "glob": "^7.1.3",
+    "json-formatter-js": "^2.3.4",
     "macro-decorators": "^0.1.2",
-    "sass": "^1.17.0",
     "strip-indent": "^3.0.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
-    "@ember/test-helpers": "^2.1.4",
-    "@glimmer/component": "^1.0.3",
-    "@glimmer/tracking": "^1.0.3",
+    "@ember/test-helpers": "^2.6.0",
+    "@embroider/test-setup": "^0.47.2",
     "all-contributors-cli": "^6.14.1",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.24.0",
-    "ember-cli-autoprefixer": "^0.8.1",
+    "ember-cli": "~3.28.4",
+    "ember-cli-autoprefixer": "^1.0.3",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deploy": "^1.0.2",
     "ember-cli-deploy-build": "^2.0.0",
     "ember-cli-deploy-git": "^1.3.4",
-    "ember-cli-inject-live-reload": "^2.0.2",
-    "ember-cli-page-object": "^1.17.4",
-    "ember-cli-sass-lint": "^1.0.3",
-    "ember-cli-shims": "^1.2.0",
-    "ember-cli-showdown": "^4.1.0",
+    "ember-cli-inject-live-reload": "^2.1.0",
+    "ember-cli-sass": "^10.0.0",
+    "ember-cli-showdown": "^6.0.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-terser": "^4.0.1",
+    "ember-cli-terser": "^4.0.2",
     "ember-code-snippet": "^3.0.0",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-native-dom-helpers": "^0.7.0",
-    "ember-page-title": "^6.0.3",
-    "ember-qunit": "^5.1.2",
-    "ember-resolver": "^8.0.2",
-    "ember-source": "~3.24.0",
+    "ember-maybe-import-regenerator": "^1.0.0",
+    "ember-page-title": "^7.0.0",
+    "ember-qunit": "^5.1.5",
+    "ember-resolver": "^8.0.3",
+    "ember-source": "~3.28.6",
     "ember-source-channel-url": "^3.0.0",
-    "ember-template-lint": "^2.15.0",
-    "ember-try": "^1.4.0",
-    "eslint": "^7.17.0",
+    "ember-template-lint": "^3.13.0",
+    "ember-try": "^2.0.0",
+    "eslint": "^7.32.0",
     "eslint-config-ember": "0.3.0",
-    "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-ember": "^10.1.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-ember": "^10.5.7",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-qunit": "^7.0.0",
+    "husky": "^7.0.4",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.2.1",
-    "qunit": "^2.14.0",
-    "qunit-dom": "^1.6.0",
+    "prettier": "^2.3.2",
+    "qunit": "^2.16.0",
+    "qunit-dom": "^2.0.0",
     "remarkable": "^2.0.0",
-    "standard-version": "^9.1.0"
+    "sass": "^1.43.4",
+    "standard-version": "^9.3.2",
+    "stylelint": "^13.13.1",
+    "stylelint-config-prettier": "^9.0.3",
+    "stylelint-config-recommended-scss": "^4.3.0",
+    "stylelint-prettier": "^1.2.0",
+    "stylelint-scss": "^3.21.0"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"
@@ -112,5 +114,9 @@
     "after": [
       "ember-named-blocks-polyfill"
     ]
+  },
+  "volta": {
+    "node": "12.22.6",
+    "yarn": "1.22.15"
   }
 }