scratch-render-fonts 1.0.0-prerelease.20231017225105 → 1.0.1

package/.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.js]
+indent_style = space

package/.eslintignore

@@ -0,0 +1,2 @@
+dist/*
+node_modules/*

package/.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+    extends: ['scratch', 'scratch/node', 'scratch/es6']
+};

package/.github/workflows/ci-cd.yml

@@ -0,0 +1,48 @@
+name: CI/CD
+
+on:
+  workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
+  pull_request: # Runs whenever a pull request is created or updated
+  push: # Runs whenever a commit is pushed to the repository
+    branches: [master, hotfix/*] # ...on any of these branches
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+permissions:
+  contents: write # publish a GitHub release
+  pages: write # deploy to GitHub Pages
+  issues: write # comment on released issues
+  pull-requests: write # comment on released pull requests
+
+jobs:
+  ci-cd:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+      - uses: wagoid/commitlint-github-action@5ce82f5d814d4010519d15f0552aec4f17a1e1fe # v5
+        if: github.event_name == 'pull_request'
+      - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
+        with:
+          cache: 'npm'
+          node-version-file: '.nvmrc'
+      - name: Info
+        run: |
+          cat <<EOF
+          Node version: $(node --version)
+          NPM version: $(npm --version)
+          GitHub ref: ${{ github.ref }}
+          GitHub head ref: ${{ github.head_ref }}
+          EOF
+      - name: Setup
+        run: npm ci
+      - name: Lint
+        run: npm run lint
+      - name: Build
+        run: npm run build
+      - name: Release
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: npx --no -- semantic-release

package/.husky/.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

package/.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no-install commitlint --edit "$1"

package/.nvmrc

@@ -0,0 +1 @@
+v16

package/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See
+[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [1.0.1](https://github.com/scratchfoundation/scratch-render-fonts/compare/v1.0.0...v1.0.1) (2024-02-21)
+
+
+### Bug Fixes
+
+* bump version to sync with npm registry ([104c050](https://github.com/scratchfoundation/scratch-render-fonts/commit/104c0506658d707081bd29a042f7bae903e9bba2))
+
+# 1.0.0 (2024-02-21)
+
+
+### Bug Fixes
+
+* **deps:** acknowledge semantic-release dev dependency ([0bd6614](https://github.com/scratchfoundation/scratch-render-fonts/commit/0bd6614018b67a655488b71ffd052e43e391a4ac))
+* **deps:** update to semantic-release@^19 ([6bee7ca](https://github.com/scratchfoundation/scratch-render-fonts/commit/6bee7cae2355540d90b2bac2f48c69b96b023cf0))

package/README.md

@@ -1,4 +1,22 @@
 # scratch-render-fonts
+
 Fonts for Scratch SVG rendering
 
-[![CircleCI](https://circleci.com/gh/LLK/scratch-render-fonts/tree/master.svg?style=shield&circle-token=786988d80057cc1ac25c39fb4f5754d736106fa7)](https://circleci.com/gh/LLK/scratch-render-fonts?branch=master)
+[![CI/CD](https://github.com/scratchfoundation/scratch-render-fonts/actions/workflows/ci-cd.yml/badge.svg)](https://github.com/scratchfoundation/scratch-render-fonts/actions/workflows/ci-cd.yml)
+
+## Committing
+
+This project uses [semantic release](https://github.com/semantic-release/semantic-release) to ensure version bumps
+follow semver so that projects depending on it don't break unexpectedly.
+
+In order to automatically determine version updates, semantic release expects commit messages to follow the
+[conventional-changelog](https://github.com/bcoe/conventional-changelog-standard/blob/master/convention.md)
+specification.
+
+Use the [commitizen CLI](https://github.com/commitizen/cz-cli) to make commits formatted in this way:
+
+```bash
+npm install -g commitizen
+```
+
+Now you're ready to make commits using `git cz`.

package/commitlint.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+    extends: ['@commitlint/config-conventional'],
+    ignores: [message => message.startsWith('chore(release):')]
+};

package/package.json

@@ -1,34 +1,45 @@
 {
   "name": "scratch-render-fonts",
-  "version": "1.0.0-prerelease.20231017225105",
+  "version": "1.0.1",
   "description": "",
   "main": "./src/index.js",
   "author": "Massachusetts Institute of Technology",
+  "homepage": "https://github.com/scratchfoundation/scratch-render-fonts#readme",
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@github.com/LLK/scratch-render-fonts.git"
+    "url": "https://git@github.com/scratchfoundation/scratch-render-fonts.git"
   },
   "scripts": {
-    "build": "npm run clean && webpack --progress --colors --bail",
+    "build": "npm run clean && webpack --progress --bail",
     "clean": "rimraf ./dist",
+    "lint": "eslint .",
     "test": "npm run build",
-    "watch": "webpack --progress --colors --watch"
+    "watch": "webpack --progress --watch"
+  },
+  "config": {
+    "commitizen": {
+      "path": "cz-conventional-changelog"
+    }
   },
-  "homepage": "https://github.com/LLK/scratch-render-fonts#readme",
   "dependencies": {
-    "base64-loader": "1.0.0"
+    "base64-loader": "^1.0.0"
   },
   "devDependencies": {
+    "@commitlint/cli": "17.8.0",
+    "@commitlint/config-conventional": "17.8.0",
     "babel-core": "6.26.3",
-    "babel-eslint": "^8.1.2",
+    "babel-eslint": "10.1.0",
     "babel-loader": "7.1.5",
     "babel-preset-env": "1.7.0",
-    "eslint": "^4.14.0",
-    "eslint-config-scratch": "^5.0.0",
-    "json": "^10.0.0",
+    "eslint": "8.56.0",
+    "eslint-config-scratch": "9.0.3",
+    "husky": "8.0.3",
+    "json": "10.0.0",
     "lodash.defaultsdeep": "4.6.1",
-    "rimraf": "^2.6.1",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11"
+    "rimraf": "2.7.1",
+    "scratch-semantic-release-config": "1.0.8",
+    "semantic-release": "19.0.5",
+    "webpack": "4.47.0",
+    "webpack-cli": "3.3.12"
   }
 }

package/release.config.js

@@ -0,0 +1,13 @@
+module.exports = {
+    extends: 'scratch-semantic-release-config',
+    branches: [
+        {
+            name: 'master'
+            // default channel
+        },
+        {
+            name: 'hotfix/*',
+            channel: 'hotfix'
+        }
+    ]
+};

package/renovate.json5

@@ -2,6 +2,6 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
 
   "extends": [
-    "github>scratchfoundation/scratch-renovate-config"
+    "github>scratchfoundation/scratch-renovate-config:js-lib-bundled"
   ]
 }

package/src/.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+    root: true,
+    extends: ['scratch', 'scratch/es6'],
+    env: {
+        browser: true
+    }
+};

package/src/index.js

@@ -1,41 +1,41 @@
-// Synchronously load TTF fonts.
-// First, have Webpack load their data as Base 64 strings.
-let FONTS;
-
-const getFonts = function () {
-    if (FONTS) return FONTS;
-    /* eslint-disable global-require */
-    FONTS = {
-        'Sans Serif': require('base64-loader!./NotoSans-Medium.ttf'),
-        'Serif': require('base64-loader!./SourceSerifPro-Regular.otf'),
-        'Handwriting': require('base64-loader!./handlee-regular.ttf'),
-        'Marker': require('base64-loader!./Knewave.ttf'),
-        'Curly': require('base64-loader!./Griffy-Regular.ttf'),
-        'Pixel': require('base64-loader!./Grand9K-Pixel.ttf'),
-        'Scratch': require('base64-loader!./Scratch.ttf')
-    };
-    /* eslint-enable global-require */
-
-    // For each Base 64 string,
-    // 1. Replace each with a usable @font-face tag that points to a Data URI.
-    // 2. Inject the font into a style on `document.body`, so measurements
-    //    can be accurately taken in SvgRenderer._transformMeasurements.
-    for (const fontName in FONTS) {
-        const fontData = FONTS[fontName];
-        FONTS[fontName] = '@font-face {' +
-            `font-family: "${fontName}";src: url("data:application/x-font-ttf;charset=utf-8;base64,${fontData}");}`;
-    }
-
-    if (!document.getElementById('scratch-font-styles')) {
-    	const documentStyleTag = document.createElement('style');
-    	documentStyleTag.id = 'scratch-font-styles';
-    	for (const fontName in FONTS) {
-    	    documentStyleTag.textContent += FONTS[fontName];
-    	}
-    	document.body.insertBefore(documentStyleTag, document.body.firstChild);
-    }
-
-    return FONTS;
-}
-
-module.exports = getFonts;
+// Synchronously load TTF fonts.
+// First, have Webpack load their data as Base 64 strings.
+let FONTS;
+
+const getFonts = function () {
+    if (FONTS) return FONTS;
+    /* eslint-disable global-require */
+    FONTS = {
+        'Sans Serif': require('base64-loader!./NotoSans-Medium.ttf'),
+        'Serif': require('base64-loader!./SourceSerifPro-Regular.otf'),
+        'Handwriting': require('base64-loader!./handlee-regular.ttf'),
+        'Marker': require('base64-loader!./Knewave.ttf'),
+        'Curly': require('base64-loader!./Griffy-Regular.ttf'),
+        'Pixel': require('base64-loader!./Grand9K-Pixel.ttf'),
+        'Scratch': require('base64-loader!./Scratch.ttf')
+    };
+    /* eslint-enable global-require */
+
+    // For each Base 64 string,
+    // 1. Replace each with a usable @font-face tag that points to a Data URI.
+    // 2. Inject the font into a style on `document.body`, so measurements
+    //    can be accurately taken in SvgRenderer._transformMeasurements.
+    for (const fontName in FONTS) {
+        const fontData = FONTS[fontName];
+        FONTS[fontName] = '@font-face {' +
+            `font-family: "${fontName}";src: url("data:application/x-font-ttf;charset=utf-8;base64,${fontData}");}`;
+    }
+
+    if (!document.getElementById('scratch-font-styles')) {
+        const documentStyleTag = document.createElement('style');
+        documentStyleTag.id = 'scratch-font-styles';
+        for (const fontName in FONTS) {
+            documentStyleTag.textContent += FONTS[fontName];
+        }
+        document.body.insertBefore(documentStyleTag, document.body.firstChild);
+    }
+
+    return FONTS;
+};
+
+module.exports = getFonts;

