Merge pull request #460 from spencermountain/dev

Dev

Author: spencermountain

.github/workflows/build-and-test.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 22.x, 24.x]
+        node-version: [20.x, 26.x]
 
     steps:
       - uses: actions/checkout@v4
@@ -18,23 +18,13 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: cache dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-npm-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-${{ matrix.node-version }}-
-            ${{ runner.os }}-npm-
-
       - name: npm install, build, and test
         run: |
           npm ci
-          npm i eslint ts-node typescript
           npm run lint
           npm run pack
+          npm run test
           npm run build
           npm run testb
-          # npm run test:types
         env:
           CI: true

.github/workflows/coverage.yml

@@ -14,14 +14,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '20'
-
-      - uses: actions/cache@v4
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
+          node-version: 'lts/*'
+          registry-url: 'https://registry.npmjs.org'
 
       - run: npm ci
       - run: npm run codecov

.github/workflows/release.yml

@@ -7,38 +7,24 @@ on:
 jobs:
   release:
     runs-on: ubuntu-latest
+    
     permissions:
-      contents: read
       id-token: write
-    env:
-      CI: true
+      contents: read
 
-    # Note that these steps are *identical* to build-and-test (with the caveat
-    # that build-and-test uses several versions of Node, and Release only uses
-    # 10.x) at least until the actual publishing happens.  Ideally, we could
-    # delegate to the build- and-test workflow, but I haven't found a way to do
-    # that yet.
     steps:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20.x
 
-      - name: cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-npm-10.x-${{ hashFiles('package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-10.x-
-            ${{ runner.os }}-npm-
+      - uses: actions/setup-node@v4
+        with: 
+          node-version: 'lts/*'
+          registry-url: 'https://registry.npmjs.org'
 
       - name: install
         run: |
           npm ci
-          npm i --no-save eslint ts-node typescript
 
       - name: static checks
         run: |
@@ -50,12 +36,9 @@ jobs:
 
       - name: test
         run: |
+          npm run test
           npm run testb
-          npm run test:types
 
-      # And finally... publish it!  Note that we create the .npmrc file
-      # "just in time" so that `npm publish` can get the auth token from the
-      # environment
       - name: publish
         run: |
           echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > .npmrc

.npmrc

@@ -0,0 +1 @@
+ignore-scripts=true

builds/spacetime.cjs

@@ -1,4 +1,4 @@
-/* spencermountain/spacetime 7.12.0 Apache 2.0 */
+/* spencermountain/spacetime 7.12.1 Apache 2.0 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -1385,7 +1385,7 @@
         s.tz = input.tz;
         return s
       }
-      const obj = Object.assign({}, input, today);
+      const obj = Object.assign({}, today, input);
       s = parseObject(s, obj);
       return s
     }
@@ -4176,7 +4176,7 @@
     return tzs
   };
 
-  var version = '7.12.0';
+  var version = '7.12.1';
 
   const main = (input, tz, options) => new SpaceTime(input, tz, options);
 

builds/spacetime.min.js

@@ -9,6 +9,12 @@ This project follows semVer, where:
 
  -->
 
+### 7.12.1 [May 2026]
+- **[fix]** - regression for today param in object format
+- **[change]** - add npm ignore-scripts=true
+- **[update]** - github actions scripts
+- **[update]** - dependencies
+
 ### 7.12.0 [Dec 2025]
 - **[update]** - update zonefile to 2026 DST dates
 - **[update]** - update dependencies