Release 1.83.1

.github/workflows/deploy.yml

@@ -47,9 +47,6 @@ jobs:
       - name: Run webpack build
         run: npm run build:webpack -- --output-path=../ocw-www/public/static/
 
-      - name: Copy webpack build to course
-        run: mkdir -p ../ocw-course/public-v1/ && cp -r ../ocw-www/public/static/ ../ocw-course/public-v1/
-
       - name: Copy webpack build to course v2
         run: mkdir -p ../ocw-course/public-v2/ && cp -r ../ocw-www/public/static/ ../ocw-course/public-v2/
 
@@ -61,15 +58,6 @@ jobs:
           OCW_COURSE_STARTER_SLUG: ${{ secrets.OCW_COURSE_STARTER_SLUG }}
           STATIC_API_BASE_URL: ${{ secrets.STATIC_API_BASE_URL }}
           RESOURCE_BASE_URL: ${{ secrets.RESOURCE_BASE_URL }}
-
-      - name: Run the course hugo build
-        run: (cd ../ocw-course; hugo --config $GITHUB_WORKSPACE/ocw-hugo-projects/ocw-course/config.yaml  --destination public-v1 --themesDir ../ocw-hugo-themes)
-        env:
-          OCW_STUDIO_BASE_URL: ${{ secrets.OCW_STUDIO_BASE_URL }}
-          SEARCH_API_URL: ${{ secrets.SEARCH_API_URL }}
-          OCW_COURSE_STARTER_SLUG: ${{ secrets.OCW_COURSE_STARTER_SLUG }}
-          STATIC_API_BASE_URL: ${{ secrets.STATIC_API_BASE_URL }}
-          RESOURCE_BASE_URL: ${{ secrets.RESOURCE_BASE_URL }}
 
       - name: Run the course v2 hugo build
         run: (cd ../ocw-course; hugo --config $GITHUB_WORKSPACE/ocw-hugo-projects/ocw-course-v2/config.yaml  --destination public-v2 --themesDir ../ocw-hugo-themes)
@@ -94,21 +82,6 @@ jobs:
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-
-      - name: Deploy Course Preview to Netlify
-        uses: nwtgck/[email protected]
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          publish-dir: '../ocw-course/public-v1'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          deploy-message: "Deploy from GitHub Actions"
-          enable-pull-request-comment: false
-          enable-commit-comment: false
-          overwrites-pull-request-comment: false
-          alias: ocw-hugo-themes-course-pr-${{ github.event.number }}
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
 
       - name: Deploy v2 Course Preview to Netlify
         uses: nwtgck/[email protected]
@@ -128,7 +101,7 @@ jobs:
       - name: Set comment body
         id: set-comment-body
         run: |
-          body=$(echo 'Netlify Deployments:<br>www: https://ocw-hugo-themes-www-pr-${{ github.event.number }}--ocw-next.netlify.app/ <br> Course v1: https://ocw-hugo-themes-course-pr-${{ github.event.number }}--ocw-next.netlify.app/ <br> Course v2: https://ocw-hugo-themes-course-v2-pr-${{ github.event.number }}--ocw-next.netlify.app/')
+          body=$(echo 'Netlify Deployments:<br>www: https://ocw-hugo-themes-www-pr-${{ github.event.number }}--ocw-next.netlify.app/ <br> Course v2: https://ocw-hugo-themes-course-v2-pr-${{ github.event.number }}--ocw-next.netlify.app/')
           echo ::set-output name=body::$body
 
       - name: Find Comment

.pre-commit-config.yaml

@@ -0,0 +1,15 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: [email protected]:Yelp/detect-secrets
+    rev: v1.3.0
+    hooks:
+    -   id: detect-secrets
+        args:
+          - --baseline
+          - .secrets.baseline
+          - --exclude-files
+          - README.md
+          - --exclude-files
+          - .yarn/releases/yarn-3.1.0.cjs
+        exclude: .*_test.*|yarn\.lock

.secrets.baseline