package/.circleci/config.yml

@@ -1,87 +0,0 @@
-version: 2.1
-
-executors:
-  default-executor:
-    docker:
-      - image: "cimg/node:8.17.0"
-    working_directory: ~/project
-    resource_class: medium
-
-commands:
-  setup:
-    steps:
-      - run:
-          name: Setup
-          command: |
-            npm ci
-  test:
-    steps:
-      - run:
-          name: Test
-          command: |
-            npm run test
-  setup_deploy:
-    steps:
-      - run:
-          name: Setup Deploy
-          command: |
-            echo "export NPM_TAG=latest" >> $BASH_ENV
-            echo "export NODE_ENV=production" >> $BASH_ENV
-            echo "export RELEASE_TIMESTAMP=$(date +'%Y%m%d%H%M%S')" >> $BASH_ENV
-            npm run build
-            VPKG=$($(npm bin)/json -f package.json version)
-            echo "export VERSION=${VPKG}-prerelease.$(date +%Y%m%d%H%M%S)" >> $BASH_ENV
-            
-  deploy:
-    steps:
-      - run:
-          name: Deploy
-          command: |
-            npm --no-git-tag-version version $VERSION
-            npm set //registry.npmjs.org/:_authToken=$NPM_TOKEN
-            npm publish
-
-jobs:
-  build-and-test:
-    executor: default-executor
-    steps:
-      - checkout
-      - setup
-      - test
-      - persist_to_workspace:
-          root: ~/project
-          paths: .
-  deploy:
-    executor: default-executor
-    steps:
-      - attach_workspace:
-          at: ~/project
-      - setup_deploy
-      - deploy
-
-workflows:
-  build-and-test-workflow:
-    when:
-      not:
-        or:
-          - equal: [ master, <<pipeline.git.branch>> ]
-          - equal: [ develop, <<pipeline.git.branch>> ]
-          - matches: { pattern: "^hotfix.*", value: <<pipeline.git.branch>> }
-          - matches: { pattern: "^release.*", value: <<pipeline.git.branch>> }
-    jobs:
-      - build-and-test
-
-  deploy-workflow:
-    when:
-      or:
-        - equal: [ master, <<pipeline.git.branch>> ]
-        - equal: [ develop, <<pipeline.git.branch>> ]
-        - matches: { pattern: "^hotfix.*", value: <<pipeline.git.branch>> }
-        - matches: { pattern: "^release.*", value: <<pipeline.git.branch>> }
-    jobs:
-      - build-and-test
-      - deploy:
-          context:
-            - scratch-npm-creds
-          requires:
-            - build-and-test