@@ -0,0 +1,67 @@
+{
+  "custom_plugin_paths": [],
+  "exclude": {
+    "files": null,
+    "lines": null
+  },
+  "generated_at": "2020-08-17T20:01:57Z",
+  "plugins_used": [
+    {
+      "name": "AWSKeyDetector"
+    },
+    {
+      "name": "ArtifactoryDetector"
+    },
+    {
+      "base64_limit": 4.5,
+      "name": "Base64HighEntropyString"
+    },
+    {
+      "name": "BasicAuthDetector"
+    },
+    {
+      "name": "CloudantDetector"
+    },
+    {
+      "hex_limit": 3,
+      "name": "HexHighEntropyString"
+    },
+    {
+      "name": "IbmCloudIamDetector"
+    },
+    {
+      "name": "IbmCosHmacDetector"
+    },
+    {
+      "name": "JwtTokenDetector"
+    },
+    {
+      "keyword_exclude": null,
+      "name": "KeywordDetector"
+    },
+    {
+      "name": "MailchimpDetector"
+    },
+    {
+      "name": "PrivateKeyDetector"
+    },
+    {
+      "name": "SlackDetector"
+    },
+    {
+      "name": "SoftlayerDetector"
+    },
+    {
+      "name": "StripeDetector"
+    },
+    {
+      "name": "TwilioKeyDetector"
+    }
+  ],
+  "results": {},
+  "version": "0.14.2",
+  "word_list": {
+    "file": null,
+    "hash": null
+  }
+}

RELEASE.rst

@@ -1,6 +1,14 @@
 Release Notes
 =============
 
+Version 1.83.1
+--------------
+
+- remove 4 deps included in nanogallery2 (#1054)
+- refactor: old course theme removed (#1051)
+- add pre-commit config (#1048)
+- change TS config to target ES6 modules (#1044)
+
 Version 1.83.0 (Released January 24, 2023)
 --------------
 

base-theme/assets/index.ts

@@ -3,10 +3,6 @@ import "video.js/dist/video-js.css"
 
 import "bootstrap"
 import Popper from "popper.js"
-import "shifty"
-import "hammerjs"
-import "imagesloaded"
-import "screenfull"
 import "./js/utils"
 import * as Sentry from "@sentry/browser"
 import { initSentry } from "./js/sentry"

base-theme/assets/webpack/webpack.common.ts

@@ -20,9 +20,8 @@ const config: webpack.Configuration = {
   },
   entry: {
     main:                fromRoot("./base-theme/assets/index.ts"),
-    course:              fromRoot("./course/assets/course.ts"),
     course_v2:           fromRoot("./course-v2/assets/course-v2.ts"),
-    instructor_insights: fromRoot("./course/assets/instructor-insights.js"),
+    instructor_insights: fromRoot("./course-v2/assets/instructor-insights.js"),
     www:                 fromRoot("./www/assets/www.tsx"),
     fields:              fromRoot("./fields/assets/fields.js")
   },
@@ -34,6 +33,10 @@ const config: webpack.Configuration = {
 
   module: {
     rules: [
+      {
+        test: /nanogallery2/,
+        use:  "imports-loader?module.exports=>undefined&exports=>undefined"
+      },
       {
         test: /\.(jpg)|(png)|(svg)|(gif)$/,
         use:  [
@@ -78,40 +81,6 @@ const config: webpack.Configuration = {
           "postcss-loader",
           "sass-loader"
         ]
-      },
-
-      {
-        test: require.resolve("shifty"),
-        use:  [
-          { loader: "expose-loader", options: { exposes: ["NGTweenable"] } }
-        ]
-      },
-
-      {
-        test: require.resolve("hammerjs"),
-        use:  [
-          {
-            loader:  "expose-loader",
-            options: { exposes: ["NGHammer"] }
-          }
-        ]
-      },
-
-      {
-        test: require.resolve("imagesloaded"),
-        use:  [
-          {
-            loader:  "expose-loader",
-            options: { exposes: ["ngimagesLoaded", "ngImagesLoaded"] }
-          }
-        ]
-      },
-
-      {
-        test: require.resolve("screenfull"),
-        use:  [
-          { loader: "expose-loader", options: { exposes: ["ngscreenfull"] } }
-        ]
       }
     ]
   },